- Convert to new perl framework

- Trim Makefile header - Remove MAKE_JOBS_SAFE=yes, it's the default.
author: mat <mat@FreeBSD.org> 2013-08-03 02:52:07 +0800
committer: mat <mat@FreeBSD.org> 2013-08-03 02:52:07 +0800
commit: f47f83f9c8923b3b0f740482331aab0d0aa669e9 (patch)
tree: a4a613f80a0e443c044c2319e43ce75e14c50813 /archivers/p5-Compress-LZW
parent: 16bdaae92136c316b9043fffbf5fb4438dce004e (diff)
download: freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.tar.gz
freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.tar.zst
freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.zip
1 files changed, 2 insertions, 1 deletions
diff --git a/archivers/p5-Compress-LZW/Makefile b/archivers/p5-Compress-LZW/Makefile
index 69dc2684b915..3e1c4a98fbc6 100644
--- a/archivers/p5-Compress-LZW/Makefile
+++ b/archivers/p5-Compress-LZW/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure perl implementation of LZW
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Compress::LZW.3
 
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 99a96a7da7..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,79 +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>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <battery841@mypad.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Bertrand Guiheneuf <bertrand@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>
-	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 <gnomepl@pandora.info.bielsko.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	H�ctor Garc�a Alvarez <hector@scouts-es.org>
-	Jes�s Bravo �lvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	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 2e4aba2656..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,6761 +0,0 @@
-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 83cb424373..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,42 +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                  \
-        widgets                 \
-        shell                   \
-        libibex                 \
-        camel                   \
-        filter                  \
-        libical                 \
-        libversit               \
-	libwombat		\
-        addressbook             \
-        composer                \
-        mail                    \
-        calendar                \
-        wombat                  \
-	importers		\
-	my-evolution		\
-        art                     \
-	ui			\
-        default_user            \
-	views			\
-        tools                   \
-	doc			\
-        po
diff --git a/NEWS b/NEWS
deleted file mode 100644
index bdafc1612b..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,1245 +0,0 @@
-Version 0.11 "No code name yet", 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)
-
-  - 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 62efb3c5ad..0000000000
--- a/README
+++ /dev/null
@@ -1,248 +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" package.
-
-
-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. Eg:
-
-	./configure --prefix=/usr --sysconfdir=/etc
-
-
-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. Eg:
-
-        export GNOME_PATH=/usr/local
-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
-
-(Assuming your shell is bash, and you installed into /usr/local.) You
-need to set GNOME_PATH both during compiling AND when you run
-evolution. Remember also that if you're installing into an odd prefix
-such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH and ${prefix}/lib in your LD_LIBRARY_PATH.
-
-
-Dependencies
-------------
-
-All of these libraries are available in GNOME CVS, under the given
-names. Most (but not all) of them are also available as tarballs on
-ftp.gnome.org. The (*)ed packages are available in 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 - lates from xml-i18n-tools-stable-1-x branch in
-   GNOME CVS (0.8.2 is too old)
-
- - 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.
-
- - gconf - 0.6 or later.
-
- - 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.7.99.3 or later
-
- - gtkhtml - later than 0.9.3
-
- - Berkeley's libdb - 3.1.17
-
-   db3 is available from www.sleepycat.com.  Make sure to get 3.1.17,
-   it isn't the newest version.
-
-
-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, e.g:
-
-����� ../dist/configure --prefix=/home/user/berkeleydb-3.1.17
-
-� * Autogen Evolution specifying that it has to look for the DB
-��� library there, eg.:
-
-����� ./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
-cvs -d :pserver:anonymous@cvs.gnu-designs.com:/cvs/pilot-link login
-The password is just <ENTER>.
-cvs -d :pserver:anonymous@cvs.gnu-designs.com:/cvs/pilot-link co pilot-link
-./configure --prefix=<pilot-link-prefix> --with-perl=no --with-java=no
---with-tcl=no --with-python=no
-make
-make install
-
-2) gnome-pilot
-cvs -z3 co gnome-pilot
-./autogen.sh --prefix=<gnome-pilot-prefix> --with-pisock=<pilot-link-prefix>
-make
-make install
-
-3) evolution
-in your evo source dir do ./autogen.sh --prefix=<evo-prefix> 
---with-pisock=<pilot-link-prefix> --enable-pilot-conduits=yes
-make
-make install
-
-
-If you want support SSL (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 dir 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.
-
-
-SOURCE TREE LAYOUT
-------------------
-
-addressbook:	the Address Book UI
-art:		graphics used by evolution
-calendar:	the Calendar UI
-camel:		libcamel, a messaging library used by the mailer.
-		Camel is inspired by Sun's JavaMail
-		(http://java.sun.com/products/javamail/) and the
-		IMAPv4 spec (RFC 2060).
-composer:	the message composer UI
-data:		the .desktop file for Evolution
-default_user:	initial Evolution config files for new users
-devel-docs:	entirely inadequate documentation
-doc:		more adequate documentation
-e-util:		utility code used by various parts of Evolution
-filter:		libfilter, a mail filtering library
-libibex:	an indexing library used by the mailer
-libical:	a library for the iCalendar format (RFC 2445-2446)
-libversit:	a library for the vCard (RFC 2425-2426) and vCalendar
-		(http://www.imc.org/pdi/vcal-10.txt) formats
-mail:		the mail display UI
-shell:		the Evolution shell (the main program that launches
-		the other components)
-tests:		some test programs
-tools:		utilities, notably "killev", a script to kill of all
-		of the Evolution components
-widgets:	widgets used by Evolution, including the shortcut bar
-wombat:		Has source code that will load in the addressbook
-		and calendar backend, and will form the server
-		process we'll be using
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 0f5709e194..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,40 +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_SSL
-#undef HAVE_OPENSSL
-#undef MOVEMAIL_PATH
-#undef USE_DOT
-#undef USE_FCNTL
-#undef USE_FLOCK
-#undef ENABLE_NNTP
-#undef HAVE_BROKEN_SPOOL
-
-/* db3 version */
-#undef EVOLUTION_DB_VERSION_MAJOR
-#undef EVOLUTION_DB_VERSION_MINOR
-#undef EVOLUTION_DB_VERSION_PATCH
-
-/* Sub-version identification string.  */
-#undef SUB_VERSION
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_ARGS
-
-/* Define if gethostbyname_r takes five arguments */
-#undef GETHOSTBYNAME_R_FIVE_ARGS
diff --git a/addressbook/.cvsignore b/addressbook/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
deleted file mode 100644
index 97216f6bb8..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,7286 +0,0 @@
-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 f1eef28fc4..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,23 +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-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-GNOME_Evolution_Addressbook_VCard_Importer.oaf
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 895390e776..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,167 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS = evolution-vcard-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)/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				\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libebook.la
-
-libebook_la_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	e-book-listener.c				\
-	e-book-view-listener.c				\
-	e-book-view.c					\
-	e-book.c					\
-	e-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					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
-
-test_client_list_SOURCES =				\
-	test-client-list.c
-
-test_client_list_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_vcard_importer_SOURCES =			\
-	evolution-vcard-importer.c
-evolution_vcard_importer_LDADD =				\
-	libebook.la						\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)					\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook_VCard_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 285c6646b2..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,770 +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   idle_id;
-
-	guint stopped : 1;
-};
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-
-		/* We only release our reference to the listener when the idle
-		   function is totally finished. */
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-
-		/* Hold a reference to the listener until the idle function is finished. */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	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_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_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_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_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)
-{
-	GList *l;
-
-	if (listener->priv->stopped)
-		return;
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		g_free (resp->msg);
-		g_free (resp->id);
-
-		if (resp->book != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			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);
-	}
-	g_list_free (listener->priv->response_queue);
-	listener->priv->response_queue = NULL;
-
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener     *listener = E_BOOK_LISTENER (object);
-
-	e_book_listener_stop (listener);
-	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->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 16cb518ce5..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,107 +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,
-	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;
-} 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 0a477678eb..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,39 +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_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 d10c5612f1..0000000000
--- a/addressbook/backend/ebook/e-book-util.c
+++ /dev/null
@@ -1,571 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include "e-book-util.h"
-
-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;
-
-typedef struct _CommonBookInfo CommonBookInfo;
-struct _CommonBookInfo {
-	EBookCommonCallback cb;
-	gpointer closure;
-};
-
-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);
-	}
-}
-
-/*
- *
- * 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;
-};
-
-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;
-}
-
-#ifdef USE_WORKAROUND
-static GList *WORKAROUND_sq_queue = NULL;
-static gboolean WORKAROUND_running_query = FALSE;
-#endif
-
-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_printf (query);
-	sq->cb = cb;
-	sq->closure = closure;
-
-	/* Automatically add ourselves to the EBook's pending list. */
-	book_add_simple_query (book, sq);
-
-#ifdef USE_WORKAROUND
-	/* Add ourselves to the queue. */
-	WORKAROUND_sq_queue = g_list_append (WORKAROUND_sq_queue, sq);
-#endif
-
-	return sq;
-}
-
-static void
-simple_query_free (SimpleQueryInfo *sq)
-{
-	/* Remove ourselves from the EBook's pending list. */
-	book_remove_simple_query (sq->book, sq);
-
-#ifdef USE_WORKAROUND
-	Glist *i;
-	
-	/* If we are still in the queue, remove ourselves. */
-	for (i = WORKAROUND_sq_queue; i != NULL; i = g_list_next (i)) {
-		if (i->data == sq) {
-			WORKAROUND_sq_queue = g_list_remove_link (WORKAROUND_sq_queue, i);
-			g_list_free_1 (i);
-			break;
-		} 
-	}
-#endif
-	
-	g_free (sq->query);
-
-	if (sq->add_tag)
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->add_tag);
-	if (sq->seq_complete_tag)
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->seq_complete_tag);
-
-#ifdef USE_WORKAROUND
-	if (sq->view)
-		WORKAROUND_running_query = FALSE;
-#endif
-
-	if (sq->view)
-		gtk_object_unref (GTK_OBJECT (sq->view));
-
-	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;
-
-	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;
-
-	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 (status != E_BOOK_STATUS_SUCCESS) {
-		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);
-}
-
-#ifdef USE_WORKAROUND
-static gint
-WORKAROUND_try_queue (gpointer foo)
-{
-	if (WORKAROUND_sq_queue) {
-		SimpleQueryInfo *sq;
-		GList *i;
-
-		if (WORKAROUND_running_query) 
-			return TRUE;
-
-		WORKAROUND_running_query = TRUE;
-		sq = WORKAROUND_sq_queue->data;
-
-		i = WORKAROUND_sq_queue;
-		WORKAROUND_sq_queue = g_list_remove_link (WORKAROUND_sq_queue, WORKAROUND_sq_queue);
-		g_list_free_1 (i);
-
-		e_book_get_book_view (sq->book, sq->query, simple_query_book_view_cb, sq);
-	}
-
-	return FALSE;
-}
-#endif
-
-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);
-#ifdef USE_WORKAROUND
-	gtk_timeout_add (50, WORKAROUND_try_queue, NULL);
-#else
-	e_book_get_book_view (book, (gchar *) query, simple_query_book_view_cb, sq);
-#endif
-
-	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->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED, NULL, sq->closure);
-		simple_query_free (sq);
-	} 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_name_match_string (card->name, info->name))
-		    && (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]) {
-				namev[i] = g_strdup_printf ("(contains \"file_as\" \"%s\")", namev[i]);
-				++count;
-			}
-		}
-
-		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);
-		for (i=0; namev[i]; ++i)
-			if (*namev[i])
-				g_free (namev[i]);
-		g_free (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;
-}
-
-/*
- *  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 0988887324..0000000000
--- a/addressbook/backend/ebook/e-book-util.h
+++ /dev/null
@@ -1,74 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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"
-
-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);
-
-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);
-
-/* 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);
-
-/* 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 705cc155c8..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,471 +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   idle_id;
-
-	guint stopped : 1;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	static gint thrash = 0;
-	gint queue_len;
-
-	if (listener->priv->stopped) {
-		listener->priv->idle_id = 0;
-		return TRUE;
-	}
-
-	queue_len = g_list_length (listener->priv->response_queue);
-
-	bonobo_object_ref (BONOBO_OBJECT (listener));
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	/* This means we didn't make any progress in dealing with what is on our
-	   response queue. */
-	if (queue_len == g_list_length (listener->priv->response_queue))
-		++thrash;
-	else
-		thrash = 0;
-
-	if (thrash > 20 || listener->priv->response_queue == NULL) {
-
-		if (thrash > 20) {
-			g_error ("e_book_view_listener_check_queue thrashing!");
-			thrash = 0;
-		}
-		
-		listener->priv->idle_id = 0;
-
-		/* Only release our listener reference when the idle is finished. */
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-
-		return FALSE;
-	}
-
-
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-
-		/* Hold a reference to the listener while the idle is active. */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_view_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	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->idle_id        = 0;
-	listener->priv->stopped        = FALSE;
-}
-
-void
-e_book_view_listener_stop (EBookViewListener *listener)
-{
-	GList *l;
-
-	if (listener->priv->stopped)
-		return;
-
-	if (listener->priv->idle_id) {
-		g_source_remove(listener->priv->idle_id);
-		listener->priv->idle_id = 0;
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-	}
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookViewListenerResponse *resp = l->data;
-
-		g_free(resp->id);
-
-		g_list_foreach(resp->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free(resp->cards);
-
-		g_free (resp->message);
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-	listener->priv->response_queue = NULL;
-
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
-
-	e_book_view_listener_stop (listener);
-	g_free (listener->priv);
-	
-	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 7dbe7d46fb..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,346 +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);
-
-	if (card->book == NULL) {
-		card->book = book;
-		gtk_object_ref (GTK_OBJECT (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;
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-	book_view->priv->responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view->priv->listener), "responses_queued",
-								   e_book_view_check_listener_queue, book_view);
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (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));
-}
-
-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 5e576d6642..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,60 +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);
-
-#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 73b39b6c46..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1330 +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 {
-	GNOME_Evolution_Addressbook_BookFactory  book_factory;
-	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 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;
-
-	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;
-		g_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);
-	g_free (op);
-}
-
-static void
-e_book_do_response_generic (EBook                 *book,
-			    EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_generic: Cannot find operation "
-			   "in local op queue!\n");
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_cursor (EBook                 *book,
-			       EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	ECardCursor *cursor;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	cursor = e_card_cursor_new(resp->cursor);
-
-	if (op->cb) {
-		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));
-	
-	g_free (op);
-}
-
-
-
-static void
-e_book_do_response_get_view (EBook                 *book,
-			     EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_view: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-	
-	book_view = e_book_view_new(resp->book_view, op->listener);
-	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));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_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);
-	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));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_open (EBook                 *book,
-			 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	if (resp->status == E_BOOK_STATUS_SUCCESS) {
-		book->priv->corba_book  = resp->book;
-		book->priv->load_state  = URILoaded;
-	}
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_open: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-	g_free (op);
-}
-
-static void
-e_book_do_progress_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],
-			 resp->msg, resp->percent);
-
-	g_free (resp->msg);
-}
-
-static void
-e_book_do_link_event (EBook                 *book,
-		      EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],
-			 resp->connected);
-}
-
-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);
-	}
-
-	g_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 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:
- */
-
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (uri != NULL,           FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	if (book->priv->load_state != URINotLoaded) {
-		g_warning ("e_book_load_uri: Attempted to load a URI "
-			   "on a book which already has a URI loaded!\n");
-		return FALSE;
-	}
-
-	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 the addressbook into the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, open_response, closure, NULL);
-
-	GNOME_Evolution_Addressbook_BookFactory_openBook (
-		book->priv->book_factory, uri,
-		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	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);
-
-	/*
-	 * Connect to the Personal Addressbook Server.
-	 */
-
-	book->priv->book_factory = (GNOME_Evolution_Addressbook_BookFactory)
-		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
-	if (book->priv->book_factory == CORBA_OBJECT_NIL) {
-		g_warning ("e_book_construct: Could not obtain a handle "
-			   "to the Personal Addressbook Server!\n");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * e_book_new:
- */
-EBook *
-e_book_new (void)
-{
-	EBook *book;
-
-	book = gtk_type_new (E_BOOK_TYPE);
-
-	if (! e_book_construct (book)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		return NULL;
-	}
-
-	return book;
-}
-
-/* User authentication. */
-
-void
-e_book_authenticate_user (EBook         *book,
-			  const char    *user,
-			  const char    *passwd,
-			  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,
-							   &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:
- */
-ECard *
-e_book_get_card (EBook       *book,
-		 const char  *id)
-{
-	char  *vcard;
-	ECard *card;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return NULL;
-	}
-
-	vcard = e_book_get_vcard (book, id);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_get_card: Got bogus VCard from PAS!\n");
-		return NULL;
-	}
-
-	card = e_card_new (vcard);
-	g_free(vcard);
-	
-	e_card_set_id(card, id);
-	card->book = book;
-	gtk_object_ref (GTK_OBJECT (card->book));
-
-	return card;
-}
-
-/**
- * e_book_get_vcard:
- */
-char *
-e_book_get_vcard (EBook       *book,
-		  const char  *id)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *vcard;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_vcard: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	vcard = GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book,
-					  (GNOME_Evolution_Addressbook_CardId) id,
-					  &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_vcard: Exception getting VCard from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (vcard == NULL || strlen (vcard) == 0) {
-		g_warning ("e_book_get_vcard: Got NULL VCard from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (vcard);
-	CORBA_free (vcard);
-
-	return retval;
-}
-
-/* Deleting cards. */
-
-/**
- * e_book_remove_card:
- */
-gboolean
-e_book_remove_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	const char *id;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	id = e_card_get_id (card);
-	g_assert (id != NULL);
-
-	return e_book_remove_card_by_id (book, id, cb, closure);
-}
-
-/**
- * e_book_remove_card_by_id:
- */
-gboolean
-e_book_remove_card_by_id (EBook         *book,
-			  const char    *id,
-			  EBookCallback  cb,
-			  gpointer       closure)
-
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (id != NULL,       FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	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 (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 (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;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	CORBA_Object_release (book->priv->book_factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBook: Exception while releasing BookFactory\n");
-
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	g_free (book->priv->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 1c9386cfa7..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,150 +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 (*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,
-					   EBookCallback         cb,
-					   gpointer              closure);
-
-/* Fetching cards. */
-ECard    *e_book_get_card                 (EBook                 *book,
-					   const char            *id);
-char     *e_book_get_vcard                (EBook                 *book,
-					   const char            *id);
-
-/* Deleting cards. */
-gboolean  e_book_remove_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_remove_card_by_id        (EBook                 *book,
-					   const char            *id,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Adding cards. */
-gboolean  e_book_add_card                 (EBook                 *book,
-					   ECard                 *card,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-gboolean  e_book_add_vcard                (EBook                 *book,
-					   const char            *vcard,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-
-/* Modifying cards. */
-gboolean  e_book_commit_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_commit_vcard             (EBook                 *book,
-					   const char            *vcard,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Checking to see if we're connected to the card repository. */
-gboolean  e_book_check_connection         (EBook                 *book);
-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 19352e4755..0000000000
--- a/addressbook/backend/ebook/e-card-compare.c
+++ /dev/null
@@ -1,528 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 by getting it in here now, I can fix it
-   up w/o adding a new feature when we are in feature freeze. :-) */
-
-/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
-	{ "jon", "john" },   /* Ah, the hacker's perogative */
-	{ "joseph", "joe" },
-	{ "robert", "bob" },
-	{ "richard", "dick" },
-	{ "william", "bill" },
-	{ "anthony", "tony" },
-	{ "michael", "mike" },
-	{ "eric", "erik" },
-	{ "elizabeth", "liz" },
-	{ "jeff", "geoff" },
-	{ "jeff", "geoffrey" },
-	{ "jim", "james" },
-	{ "abigal", "abby" },
-	{ "amanda", "amy" },
-	{ "amanda", "manda" },
-	{ "jennifer", "jenny" },
-	{ "rebecca", "becca" },
-	{ "rebecca", "becky" },
-	{ "anderson", "andersen" },
-	/* We could go on and on... */
-	{ NULL, NULL }
-};
-	
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b)
-{
-	gint i, len_a, len_b;
-
-	/* This will cause "Chris" and "Christopher" to match. */
-	len_a = g_utf8_strlen (a, -1);
-	len_b = g_utf8_strlen (b, -1);
-	if (!g_utf8_strncasecmp (a, b, MIN (len_a, len_b)))
-		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 (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 (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);
-
-	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 (a->given, b->given)) {
-			++matches;
-			given_match = TRUE;
-		}
-	}
-
-	if (a->additional && b->additional) {
-		++possible;
-		if (name_fragment_match (a->additional, b->additional)) {
-			++matches;
-			additional_match = TRUE;
-		}
-	}
-
-	if (a->family && b->family) {
-		++possible;
-		if (name_fragment_match (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_PARTIAL : E_CARD_MATCH_VAGUE;
-
-	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_PARTIAL;
-
-	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 e5f034600b..0000000000
--- a/addressbook/backend/ebook/e-card-compare.h
+++ /dev/null
@@ -1,58 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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 void (*ECardMatchQueryCallback) (ECard *card, ECard *match, ECardMatchType type, gpointer closure);
-
-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 0f379d3477..0000000000
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GnomeCard - a graphical contact manager.
- *
- * pairs.h: This file is part of GnomeCard.
- * 
- * Copyright (C) 1999 The Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __E_CARD_PAIRS_H__
-#define __E_CARD_PAIRS_H__
-
-#include <libversit/vcc.h>
-#include <ebook/e-card.h>
-
-
-#if 0
-struct pair
-{
-	char *str;
-	ECardPropertyType i ;
-};
-
-struct pair prop_lookup[] = {
-		{        VCFullNameProp, PROP_FNAME },
-		{            VCNameProp, PROP_NAME },
-		{           VCPhotoProp, PROP_PHOTO },
-		{       VCBirthDateProp, PROP_BDAY },
-		{             VCAdrProp, PROP_DELADDR },
-		{   VCDeliveryLabelProp, PROP_DELLABEL },
-		{       VCTelephoneProp, PROP_PHONE },
-		{    VCEmailAddressProp, PROP_EMAIL },
-		{          VCMailerProp, PROP_MAILER },
-		{        VCTimeZoneProp, PROP_TIMEZN },
-		{             VCGeoProp, PROP_GEOPOS },
-		{           VCTitleProp, PROP_TITLE },
-		{    VCBusinessRoleProp, PROP_ROLE },
-		{            VCLogoProp, PROP_LOGO },
-		{           VCAgentProp, PROP_AGENT },
-		{             VCOrgProp, PROP_ORG },
-		{      VCCategoriesProp, PROP_CATEGORIES },
-		{         VCCommentProp, PROP_COMMENT },
-		{     VCLastRevisedProp, PROP_REV },
-		{   VCPronunciationProp, PROP_SOUND },
-		{             VCURLProp, PROP_URL },
-		{    VCUniqueStringProp, PROP_UID },
-		{         VCVersionProp, PROP_VERSION },
-		{       VCPublicKeyProp, PROP_KEY },
-		{           VCValueProp, PROP_VALUE },
-		{        VCEncodingProp, PROP_ENCODING },
-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },
-		{            VC8bitProp, PROP_8BIT },
-		{          VCBase64Prop, PROP_BASE64 },
-		{        VCLanguageProp, PROP_LANG },
-		{         VCCharSetProp, PROP_CHARSET },
-		{ NULL, PROP_NONE} };
-
-struct pair photo_pairs[] = {
-		{ VCGIFProp, PHOTO_GIF },
-		{ VCCGMProp, PHOTO_CGM },
-		{ VCWMFProp, PHOTO_WMF },
-		{ VCBMPProp, PHOTO_BMP },
-		{ VCMETProp, PHOTO_MET },
-		{ VCPMBProp, PHOTO_PMB },
-		{ VCDIBProp, PHOTO_DIB },
-		{ VCPICTProp, PHOTO_PICT },
-		{ VCTIFFProp, PHOTO_TIFF },
-		{ VCPDFProp, PHOTO_PDF },
-		{ VCPSProp, PHOTO_PS },
-		{ VCJPEGProp, PHOTO_JPEG },
-		{ VCMPEGProp, PHOTO_MPEG },
-		{ VCMPEG2Prop, PHOTO_MPEG2 },
-		{ VCAVIProp, PHOTO_AVI },
-		{ VCQuickTimeProp, PHOTO_QTIME },
-		{ NULL, 0 } };
-
-struct pair email_pairs[] = {
-		{ VCAOLProp, EMAIL_AOL },
-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
-		{ VCATTMailProp, EMAIL_ATT },
-		{ VCCISProp, EMAIL_CIS },
-		{ VCEWorldProp, EMAIL_EWORLD },
-		{ VCInternetProp, EMAIL_INET },
-		{ VCIBMMailProp, EMAIL_IBM },
-		{ VCMCIMailProp, EMAIL_MCI },
-		{ VCPowerShareProp, EMAIL_POWERSHARE },
-		{ VCProdigyProp, EMAIL_PRODIGY },
-		{ VCTLXProp, EMAIL_TLX },
-		{ VCX400Prop, EMAIL_X400 },
-		{ NULL, 0 } };
-
-struct pair sound_pairs[] = {
-		{ VCAIFFProp, SOUND_AIFF },
-		{ VCPCMProp, SOUND_PCM },
-		{ VCWAVEProp, SOUND_WAVE },
-		{ NULL, 0 } };
-
-struct pair key_pairs[] = {
-		{ VCX509Prop, KEY_X509 },
-		{ VCPGPProp, KEY_PGP },
-		{ NULL, 0 } };
-	  
-
-#endif
-#endif /* ! __E_CARD_PAIRS_H__ */
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
deleted file mode 100644
index a9f33350d5..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1138 +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 <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,
-};
-
-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",         "File As",       "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",       "Name",          "Name",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name",     "Family Name",   "Family Name",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "email",           "Email",         "Email",    E_CARD_SIMPLE_EMAIL_ID_EMAIL,        E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone",   "Primary",       "Prim",     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", "Assistant",     "Assistant",E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone",  "Business",      "Bus",      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone",  "Callback",      "Callback", E_CARD_SIMPLE_PHONE_ID_CALLBACK,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone",   "Company",       "Comp",     E_CARD_SIMPLE_PHONE_ID_COMPANY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone",      "Home",          "Home",     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",             "Organization",  "Org",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "business_address","Business",      "Bus",      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "home_address",    "Home",          "Home",     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone",    "Mobile",        "Mobile",   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone",       "Car",           "Car",      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax",    "Business Fax",  "Bus Fax",  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax",        "Home Fax",      "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","Business 2",    "Bus 2",    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "home_phone_2",    "Home 2",        "Home 2",   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn",            "ISDN",          "ISDN",     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone",     "Other",         "Other",    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,    "other_fax",       "Other Fax",     "Other Fax", E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager",           "Pager",         "Pager",    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio",           "Radio",         "Radio",    E_CARD_SIMPLE_PHONE_ID_RADIO,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex",           "Telex",         "Telex",    E_CARD_SIMPLE_PHONE_ID_TELEX,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TTYTTD,       "tty",             "TTY",           "TTY",      E_CARD_SIMPLE_PHONE_ID_TTYTTD,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "other_address",   "Other",         "Other",    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "email_2",         "Email 2",       "Email 2",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "email_3",         "Email 3",       "Email 3",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",             "Web Site",      "Url",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",        "Department",    "Dep",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",          "Office",        "Off",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",           "Title",         "Title",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",            "Profession",    "Prof",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",         "Manager",       "Man",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",       "Assistant",     "Ass",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",        "Nickname",      "Nick",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",          "Spouse",        "Spouse",   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",            "Note",          "Note",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",           "Free-busy URL", "FBUrl",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary",     "Anniversary",   "Anniv",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",      "Birth Date",    "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",          "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",       "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_CATEGORIES,         "categories",      "Categories",    "Categories", 0,                                 E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-};
-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[] = {
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */
-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */
-	E_CARD_PHONE_CELL | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Business",
-	"Business 2",
-	"Business Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mobile",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pager",
-	"Primary",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_short_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Bus",
-	"Bus 2",
-	"Bus Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mob",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pag",
-	"Prim",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-ECardAddressFlags addr_correspondences[] = {
-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */
-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */
-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */
-};
-
-char *address_names[] = {
-	"Business",
-	"Home",
-	"Other",
-};
-
-/**
- * e_card_simple_get_type:
- * @void: 
- * 
- * Registers the &ECardSimple class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECardSimple class.
- **/
-GtkType
-e_card_simple_get_type (void)
-{
-	static GtkType simple_type = 0;
-
-	if (!simple_type) {
-		GtkTypeInfo simple_info = {
-			"ECardSimple",
-			sizeof (ECardSimple),
-			sizeof (ECardSimpleClass),
-			(GtkClassInitFunc) e_card_simple_class_init,
-			(GtkObjectInitFunc) e_card_simple_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		simple_type = gtk_type_unique (gtk_object_get_type (), &simple_info);
-	}
-
-	return simple_type;
-}
-
-/**
- * e_card_simple_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ECardSimple that wraps the @VCard.
- */
-ECardSimple *
-e_card_simple_new (ECard *card)
-{
-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));
-	gtk_object_set(GTK_OBJECT(simple),
-		       "card", card,
-		       NULL);
-	return simple;
-}
-
-ECardSimple *
-e_card_simple_duplicate(ECardSimple *simple)
-{
-	char *vcard = e_card_simple_get_vcard(simple);
-	ECard *card = e_card_new(vcard);
-	ECardSimple *new_simple = e_card_simple_new(card);
-	g_free (vcard);
-	return new_simple;
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- *
- * Returns: a string representing the id of the simple, which is unique
- * within its book.
- */
-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("");
-}
-
-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_free (simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_address_label_free(simple->address[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_delivery_address_free(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_free(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_copy(phone);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-			g_free(simple->email[i]);
-			simple->email[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if ((simple->email[i] == NULL)) {
-					simple->email[i] = g_strdup(email);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_address_label_free(simple->address[i]);
-			simple->address[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((address->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->address[i] == NULL)) {
-					simple->address[i] = e_card_address_label_copy(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_free(simple->delivery[i]);
-			simple->delivery[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->delivery[i] == NULL)) {
-					simple->delivery[i] = e_card_delivery_address_copy(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		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;
-		int iterator_next = 1;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			phone = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_phone_free(simple->phone[i]);
-						simple->phone[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-			if (simple->phone[i]) {
-				simple->phone[i]->flags = phone_correspondences[i];
-				e_list_append(phone_list, simple->phone[i]);
-				e_card_phone_free(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			email = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if (simple->email[i]) {
-					if (*simple->email[i]) {
-						e_iterator_set(iterator, simple->email[i]);
-					} else {
-						e_iterator_delete(iterator);
-						iterator_next = 0;
-					}
-					g_free(simple->email[i]);
-					simple->email[i] = NULL;
-					break;
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-			if (simple->email[i]) {
-				e_list_append(email_list, simple->email[i]);
-				g_free(simple->email[i]);
-				simple->email[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			address = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags = addr_correspondences[i];
-						if (simple->address[i]->data && *simple->address[i]->data) {
-							e_iterator_set(iterator, simple->address[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_address_label_free(simple->address[i]);
-						simple->address[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->address[i]) {
-				simple->address[i]->flags = addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_free(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			delivery = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags = addr_correspondences[i];
-						if (!e_card_delivery_address_is_empty(simple->delivery[i])) {
-							e_iterator_set(iterator, simple->delivery[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_delivery_address_free(simple->delivery[i]);
-						simple->delivery[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->delivery[i]) {
-				simple->delivery[i]->flags = addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_free(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-		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)
-{
-	if (simple->phone[id])
-		e_card_phone_free(simple->phone[id]);
-	simple->phone[id] = e_card_phone_copy(phone);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	if (simple->email[id])
-		g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_address (ECardSimple          *simple,
-					   ECardSimpleAddressId  id,
-					   const ECardAddrLabel       *address)
-{
-	if (simple->address[id])
-		e_card_address_label_free(simple->address[id]);
-	simple->address[id] = e_card_address_label_copy(address);
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_copy(delivery);
-	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);
-			return NULL; /* FIXME!!!! */
-		} 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_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			if (simple->card) {
-				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;
-		default:
-			return NULL;
-		}
-	default:
-		return NULL;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (ECardSimple *simple)
-{
-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	char *trystring;
-	char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!full_name)
-		full_name = g_strdup("");
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-
-		name = e_card_name_from_string(full_name);
-		
-		if (!name) {
-			goto end;
-		}
-
-		style = -1;
-		
-		for (i = 0; i < 5; i++) {
-			trystring = name_to_style(name, company, i);
-			if (!strcmp(trystring, filestring)) {
-				g_free(trystring);
-				style = i;
-				goto end;
-			}
-			g_free(trystring);
-		}
-	}		
- end:
-		
-	g_free(filestring);
-	g_free(full_name);
-	g_free(company);
-	if (name)
-		e_card_name_free(name);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-		
-		if (!full_name)
-			full_name = g_strdup("");
-		if (!company)
-			company = g_strdup("");
-		name = e_card_name_from_string(full_name);
-		if (name) {
-			string = name_to_style(name, company, style);
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);
-			g_free(string);
-		}
-		g_free(full_name);
-		g_free(company);
-		e_card_name_free(name);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	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 = (char *) data;
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			address->data = NULL;
-			e_card_address_label_free(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = (char *) data;
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			phone->number = NULL;
-			e_card_phone_free(phone);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-			e_card_simple_set_email(simple,
-						field_data[field].list_type_index,
-						data);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-			break;
-		}
-		break;
-	}
-}
-					     
-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,
-					  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	default:
-		return E_CARD_SIMPLE_TYPE_STRING;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		return E_CARD_SIMPLE_TYPE_DATE;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		return E_CARD_SIMPLE_TYPE_STRING;
-	}
-}
-
-const char     *e_card_simple_get_ecard_field (ECardSimple         *simple,
-					       ECardSimpleField     field)
-{
-	return field_data[field].ecard_field;
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].name;
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].short_name;
-}
-
-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
-						       ECardSimpleArbitraryCallback *callback,
-						       gpointer                      closure)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (callback)
-				(*callback) (arbitrary, closure);
-		}
-		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_free(new_arb);
-				return;
-			}
-		}
-		new_arb = e_card_arbitrary_new();
-		new_arb->key = g_strdup(key);
-		new_arb->type = g_strdup(type);
-		new_arb->value = g_strdup(value);
-		e_list_append(list, new_arb);
-		e_card_arbitrary_free(new_arb);
-	}
-}
-
-/* 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 9e758516d3..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,220 +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_TTYTTD,
-	E_CARD_SIMPLE_PHONE_ID_LAST
-};
-
-/* We need HOME and WORK email addresses here. */
-enum _ECardSimpleEmailId {
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,
-	E_CARD_SIMPLE_EMAIL_ID_LAST
-};
-
-/* Should this include (BILLING/SHIPPING)? */
-enum _ECardSimpleAddressId {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	E_CARD_SIMPLE_ADDRESS_ID_LAST
-};
-
-enum _ECardSimpleType {
-	E_CARD_SIMPLE_TYPE_STRING,
-	E_CARD_SIMPLE_TYPE_DATE,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_PHONE_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_TTYTTD,
-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-        E_CARD_SIMPLE_FIELD_EMAIL_2,
-        E_CARD_SIMPLE_FIELD_EMAIL_3,
-        E_CARD_SIMPLE_FIELD_URL,
-        E_CARD_SIMPLE_FIELD_ORG_UNIT,
-        E_CARD_SIMPLE_FIELD_OFFICE,
-        E_CARD_SIMPLE_FIELD_TITLE,
-        E_CARD_SIMPLE_FIELD_ROLE,
-        E_CARD_SIMPLE_FIELD_MANAGER,
-        E_CARD_SIMPLE_FIELD_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_NICKNAME,
-        E_CARD_SIMPLE_FIELD_SPOUSE,
-        E_CARD_SIMPLE_FIELD_NOTE,
-        E_CARD_SIMPLE_FIELD_FBURL,
-	E_CARD_SIMPLE_FIELD_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_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);
-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);
-
-
-/* Use these only if building lists of specific types.  It should be
- * easier to use the above if you consider a phone field to be the
- * same as any other field.
- */
-const ECardPhone           *e_card_simple_get_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id,
-								 const ECardPhone             *phone);
-void                        e_card_simple_set_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id,
-								 const char                   *email);
-void                        e_card_simple_set_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,
-								 ECardSimpleArbitraryCallback *callback,
-								 gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key);
-/* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key,
-								 const char                   *type,
-								 const char                   *value);
-void                        e_card_simple_sync_card             (ECardSimple                  *simple);
-
-/* 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 542ca13517..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,89 +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 {
-	char            *prefix;        /* Mr. */
-	char            *given;         /* John */
-	char            *additional;    /* Quinlan */
-	char            *family;        /* Public */
-	char            *suffix;        /* Esq. */
-} ECardName;
-
-typedef struct {
-	int year;
-	int month;
-	int day;
-} ECardDate;
-
-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_PHONE_PREF  = 1 << 0,
-	E_CARD_PHONE_WORK  = 1 << 1,
-	E_CARD_PHONE_HOME  = 1 << 2,
-	E_CARD_PHONE_VOICE = 1 << 3,
-	E_CARD_PHONE_FAX   = 1 << 4,
-	E_CARD_PHONE_MSG   = 1 << 5,
-	E_CARD_PHONE_CELL  = 1 << 6,
-	E_CARD_PHONE_PAGER = 1 << 7,
-	E_CARD_PHONE_BBS   = 1 << 8,
-	E_CARD_PHONE_MODEM = 1 << 9,
-	E_CARD_PHONE_CAR   = 1 << 10,
-	E_CARD_PHONE_ISDN  = 1 << 11,
-	E_CARD_PHONE_VIDEO = 1 << 12 
-} ECardPhoneFlags;
-
-typedef struct {
-	ECardPhoneFlags  flags;
-	char            *number;
-} ECardPhone;
-
-/* DELIVERY ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_ADDR_HOME   = 1 << 0, 
-	E_CARD_ADDR_WORK   = 1 << 1,
-	E_CARD_ADDR_POSTAL = 1 << 2, 
-	E_CARD_ADDR_PARCEL = 1 << 3, 
-	E_CARD_ADDR_DOM    = 1 << 4,
-	E_CARD_ADDR_INTL   = 1 << 5 
-} ECardAddressFlags;
-
-typedef struct {
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-#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 53ba425a48..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,4183 +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 <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"
-
-#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_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,
-};
-
-#if 0
-static VObject *card_convert_to_vobject (ECard *crd);
-#endif
-static void parse(ECard *card, VObject *vobj);
-static void e_card_init (ECard *card);
-static void e_card_class_init (ECardClass *klass);
-
-static void e_card_destroy (GtkObject *object);
-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void assign_string(VObject *vobj, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name);
-static ECardDate e_card_date_from_string (char *str);
-
-static void parse_bday(ECard *card, VObject *object);
-static void parse_full_name(ECard *card, VObject *object);
-static void parse_file_as(ECard *card, VObject *object);
-static void parse_name(ECard *card, VObject *object);
-static void parse_email(ECard *card, VObject *object);
-static void parse_phone(ECard *card, VObject *object);
-static void parse_address(ECard *card, VObject *object);
-static void parse_address_label(ECard *card, VObject *object);
-static void parse_url(ECard *card, VObject *object);
-static void parse_org(ECard *card, VObject *object);
-static void parse_office(ECard *card, VObject *object);
-static void parse_title(ECard *card, VObject *object);
-static void parse_role(ECard *card, VObject *object);
-static void parse_manager(ECard *card, VObject *object);
-static void parse_assistant(ECard *card, VObject *object);
-static void parse_nickname(ECard *card, VObject *object);
-static void parse_spouse(ECard *card, VObject *object);
-static void parse_anniversary(ECard *card, VObject *object);
-static void parse_mailer(ECard *card, VObject *object);
-static void parse_fburl(ECard *card, VObject *object);
-static void parse_note(ECard *card, VObject *object);
-static void parse_related_contacts(ECard *card, VObject *object);
-static void parse_categories(ECard *card, VObject *object);
-static void parse_wants_html(ECard *card, VObject *object);
-static void parse_list(ECard *card, VObject *object);
-static void parse_list_show_addresses(ECard *card, VObject *object);
-static void parse_arbitrary(ECard *card, VObject *object);
-static void parse_id(ECard *card, VObject *object);
-static void parse_last_use(ECard *card, VObject *object);
-static void parse_use_score(ECard *card, VObject *object);
-
-static ECardPhoneFlags get_phone_flags (VObject *vobj);
-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);
-static ECardAddressFlags get_address_flags (VObject *vobj);
-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);
-
-static gchar *e_card_uri_extract_book_uri (const gchar *uri);
-static gchar *e_card_uri_extract_card_id  (const gchar *uri);
-
-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object);
-
-struct {
-	char *key;
-	ParsePropertyFunc function;
-} attribute_jump_array[] = 
-{
-	{ VCFullNameProp,            parse_full_name },
-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },
-	{ VCNameProp,                parse_name },
-	{ VCBirthDateProp,           parse_bday },
-	{ VCEmailAddressProp,        parse_email },
-	{ VCTelephoneProp,           parse_phone },
-	{ VCAdrProp,                 parse_address },
-	{ VCDeliveryLabelProp,       parse_address_label },
-	{ VCURLProp,                 parse_url },
-	{ VCOrgProp,                 parse_org },
-	{ "X-EVOLUTION-OFFICE",      parse_office },
-	{ VCTitleProp,               parse_title },
-	{ VCBusinessRoleProp,        parse_role },
-	{ "X-EVOLUTION-MANAGER",     parse_manager },
-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },
-	{ "NICKNAME",                parse_nickname },
-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },
-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   
-	{ VCMailerProp,              parse_mailer },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ 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;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));
-	while(vobj) {
-		VObject *next;
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	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;
-}
-
-ECard *
-e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard(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;
-}
-
-/**
- * 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);
-}
-
-EBook *
-e_card_get_book (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	return card->book;
-}
-
-const gchar *
-e_card_get_uri (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	if (card->uri == NULL && card->id && *card->id && card->book) {
-		const char *book_uri = e_book_get_uri (card->book);
-		if (book_uri)
-			card->uri = g_strdup_printf ("%s/%s", book_uri, card->id);
-	}
-	return card->uri;
-}
-
-static 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 *
-e_card_get_vobject (ECard *card)
-{
-	VObject *vobj;
-	const char *tmp;
-	
-	vobj = newVObject (VCCardProp);
-
-	if ( card->file_as && *card->file_as )
-		addPropValue(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if ( card->fname )
-		addPropValue(vobj, VCFullNameProp, card->fname);
-	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;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			addPropValue(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given )
-			addPropValue(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			addPropValue(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			addPropValue(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			addPropValue(nameprop, VCNameSuffixesProp, card->name->suffix);
-	}
-	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);
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if ( address->po )
-				addPropValue(addressprop, VCPostalBoxProp, address->po);
-			if ( address->ext )
-				addPropValue(addressprop, VCExtAddressProp, address->ext);
-			if ( address->street )
-				addPropValue(addressprop, VCStreetAddressProp, address->street);
-			if ( address->city )
-				addPropValue(addressprop, VCCityProp, address->city);
-			if ( address->region )
-				addPropValue(addressprop, VCRegionProp, address->region);
-			if ( address->code )
-				addPropValue(addressprop, VCPostalCodeProp, address->code);
-			if ( address->country )
-				addPropValue(addressprop, VCCountryNameProp, address->country);
-			addProp(addressprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->address_label ) {
-		EIterator *iterator = e_list_get_iterator(card->address_label);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *labelprop;
-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);
-			if (address_label->data)
-				labelprop = addPropValue(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-			addProp(labelprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->phone ) { 
-		EIterator *iterator = e_list_get_iterator(card->phone);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *phoneprop;
-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);
-			phoneprop = addPropValue(vobj, VCTelephoneProp, phone->number);
-			
-			set_phone_flags (phoneprop, phone->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->email ) { 
-		EIterator *iterator = e_list_get_iterator(card->email);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *emailprop;
-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		char *value;
-		value = e_card_date_to_string (card->bday);
-		addPropValue(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		addPropValue(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			addPropValue(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			addPropValue(orgprop, VCOrgUnitProp, card->org_unit);
-	}
-	
-	if (card->office)
-		addPropValue(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		addPropValue(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		addPropValue(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		addPropValue(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		addPropValue(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		addPropValue(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		addPropValue(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		char *value;
-		value = e_card_date_to_string (card->anniversary);
-		addPropValue(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		addPropValue(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->fburl)
-		addPropValue(vobj, "FBURL", card->fburl);
-	
-	if (card->note) {
-		VObject *noteprop;
-
-		noteprop = addPropValue(vobj, VCNoteProp, card->note);
-		addProp(noteprop, VCQuotedPrintableProp);
-	}
-
-	if (card->last_use) {
-		char *value;
-		value = e_card_date_to_string (card->last_use);
-		addPropValue (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);
-		addPropValue (vobj, "X-EVOLUTION-USE-SCORE", value);
-		g_free (value);
-	}
-
-	if (card->related_contacts && *card->related_contacts) {
-		addPropValue(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;
-		}
-		addPropValue (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		addPropValue (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->list) {
-		addPropValue (vobj, XEV_LIST, "TRUE");
-		addPropValue (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 = addPropValue (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				addPropValue (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	tmp = e_card_get_uri (card);
-	if (tmp == NULL)
-		tmp = card->id;
-	if (tmp) {
-		g_message ("unique string = [%s]", tmp);
-		addPropValue (vobj, VCUniqueStringProp, tmp);
-	}
-
-#if 0
-	
-	
-	if (crd->photo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCPhotoProp, 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (vprop, crd->photo.type);
-		add_CardProperty (vprop, &crd->photo.prop);
-	}
-
-	if (crd->xtension.l) {
-		GList *node;
-		
-		for (node = crd->xtension.l; node; node = node->next) {
-			CardXProperty *xp = (CardXProperty *) node->data;
-			addPropValue (vobj, xp->name, xp->data);
-			add_CardProperty (vobj, &xp->prop);
-		}
-	}
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		vprop = addPropValue (vobj, VCTimeZoneProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->timezn.prop);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		vprop = addPropValue (vobj, VCGeoLocationProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->geopos.prop);
-	}
-	
-	if (crd->logo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCLogoProp, 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (vprop, crd->logo.type);
-		add_CardProperty (vprop, &crd->logo.prop);
-	}
-	
-	if (crd->agent)
-	  addVObjectProp (vobj, card_convert_to_vobject (crd->agent));
-	
-	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,
-					    crd->sound.data, crd->sound.size);
-		else
-		  vprop = addPropValue (vobj, VCPronunciationProp, 
-				       crd->sound.data);
-		
-		add_SoundType (vprop, crd->sound.type);
-		add_CardProperty (vprop, &crd->sound.prop);
-	}
-	
-	if (crd->key.prop.used) {
-		vprop = addPropValue (vobj, VCPublicKeyProp, crd->key.data);
-		add_KeyType (vprop, crd->key.type);
-		add_CardProperty (vprop, &crd->key.prop);
-	}
-#endif
-	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);
-	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 (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);
-		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)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj)
-{
-	if ( card->name ) {
-		e_card_name_free(card->name);
-	}
-	card->name = g_new(ECardName, 1);
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-static void
-parse_bday(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->bday )
-			g_free(card->bday);
-		card->bday = g_new(ECardDate, 1);
-		*(card->bday) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_phone(ECard *card, VObject *vobj)
-{
-	ECardPhone *next_phone = g_new(ECardPhone, 1);
-	EList *list;
-
-	assign_string(vobj, &(next_phone->number));
-	next_phone->flags = get_phone_flags(vobj);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "phone", &list,
-		       NULL);
-	e_list_append(list, next_phone);
-	e_card_phone_free (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj)
-{
-	ECardDeliveryAddress *next_addr = g_new(ECardDeliveryAddress, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_free (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj)
-{
-	ECardAddrLabel *next_addr = g_new(ECardAddrLabel, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_free (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp);
-	g_free(card->org);
-	card->org = temp;
-
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp);
-	g_free(card->org_unit);
-	card->org_unit = temp;
-}
-
-static void
-parse_office(ECard *card, VObject *vobj)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, &(card->spouse));
-}
-
-static void
-parse_anniversary(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (card->anniversary)
-			g_free(card->anniversary);
-		card->anniversary = g_new(ECardDate, 1);
-		*(card->anniversary) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_mailer(ECard *card, VObject *vobj)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, &(card->mailer));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj)
-{
-	g_free(card->fburl);
-	assign_string(vobj, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj)
-{
-	g_free(card->note);
-	assign_string(vobj, &(card->note));
-}
-
-static void
-parse_related_contacts(ECard *card, VObject *vobj)
-{
-	g_free(card->related_contacts);
-	assign_string(vobj, &(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);
-}
-
-static void
-parse_categories(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-static void
-parse_wants_html(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->wants_html = TRUE;
-			card->wants_html_set = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->wants_html = FALSE;
-			card->wants_html_set = TRUE;
-		}
-		free(str);
-	}
-}
-
-static void
-parse_list(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->list = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->list = FALSE;
-		}
-		free(str);
-	}
-}
-
-static void
-parse_list_show_addresses(ECard *card, VObject *vobj)
-{
-	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)
-{
-	ECardArbitrary *arbitrary = e_card_arbitrary_new();
-	VObjectIterator iterator;
-	EList *list;
-	for ( initPropIterator (&iterator, vobj); moreIteration(&iterator); ) {
-		VObject *temp = nextVObject(&iterator);
-		const char *name = vObjectName(temp);
-		if (name && !strcmp(name, "TYPE")) {
-			g_free(arbitrary->type);
-			assign_string(temp, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_free(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		gchar *str = fakeCString (vObjectUStringZValue (vobj));
-		gchar *id;
-		if ( card->id )
-			g_free(card->id);
-		if ( card->uri )
-			g_free(card->uri);
-		
-		id = e_card_uri_extract_card_id (str);
-		if (id) {
-			card->id = id;
-			card->uri = g_strdup (str);
-		} else {
-			card->id = g_strdup (str);
-			card->uri = NULL;
-		}
-		free (str);
-	}
-}
-
-static void
-parse_last_use(ECard *card, VObject *vobj)
-{
-	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);
-	}
-}
-
-static void
-parse_use_score(ECard *card, VObject *vobj)
-{
-	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)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj);
-}
-
-static void
-parse(ECard *card, VObject *vobj)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator));
-	}
-	if (!card->fname) {
-		card->fname = g_strdup("");
-	}
-	if (!card->name) {
-		card->name = e_card_name_from_string(card->fname);
-	}
-	if (!card->file_as) {
-		ECardName *name = card->name;
-		char *strings[3], **stringptr;
-		char *string;
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		card->file_as = string;
-	}
-}
-
-static void
-e_card_class_init (ECardClass *klass)
-{
-	int i;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	klass->attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for ( i = 0; i < sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {
-		g_hash_table_insert(klass->attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);
-	}
-
-	gtk_object_add_arg_type ("ECard::file_as",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);
-	gtk_object_add_arg_type ("ECard::full_name",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  
-	gtk_object_add_arg_type ("ECard::name",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("ECard::address",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("ECard::address_label",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);
-	gtk_object_add_arg_type ("ECard::phone",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);
-	gtk_object_add_arg_type ("ECard::email",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);
-	gtk_object_add_arg_type ("ECard::birth_date",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);
-	gtk_object_add_arg_type ("ECard::url",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  
-	gtk_object_add_arg_type ("ECard::org",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);
-	gtk_object_add_arg_type ("ECard::org_unit",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);
-	gtk_object_add_arg_type ("ECard::office",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);
-	gtk_object_add_arg_type ("ECard::title",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  
-	gtk_object_add_arg_type ("ECard::role",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);
-	gtk_object_add_arg_type ("ECard::manager",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);
-	gtk_object_add_arg_type ("ECard::assistant",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);
-	gtk_object_add_arg_type ("ECard::nickname",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);
-	gtk_object_add_arg_type ("ECard::spouse",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);
-	gtk_object_add_arg_type ("ECard::anniversary",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);
-	gtk_object_add_arg_type ("ECard::mailer",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);
-	gtk_object_add_arg_type ("ECard::fburl",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
-	gtk_object_add_arg_type ("ECard::note",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
-	gtk_object_add_arg_type ("ECard::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->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_free (ECardPhone *phone)
-{
-	if ( phone ) {
-		g_free(phone->number);
-
-		g_free(phone);
-	}
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = g_new(ECardPhone, 1);
-		phone_copy->number = g_strdup(phone->number);
-		phone_copy->flags  = phone->flags;
-		return phone_copy;
-	} else
-		return NULL;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_new (void)
-{
-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);
-
-	newaddr->po      = NULL;
-	newaddr->ext     = NULL;
-	newaddr->street  = NULL;
-	newaddr->city    = NULL;
-	newaddr->region  = NULL;
-	newaddr->code    = NULL;
-	newaddr->country = NULL;
-	newaddr->flags   = 0;
-
-	return newaddr;
-}
-
-void
-e_card_delivery_address_free (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		g_free(addr->po);
-		g_free(addr->ext);
-		g_free(addr->street);
-		g_free(addr->city);
-		g_free(addr->region);
-		g_free(addr->code);
-		g_free(addr->country);
-
-		g_free(addr);
-	}
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = g_new(ECardDeliveryAddress, 1);
-		addr_copy->po      = g_strdup(addr->po     );
-		addr_copy->ext     = g_strdup(addr->ext    );
-		addr_copy->street  = g_strdup(addr->street );
-		addr_copy->city    = g_strdup(addr->city   );
-		addr_copy->region  = g_strdup(addr->region );
-		addr_copy->code    = g_strdup(addr->code   );
-		addr_copy->country = g_strdup(addr->country);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-gboolean
-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)
-{
-	return (((addr->po      == NULL) || (*addr->po      == 0)) &&
-		((addr->ext     == NULL) || (*addr->ext     == 0)) &&
-		((addr->street  == NULL) || (*addr->street  == 0)) &&
-		((addr->city    == NULL) || (*addr->city    == 0)) &&
-		((addr->region  == NULL) || (*addr->region  == 0)) &&
-		((addr->code    == NULL) || (*addr->code    == 0)) &&
-		((addr->country == NULL) || (*addr->country == 0)));
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_from_label(const ECardAddrLabel *label)
-{
-	ECardDeliveryAddress *addr = g_new(ECardDeliveryAddress, 1);
-	EAddressWestern *western = e_address_western_parse (label->data);
-	
-	addr->po      = g_strdup (western->po_box     );
-	addr->ext     = g_strdup (western->extended   );
-	addr->street  = g_strdup (western->street     );
-	addr->city    = g_strdup (western->locality   );
-	addr->region  = g_strdup (western->region     );
-	addr->code    = g_strdup (western->postal_code);
-	addr->country = g_strdup (western->country    );
-	addr->flags   = label->flags;
-	
-	e_address_western_free(western);
-	
-	return addr;
-}
-
-char *
-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)
-{
-	char *strings[5], **stringptr = strings;
-	char *line1, *line22, *line2;
-	char *final;
-	if (addr->po && *addr->po)
-		*(stringptr++) = addr->po;
-	if (addr->street && *addr->street)
-		*(stringptr++) = addr->street;
-	*stringptr = NULL;
-	line1 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->region && *addr->region)
-		*(stringptr++) = addr->region;
-	if (addr->code && *addr->code)
-		*(stringptr++) = addr->code;
-	*stringptr = NULL;
-	line22 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->city && *addr->city)
-		*(stringptr++) = addr->city;
-	if (line22 && *line22)
-		*(stringptr++) = line22;
-	*stringptr = NULL;
-	line2 = g_strjoinv(", ", strings);
-	stringptr = strings;
-	if (line1 && *line1)
-		*(stringptr++) = line1;
-	if (addr->ext && *addr->ext)
-		*(stringptr++) = addr->ext;
-	if (line2 && *line2)
-		*(stringptr++) = line2;
-	if (addr->country && *addr->country)
-		*(stringptr++) = addr->country;
-	*stringptr = NULL;
-	final = g_strjoinv("\n", strings);
-	g_free(line1);
-	g_free(line22);
-	g_free(line2);
-	return final;
-}
-
-ECardAddrLabel *
-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)
-{
-	ECardAddrLabel *label;
-	label = e_card_address_label_new();
-	label->flags = addr->flags;
-	label->data = e_card_delivery_address_to_string(addr);
-
-	return label;
-}
-
-ECardAddrLabel *
-e_card_address_label_new (void)
-{
-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);
-
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_free (ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		g_free(addr->data);
-
-		g_free(addr);
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = g_new(ECardAddrLabel, 1);
-		addr_copy->data    = g_strdup(addr->data);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-ECardName *e_card_name_new(void)
-{
-	ECardName *newname = g_new(ECardName, 1);
-
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_free(ECardName *name)
-{
-	if (name) {
-		if ( name->prefix )
-			g_free(name->prefix);
-		if ( name->given )
-			g_free(name->given);
-		if ( name->additional )
-			g_free(name->additional);
-		if ( name->family )
-			g_free(name->family);
-		if ( name->suffix )
-			g_free(name->suffix);
-		g_free ( name );
-	}
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = g_new(ECardName, 1);
-		
-		newname->prefix = g_strdup(name->prefix);
-		newname->given = g_strdup(name->given);
-		newname->additional = g_strdup(name->additional);
-		newname->family = g_strdup(name->family);
-		newname->suffix = g_strdup(name->suffix);
-
-		return newname;
-	} else
-		return NULL;
-}
-
-char *
-e_card_name_to_string(const ECardName *name)
-{
-	char *strings[6], **stringptr = strings;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (name->prefix && *name->prefix)
-		*(stringptr++) = name->prefix;
-	if (name->given && *name->given)
-		*(stringptr++) = name->given;
-	if (name->additional && *name->additional)
-		*(stringptr++) = name->additional;
-	if (name->family && *name->family)
-		*(stringptr++) = name->family;
-	if (name->suffix && *name->suffix)
-		*(stringptr++) = name->suffix;
-	*stringptr = NULL;
-	return g_strjoinv(" ", strings);
-}
-
-ECardName *
-e_card_name_from_string(const char *full_name)
-{
-	ECardName *name = g_new(ECardName, 1);
-	ENameWestern *western = e_name_western_parse (full_name);
-	
-	name->prefix     = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
-	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffix     = g_strdup (western->suffix);
-	
-	e_name_western_free(western);
-	
-	return name;
-}
-
-
-/* This *so* doesn't belong here... at least not implemented in a
-   sucky way like this.  But by getting it in here now, I can fix it
-   up w/o adding a new feature when we are in feature freeze. :-) */
-
-/* This is very Anglocentric.  Maybe it should be by locale? */
-static gchar *name_synonyms[][2] = {
-	{ "Jon", "John" },   /* Ah, the hacker's perogative */
-	{ "Jon", "Jonathan" },
-	{ "Daniel", "Dan" },
-	{ "Joseph", "Joe" },
-	{ "Robert", "Rob" },
-	{ "Robert", "Bob" },
-	{ "Richard", "Rich" },
-	{ "Richard", "Dick" },
-	{ "William", "Will" },
-	{ "William", "Bill" },
-	{ "Anthony", "Tony" },
-	{ "Steven", "Steve" },
-	{ "Michael", "Mike" },
-	{ "Douglas", "Doug" },
-	{ "Sidney", "Sid" },
-	{ "Eric", "Erik" },
-	{ "Chris", "Christopher" },
-	{ "Chris", "Christine" },
-	{ "Chris", "Christy" },
-	{ "Elizabeth", "Liz" },
-	{ "Jeff", "Geoff" },
-	{ "Jeff", "Jeffrey" },
-	{ "Jeff", "Geoffrey" },
-	{ "Jim", "James" },
-	{ "Abigal", "Abby" },
-	{ "Amanda", "Amy" },
-	{ "Amanda", "Manda" },
-	{ "Di", "Diana" },
-	{ "Di", "Diane" },
-	{ "Maxine", "Max" },
-	{ "Rebecca", "Becca" },
-	{ "Rebecca", "Becky" },
-	{ "Jennifer", "Jen" },
-	{ "Jennifer", "Jenny" },
-	/* We could go on and on... */
-	{ NULL, NULL }
-};
-	
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b)
-{
-	gint i;
-	gboolean nickname_match = FALSE;
-
-	if (!g_strcasecmp (a, b))
-		return TRUE;
-
-	/* Check for nicknames.  Yes, the linear search blows. */
-	for (i=0; name_synonyms[i][0]; ++i) {
-		if (!g_strcasecmp (name_synonyms[i][1], a)) {
-			a = name_synonyms[i][0];
-			nickname_match = TRUE;
-			break;
-		}
-	}
-
-	for (i=0; name_synonyms[i][0]; ++i) {
-		if (!g_strcasecmp (name_synonyms[i][1], b)) {
-			b = name_synonyms[i][0];
-			nickname_match = TRUE;
-			break;
-		}
-	}
-
-	return nickname_match && !g_strcasecmp (a, b);
-}
-
-gboolean
-e_card_name_match_string (const ECardName *name, const gchar *str)
-{
-	gchar *cpy, *name_str;
-	gchar **strv, **namev;
-	gint i, j, match_count;
-	gboolean matched = FALSE;
-
-	g_return_val_if_fail (name != NULL, FALSE);
-	g_return_val_if_fail (str != NULL, FALSE);
-
-	cpy = g_strdup (str);
-	strv = g_strsplit (cpy, " ", 0);
-	for (i=0; strv[i]; ++i)
-		g_strstrip (strv[i]);
-
-	name_str = e_card_name_to_string (name);
-	namev = g_strsplit (name_str, " ", 0);
-	for (i=0; namev[i]; ++i)
-		g_strstrip (namev[i]);
-
-	match_count = 0;
-	i = j = 0;
-	while (strv[i] && namev[j]) {
-		gint k1, k2;
-
-		for (k1=0; strv[i+k1]; ++k1) {
-			if (name_fragment_match (strv[i+k1], namev[j]))
-				break;
-		}
-
-		for (k2=0; namev[j+k2]; ++k2) {
-			if (name_fragment_match (strv[i], namev[j+k2]))
-				break;
-		}
-
-		if (strv[i+k1] == NULL && namev[j+k2] == NULL) {
-			matched = FALSE;
-			goto cleanup_and_return;
-		}
-
-		++match_count;
-		
-		if (k1 < k2) {
-			i += k1+1;
-			++j;
-		} else if (k2 < k1) {
-			++i;
-			j += k2+1;
-		} else if (k1 == k2) {
-			i += k1+1;
-			j += k2+1;
-		}
-	}
-
-	/* This rule could be made more precise.
-	   As it is, it will say that "Joe Smith" will match the name
-	   "Joe Allen Smith" (which is good), but "de Icaza" will match
-	   either "Miguel de Icaza" as well as Miguel's shiftless
-	   brother "Roger de Icaza".  In this sort of a case, the match
-	   threshold should go up to 3. */
-	if (match_count >= 2)
-		matched = TRUE;
-
-	
- cleanup_and_return:
-	g_free (strv);
-	g_free (cpy);
-	g_free (namev);
-	g_free (name_str);
-
-	return matched;
-}
-
-ECardArbitrary *
-e_card_arbitrary_new(void)
-{
-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = g_new(ECardArbitrary, 1);
-		arb_copy->key = g_strdup(arbitrary->key);
-		arb_copy->type = g_strdup(arbitrary->type);
-		arb_copy->value = g_strdup(arbitrary->value);
-		return arb_copy;
-	} else
-		return NULL;
-}
-
-void
-e_card_arbitrary_free(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		g_free(arbitrary->key);
-		g_free(arbitrary->type);
-		g_free(arbitrary->value);
-	}
-	g_free(arbitrary);
-}
-
-/* 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 = (*xa == *xb);
-		--xa;
-		--xb;
-	}
-
-	match = match && ((*xa == *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;
-}
-
-/*
- * 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->uri);
-	g_free(card->file_as);
-	g_free(card->fname);
-	if ( card->name )
-		e_card_name_free(card->name);
-	g_free(card->bday);
-
-	g_free(card->url);
-	g_free(card->org);
-	g_free(card->org_unit);
-	g_free(card->office);
-	g_free(card->title);
-	g_free(card->role);
-	g_free(card->manager);
-	g_free(card->assistant);
-	g_free(card->nickname);
-	g_free(card->spouse);
-	g_free(card->anniversary);
-	g_free(card->fburl);
-	g_free(card->note);
-	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->name)
-			e_card_name_free (card->name);
-		if (card->fname == NULL)
-			card->fname = g_strdup("");
-		card->name = e_card_name_from_string (card->fname);
-		break;
-	case ARG_NAME:
-		if ( card->name )
-			e_card_name_free(card->name);
-		card->name = e_card_name_copy(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_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));
-		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_copy, 
-						   (EListFreeFunc) e_card_delivery_address_free,
-						   NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address);
-		break;
-	case ARG_ADDRESS_LABEL:
-		if (!card->address_label)
-			card->address_label = e_list_new((EListCopyFunc) e_card_address_label_copy, 
-							 (EListFreeFunc) e_card_address_label_free,
-							 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address_label);
-		break;
-	case ARG_PHONE:
-		if (!card->phone)
-			card->phone = e_list_new((EListCopyFunc) e_card_phone_copy, 
-						 (EListFreeFunc) e_card_phone_free,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone);
-		break;
-	case ARG_EMAIL:
-		if (!card->email)
-			card->email = e_list_new((EListCopyFunc) g_strdup, 
-						 (EListFreeFunc) g_free,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email);
-		break;
-	case ARG_CATEGORIES:
-		{
-			int i;
-			char ** strs;
-			int length;
-			EIterator *iterator;
-			if (!card->categories)
-				card->categories = e_list_new((EListCopyFunc) g_strdup, 
-							      (EListFreeFunc) g_free,
-							      NULL);
-			length = e_list_length(card->categories);
-			strs = g_new(char *, length + 1);
-			for (iterator = e_list_get_iterator(card->categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {
-				strs[i] = (char *)e_iterator_get(iterator);
-			}
-			strs[i] = 0;
-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);
-			g_free(strs);
-		}
-		break;
-	case ARG_CATEGORY_LIST:
-		if (!card->categories)
-			card->categories = e_list_new((EListCopyFunc) g_strdup, 
-						      (EListFreeFunc) g_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->categories);
-		break;
-	case ARG_BIRTH_DATE:
-		GTK_VALUE_POINTER(*arg) = card->bday;
-		break;
-	case ARG_URL:
-		GTK_VALUE_STRING(*arg) = card->url;
-		break;
-	case ARG_ORG:
-		GTK_VALUE_STRING(*arg) = card->org;
-		break;
-	case ARG_ORG_UNIT:
-		GTK_VALUE_STRING(*arg) = card->org_unit;
-		break;
-	case ARG_OFFICE:
-		GTK_VALUE_STRING(*arg) = card->office;
-		break;
-	case ARG_TITLE:
-		GTK_VALUE_STRING(*arg) = card->title;
-		break;
-	case ARG_ROLE:
-		GTK_VALUE_STRING(*arg) = card->role;
-		break;
-	case ARG_MANAGER:
-		GTK_VALUE_STRING(*arg) = card->manager;
-		break;
-	case ARG_ASSISTANT:
-		GTK_VALUE_STRING(*arg) = card->assistant;
-		break;
-	case ARG_NICKNAME:
-		GTK_VALUE_STRING(*arg) = card->nickname;
-		break;
-	case ARG_SPOUSE:
-		GTK_VALUE_STRING(*arg) = card->spouse;
-		break;
-	case ARG_ANNIVERSARY:
-		GTK_VALUE_POINTER(*arg) = card->anniversary;
-		break;
-	case ARG_MAILER:
-		GTK_VALUE_STRING(*arg) = card->mailer;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_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_copy,
-						     (EListFreeFunc) e_card_arbitrary_free,
-						     NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	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->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;
-#if 0
-
-	c = g_new0 (ECard, 1);
-	
-	c->fname      = 
-	c->mailer     = 
-	c->role       = 
-	c->comment    = 
-	c->categories = 
-	c->uid        = e_card_prop_str_empty ();
-	
-	c->photo.type = PHOTO_JPEG;
-	c->logo.type  = PHOTO_JPEG;
-	c->rev.utc    = -1;
-	c->sound.type = SOUND_PHONETIC;
-	c->key.type   = KEY_PGP;
-
-	c->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-	c->comment.prop.encod    = ENC_QUOTED_PRINTABLE;
-	
-	c->name.prop   = c->photo.prop = c->bday.prop     = c->timezn.prop   = 
-	c->geopos.prop = c->logo.prop  = c->org.prop      = c->rev.prop      =
-	c->sound.prop  = c->key.prop   = c->deladdr.prop  = c->dellabel.prop =
-	c->phone.prop  = c->email.prop = c->xtension.prop = c->prop = e_card_prop_empty ();
-	
-	c->prop.type            = PROP_CARD;
-	c->fname.prop.type      = PROP_FNAME;
-	c->name.prop.type       = PROP_NAME;
-	c->photo.prop.type      = PROP_PHOTO;
-	c->bday.prop.type       = PROP_BDAY;
-	
-	c->deladdr.prop.type    = PROP_DELADDR_LIST;
-	c->dellabel.prop.type   = PROP_DELLABEL_LIST;
-	c->phone.prop.type      = PROP_PHONE_LIST;
-	c->email.prop.type      = PROP_EMAIL_LIST;
-	c->xtension.prop.type   = PROP_XTENSION_LIST;
-	c->mailer.prop.type     = PROP_MAILER;
-	c->timezn.prop.type     = PROP_TIMEZN;
-	c->geopos.prop.type     = PROP_GEOPOS;
-	c->role.prop.type       = PROP_ROLE;
-	c->logo.prop.type       = PROP_LOGO;
-	c->org.prop.type        = PROP_ORG;
-	c->categories.prop.type = PROP_CATEGORIES;
-	c->comment.prop.type    = PROP_COMMENT;
-	c->rev.prop.type        = PROP_REV;
-	c->sound.prop.type      = PROP_SOUND;
-	c->uid.prop.type 	= PROP_UID;
-	c->key.prop.type 	= PROP_KEY;
-	
-	return c;
-#endif
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-GList *
-e_card_load_cards_from_string(const char *str)
-{
-	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);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-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 **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		*string = g_strdup (vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = (vObjectValueType (vobj) ? fakeCString (vObjectUStringZValue (vobj)) : calloc(1, 1));
-		*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-}
-
-#if 0
-static void
-e_card_str_free (CardStrProperty *sp)
-{
-	g_free (sp->str);
-
-	e_card_prop_free (sp->prop);
-}
-
-static void
-e_card_photo_free (CardPhoto *photo)
-{
-	g_free (photo->data);
-
-	e_card_prop_free (photo->prop);
-}
-
-/**
- * e_card_free:
- */
-void
-e_card_free (ECard *card)
-{
-	GList *l;
-
-	g_return_if_fail (card != NULL);
-
-	e_card_name_free (& card->name);
-	e_card_str_free  (& card->fname);
-
-	e_card_photo_free (card->photo);
-
-	e_card_logo_free (card->logo);
-	e_card_org_free (card->org);
-	e_card_key_free (card->key);
-	e_card_sound_free (card->sound);
-
-	e_card_prop_str_free (& card->mailer);
-	e_card_prop_str_free (& card->role);
-	e_card_prop_str_free (& card->categories);
-	e_card_prop_str_free (& card->comment);
-	e_card_prop_str_free (& card->uid);
-
-	/* address is a little more complicated */
-	card_prop_free (card->deladdr.prop);
-	while ((l = card->deladdr.l)) {
-
-		e_card_deladdr_free ((CardDelAddr *) l->data);
-
-		card->deladdr.l = g_list_remove_link (card->deladdr.l, l);
-		g_list_free (l);
-	}
-	
-	g_free (card);
-}
-
-typedef struct
-{
-	char c;
-	int id;
-	
-	GList *sons;
-} tree;
-
-extern CardProperty 
-e_card_prop_empty (void)
-{
-	CardProperty prop;
-	
-	prop.used = FALSE;
-	
-	prop.type = PROP_NONE;
-	prop.encod = ENC_7BIT;
-	prop.value = VAL_INLINE;
-	prop.charset = NULL;
-	prop.lang = NULL;
-	prop.grp = NULL;
-	prop.xtension = NULL;
-	
-	prop.user_data = NULL;
-	
-	return prop;
-}
-
-static CardStrProperty 
-e_card_prop_str_empty (void)
-{
-	CardStrProperty strprop;
-	
-	strprop.prop = card_prop_empty ();
-	strprop.str = NULL;
-	
-	return strprop;
-}
-
-/* Intended to check asserts. */
-extern int card_check_prop (ECardProperty prop)
-{
-	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
-	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
-	    ((prop.encod >= ENC_NONE) && (prop.encod <= ENC_LAST)) &&
-	    ((prop.value >= VAL_NONE) && (prop.value <= VAL_LAST)))
-	  return TRUE;
-	    
-	return FALSE;
-}
-
-extern void
-card_prop_free (CardProperty prop)
-{
-	GList *l;
-	
-	g_free (prop.charset);
-	g_free (prop.lang);
-	
-	for (l = prop.xtension; l; l = l->next) {
-		CardXAttribute *xa = (CardXAttribute *) l->data;
-		g_free (xa->name);
-		g_free (xa->data);
-	}
-	
-	g_list_free (l);
-	
-	prop.used = FALSE;
-}
-	
-e_card_deladdr_free (ECardDelAddr *c)
-{
-	card_prop_free (c->prop);
-
-	g_free (p->pobox);
-	g_free (p->ext);
-	g_free (p->street);
-	g_free (p->city);
-	g_free (p->region);
-	g_free (p->code);
-	g_free (p->country);
-}
-
-void 
-card_free (Card *crd)
-{
-}
-
-static tree *
-new_tree (char c, int id)
-{
-	tree *t;
-	
-	t = malloc (sizeof (tree));
-	t->c = c;
-	t->id = id;
-	t->sons = NULL;
-	
-	return t;
-}
-
-static void 
-add_branch (tree *t, char *str, int id)
-{
-	tree *tmp;
-	char *end;
-	
-	end = str + strlen (str) + 1;
-
-	while (str != end) {
-		tmp = new_tree (*str, id);
-		t->sons = g_list_append (t->sons, (gpointer) tmp);
-		t = tmp;
-		
-		str ++;
-	}
-}
-
-static tree *
-add_to_tree (tree *t, struct pair p)
-{
-	GList *node;
-	char *c, *end;
-	tree *tmp;
-	
-	  c = p.str;
-	end = c + strlen (c) + 1;
-	tmp = t;
-	
-	while (c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-		
-		if (node) {
-			tmp = (tree *) node->data;
-			tmp->id = 0;
-			c++;
-		}
-		else {
-			add_branch (tmp, c, p.id);
-			break;
-		}
-	}
-	
-	return t;
-}
-		
-static tree *
-create_search_tree (void)
-{
-	tree *t;
-	int i;
-
-	t = new_tree (0, 0);
-	for (i = 0; prop_lookup[i].str; i++)
-	  t = add_to_tree (t, prop_lookup[i]);
-	
-	return t;
-}
-		
-static int 
-card_lookup_name (const char *c)
-{
-	static tree *search_tree = NULL;
-	GList *node;
-	tree *tmp;
-	const char *end;
-	
-	if (!search_tree)
-	  search_tree = create_search_tree ();
-	
-	tmp = search_tree;
-	end = c + strlen (c) + 1;
-	
-	while (tmp->id == 0 && c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-	
-		if (node) {
-			tmp = (tree *) node->data;
-			c++;
-		}
-		else
-		  return 0;
-	}
-	
-	return tmp->id;
-}
-
-static enum PhotoType 
-get_photo_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (has (o, photo_pairs[i].str))
-	    return photo_pairs[i].id;
-
-	g_warning ("? < No PhotoType for Photo property. Falling back to JPEG.");
-	return PHOTO_JPEG;
-}
-
-static CardProperty 
-get_CardProperty (VObject *o)
-{
-	VObjectIterator i;
-	CardProperty prop;
-
-	prop = card_prop_empty ();
-	prop.used = TRUE;
-	
-	initPropIterator (&i, o);
-	while (moreIteration (&i)) {
-		VObject *vo = nextVObject (&i);
-		const char *n = vObjectName (vo);
-		int propid;
-	
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-			
-		 case PROP_VALUE:
-		
-			if (has (vo, VCContentIDProp))
-			  prop.value = VAL_CID;
-			break;
-			
-		 case PROP_ENCODING:
-			if (has (vo, VCQuotedPrintableProp))
-			  prop.encod = ENC_QUOTED_PRINTABLE;
-			else if (has (vo, VC8bitProp))
-			  prop.encod = ENC_8BIT;
-			else if (has (vo, VCBase64Prop))
-			  prop.encod = ENC_BASE64;
-			break;
-			
-		 case PROP_QUOTED_PRINTABLE:
-			prop.encod = ENC_QUOTED_PRINTABLE;
-			break;
-			
-		 case PROP_8BIT:
-			prop.encod = ENC_8BIT;
-			break;
-			
-		 case PROP_BASE64:
-			prop.encod = ENC_BASE64;
-			break;
-	
-		 case PROP_LANG:
-			if (vObjectValueType (vo)) {
-				prop.lang = 
-				  g_strdup (vObjectStringZValue (vo));
-			} else
-			  g_warning ("? < No value for LANG attribute.");
-			break;
-			
-		 case PROP_CHARSET:
-			if (vObjectValueType (vo)) {
-				prop.charset = 
-				  g_strdup (vObjectStringZValue (vo));
-				g_warning (prop.charset); 
-			} else
-			  g_warning ("? < No value for CHARSET attribute.");
-			break;
-		 default:
-				{
-					CardXAttribute *c;
-
-					c = malloc (sizeof (CardXAttribute));
-					c->name = g_strdup (n);
-					
-					if (vObjectValueType (vo))
-					  c->data = 
-					  g_strdup (vObjectStringZValue (vo));
-					else
-					  c->data = NULL;
-					
-					prop.xtension = 
-					  g_list_append (prop.xtension, c);
-				}
-		}
-	}
-
-	return prop;
-}
-
-static gboolean
-e_card_prop_has (VObject    *o,
-		 const char *id)
-{
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	if (isAPropertyOf (o, id) == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-static const char *
-e_card_prop_get_str (VObject    *o,
-		     const char *id)
-{
-	VObject *strobj;
-
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	strobj = isAPropertyOf (o, id);
-
-	if (strobj == NULL)
-		return g_strdup ("");
-
-	if (vObjectValueType (strobj) != NULL) {
-		char *str;
-		char *g_str;
-
-		str = fakeCString (vObjectStringZValue (strobj));
-		g_str = g_strdup (str);
-		free (str);
-
-		return g_str;
-	}
-
-	return g_strdup ("");
-}
-
-static ECardName *
-e_card_get_name (VObject *o)
-{
-	CardName *name;
-	VObject *vo;
-	char *the_str;
-
-	name = g_new0 (ECardName, 1);
-
-	name->family     = e_card_prop_get_substr (o, VCFamilyNameProp);
-	name->given      = e_card_prop_get_substr (o, VCGivenNameProp);
-	name->additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);
-	name->prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);
-	name->suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);
-
-	return name;
-}
-
-static CardDelLabel *
-get_CardDelLabel (VObject *o)
-{
-	CardDelLabel *dellabel;
-	char *the_str;
-	
-	dellabel = malloc (sizeof (CardDelLabel));
-	
-	dellabel->type = get_addr_type (o);
-	dellabel->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	return dellabel;
-}
-
-static CardPhone *
-get_CardPhone (VObject *o)
-{
-	CardPhone *ret;
-	char *the_str;
-	
-	ret = malloc (sizeof (CardPhone));
-	ret->type = get_phone_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-
-	return ret;
-}
-
-static CardEMail *
-get_CardEMail (VObject *o)
-{
-	CardEMail *ret;
-	char *the_str; 
-	
-	ret = malloc (sizeof (CardEMail)); 
-	ret->type = get_email_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	
-	return ret;
-}
-	
-static CardTimeZone 
-strtoCardTimeZone (char *str)
-{
-	char s[3];
-	CardTimeZone tz;
-	
-	if (*str == '-') {
-		tz.sign = -1;
-		str++;
-	} else
-	  tz.sign = 1;
-	
-	tz.hours = 0;
-	tz.mins = 0;
-	
-	s[2] = 0;
-	if (strlen (str) > 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.hours = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	str += 2;
-	if (*str == ':')
-	  str++;
-	
-	if (strlen (str) >= 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.mins = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	if (strlen (str) > 3)
-		g_warning ("? < TimeZone value is too long.");
-
-	return tz;
-}
-
-static CardGeoPos 
-strtoCardGeoPos (char *str)
-{
-	CardGeoPos gp;
-	char *s;
-	
-	gp.lon = 0;
-	gp.lat = 0;
-	  
-	s = strchr (str, ',');
-	
-	if (! s) {
-		g_warning ("? < Bad format for GeoPos property.");
-		return gp;
-	}
-	
-	*s = 0;
-	s++;
-	
-	gp.lon = atof (str);
-	gp.lat = atof (s);
-	
-	return gp;
-}
-	
-static CardOrg *
-e_card_vobject_to_org (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardOrg *org;
-
-	org = g_new0 (CardOrg, 1);
-
-	if (has (o, VCOrgNameProp)) {
-		org.name = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnitProp)) {
-		org.unit1 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit2Prop)) {
-		org.unit2 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit3Prop)) {
-		org.unit3 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit4Prop)) {
-		org.unit4 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	
-	return org;
-}
-
-static CardXProperty *
-get_XProp (VObject *o)
-{
-	char *the_str;
-	CardXProperty *ret;
-	
-	ret = malloc (sizeof (CardXProperty)); 
-	ret->name = g_strdup (vObjectName (o));
-	ret->data = g_strdup (str_val (o));
-	free (the_str);
-	
-	return ret;
-}
-
-static CardRev 
-strtoCardRev (char *str)
-{
-	char s[3], *t, *ss;
-	int len, i;
-	CardRev rev;
-	
-	rev.utc = 0;
-	len = strlen (str);
-	
-	if (str[len] == 'Z') {              /* Is it UTC? */
-		rev.utc = 1;
-		str[len] = 0;
-	}
-	  
-	s[2] = 0;
-	t = strchr (str, 'T');
-	if (t) {                            /* Take the Time */
-		*t = 0;
-		t++;
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_hour = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')             /* Ignore ':' separator */
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_min = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_sec = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-
-		if (strlen (str) > 3)
-		  g_warning ("? < Rev value is too long.");
-		
-	} else {
-		g_warning ("? < No time value for Rev property.");
-	}
-
-	/* Now the date (the part before the T) */
-	
-	if (strchr (str, '-')) {                        /* extended iso 8601 */
-		for (ss = strtok (str, "-"), i = 0; ss;
-		     ss = strtok (NULL, "-"), i++)
-		  switch (i) {
-		   case 0:
-			  rev.tm.tm_year = atoi (ss);
-			  break;
-		   case 1:
-			  rev.tm.tm_mon = atoi (ss);
-			  break;
-		   case 2:
-			  rev.tm.tm_mday = atoi (ss);
-			  break;
-		   default:
-			  g_warning ("? < Too many values for Rev property.");
-		  }
-		
-		if (i < 2)
-		  g_warning ("? < Too few values for Rev property.");
-	} else {
-		if (strlen (str) >= 8) {             /* short representation */
-			rev.tm.tm_mday = atoi (str + 6);
-			str[6] = 0;
-			rev.tm.tm_mon = atoi (str + 4);
-			str[4] = 0;
-			rev.tm.tm_year = atoi (str);
-		} else
-		  g_warning ("? < Bad format for Rev property.");
-	}
-	
-	return rev;
-}
-		
-static enum KeyType 
-get_key_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (has (o, key_pairs[i].str))
-	    return key_pairs[i].id;
-
-	g_warning ("? < No KeyType for Key property. Falling back to PGP.");
-	return KEY_PGP;
-}
-
-static CardPhoto 
-get_CardPhoto (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardPhoto photo;
-
-	photo.type = get_photo_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		photo.size = vObjectIntegerValue (vo);
-		photo.data = malloc (photo.size);
-		memcpy (photo.data, vObjectAnyValue (o), photo.size);
-	} else {
-		photo.size = strlen (str_val (o)) + 1;
-		photo.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return photo;
-}
-
-static enum SoundType 
-get_sound_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (has (o, sound_pairs[i].str))
-	    return sound_pairs[i].id;
-
-	return SOUND_PHONETIC;
-}
-	
-static CardSound 
-get_CardSound (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardSound sound;
-
-	sound.type = get_sound_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		sound.size = vObjectIntegerValue (vo);
-		sound.data = malloc (sound.size);
-		memcpy (sound.data, vObjectAnyValue (o), sound.size);
-	} else {
-		sound.size = strlen (str_val (o));
-		sound.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return sound;
-}
-
-/* Loads our card contents from a VObject */
-static ECard *
-e_card_construct_from_vobject (ECard   *card,
-			       VObject *vcrd)
-{
-	VObjectIterator i;
-	Card *crd;
-	char *the_str;
-
-	initPropIterator (&i, vcrd);
-	crd = card_new ();
-
-	while (moreIteration (&i)) {
-		VObject *o = nextVObject (&i);
-		const char *n = vObjectName (o);
-		int propid;
-		CardProperty *prop = NULL;
-
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-		case PROP_FNAME:
-			prop = &crd->fname.prop;
-			crd->fname.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_NAME:
-			prop = &crd->name.prop;
-			crd->name = e_card_get_name (o);
-			break;
-		 case PROP_PHOTO:
-			prop = &crd->photo.prop;
-			crd->photo = get_CardPhoto (o);
-			break;
-		 case PROP_BDAY:
-			prop = &crd->bday.prop;
-			crd->bday = strtoCardBDay (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_DELADDR:
-				{
-					CardDelAddr *c;
-					c = get_CardDelAddr (o);
-					prop = &c->prop;
-					crd->deladdr.l = g_list_append (crd->deladdr.l, c);
-				}
-			break;
-		 case PROP_DELLABEL:
-				{
-					CardDelLabel *c;
-					c = get_CardDelLabel (o);
-					prop = &c->prop;
-					crd->dellabel.l = g_list_append (crd->dellabel.l, c);
-				}
-			break;
-		 case PROP_PHONE:
-				{
-					CardPhone *c;
-					
-					c = get_CardPhone (o);
-					prop = &c->prop;
-					crd->phone.l = g_list_append (crd->phone.l, c);
-				}
-			break;
-		 case PROP_EMAIL:
-				{
-					CardEMail *c;
-					
-					c = get_CardEMail (o);
-					prop = &c->prop;
-					crd->email.l = g_list_append (crd->email.l, c);
-				}
-			break;
-		 case PROP_MAILER:
-			prop = &crd->mailer.prop;
-			crd->mailer.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_TIMEZN:
-			prop = &crd->timezn.prop;
-			crd->timezn = strtoCardTimeZone (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_GEOPOS:
-			prop = &crd->geopos.prop;
-			crd->geopos = strtoCardGeoPos (str_val (o));
-			break;
-		 case PROP_ROLE:
-			prop = &crd->role.prop;
-			crd->role.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_LOGO:
-			prop = &crd->logo.prop;
-			crd->logo = get_CardPhoto (o);
-			break;
-		 case PROP_AGENT:
-			crd->agent = card_create_from_vobject (o);
-			break;
-		 case PROP_ORG:
-			prop = &crd->org.prop;
-			crd->org = get_CardOrg (o);
-			break;
-		 case PROP_CATEGORIES:
-			prop = &crd->categories.prop;
-			crd->categories.str = g_strdup (str_val (o));
-			crd->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_COMMENT:
-			prop = &crd->comment.prop;
-			crd->comment.str = g_strdup (str_val (o));
-			crd->comment.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_REV:
-			prop = &crd->rev.prop;
-			crd->rev = strtoCardRev (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_SOUND:
-			prop = &crd->sound.prop;
-			crd->sound = get_CardSound (o);
-			break;
-		 case PROP_VERSION:
-				{
-					char *str;
-					str = str_val (o);
-					if (strcmp (str, "2.1"))
-					  g_warning ("? < Version doesn't match.");
-					free (the_str);
-				}
-			break;
-		 case PROP_KEY:
-			prop = &crd->key.prop;
-			crd->key.type = get_key_type (o);
-			crd->key.data = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 default:
-				{
-					CardXProperty *c;
-				
-					c = get_XProp (o);
-					prop = &c->prop;
-					crd->xtension.l = g_list_append (crd->xtension.l, c);
-				}
-			break;
-		}
-		
-		if (prop) {
-			*prop = get_CardProperty (o);
-			prop->type = propid;
-		}
-	}
-	
-	return crd;
-}
-		
-/* Loads a card from a file */
-GList *
-card_load (GList *crdlist, char *fname)
-{
-	VObject *vobj, *tmp;
-	
-	vobj = Parse_MIME_FromFileName (fname);
-	if (!vobj) {
-		g_warning ("Could not load the cardfile");
-		return NULL;
-	}
-
-	while (vobj) {
-		const char *n = vObjectName (vobj);
-		
-		if (strcmp (n, VCCardProp) == 0) {
-			crdlist = g_list_append (crdlist, (gpointer)
-					    card_create_from_vobject (vobj));
-		}
-		tmp = vobj;
-		vobj = nextVObjectInList (vobj);
-		cleanVObject (tmp);
-	}
-
-	cleanVObject (vobj);
-	cleanStrTbl ();
-	return crdlist;
-}
-
-static VObject *
-add_strProp (VObject *o, const char *id, char *val)
-{
-	VObject *vo = NULL;
-	
-	if (val)
-	  vo = addPropValue (o, id, val);
-
-	return vo;
-}
-
-static VObject *
-add_CardProperty (VObject *o, CardProperty *prop)
-{
-	GList *node;
-	
-	switch (prop->encod) {
-	 case ENC_BASE64:
-		addProp (o, VCBase64Prop);
-		break;
-	 case ENC_QUOTED_PRINTABLE:
-		addProp (o, VCQuotedPrintableProp);
-		break;
-	 case ENC_8BIT:
-		addProp (o, VC8bitProp);
-		break;
-	 case ENC_7BIT:
-		/* Do nothing: 7BIT is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid encoding type.");
-	}
-	
-	switch (prop->value) {
-	 case VAL_CID:
-		addProp (o, VCContentIDProp);
-		break;
-	 case VAL_INLINE:
-		/* Do nothing: INLINE is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid value type.");
-	}
-	
-	for (node = prop->xtension; node; node = node->next) {
-		CardXAttribute *xa = (CardXAttribute *) node->data;
-		if (xa->data)
-		  addPropValue (o, xa->name, xa->data);
-		else
-		  addProp (o, xa->name);
-	}
-
-	add_strProp (o, VCCharSetProp, prop->charset);
-	add_strProp (o, VCLanguageProp, prop->lang);
-	
-	return o;
-}
-
-static VObject *
-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)
-{
-	VObject *vprop;
-	
-	if (strprop->prop.used) {
-		vprop = add_strProp (vobj, id, strprop->str);
-		add_CardProperty (vprop, &strprop->prop);
-	}
-	
-	return vobj;
-}
-
-static VObject *
-add_PhotoType (VObject *o, enum PhotoType photo_type)
-{
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (photo_type == photo_pairs[i].id) {
-		  addProp (o, photo_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No PhotoType for Photo property. Falling back to JPEG.");
-	addProp (o, VCJPEGProp);
-	
-	return o;
-}
-
-static VObject *
-add_AddrType (VObject *o, int addr_type)
-{
-	int i;
-	
-	for (i = 0; addr_pairs[i].str; i++)
-	  if (addr_type & addr_pairs[i].id)
-	    addProp (o, addr_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strAddrType (GString *string, int addr_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (addr_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; addr_pairs[i].str; i++)
-		  if (addr_type & addr_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (addr_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_PhoneType (VObject *o, int phone_type)
-{
-	int i;
-	
-	for (i = 0; phone_pairs[i].str; i++)
-	  if (phone_type & phone_pairs[i].id)
-	    addProp (o, phone_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strPhoneType (GString *string, int phone_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (phone_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; phone_pairs[i].str; i++)
-		  if (phone_type & phone_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (phone_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_EMailType (VObject *o, enum EMailType email_type)
-{
-	int i;
-	
-	for (i = 0; email_pairs[i].str; i++)
-	  if (email_type == email_pairs[i].id) {
-		  addProp (o, email_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No EMailType for EMail property. Falling back to INET.");
-	addProp (o, VCInternetProp);
-	
-	return o;
-}
-
-static void
-add_strEMailType (GString *string, int email_type)
-{
-	int i;
-	char *str;
-	
-	if (email_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; email_pairs[i].str; i++)
-		  if (email_type == email_pairs[i].id) {
-			  str = my_cap (email_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_KeyType (VObject *o, enum KeyType key_type)
-{
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (key_type == key_pairs[i].id) {
-		  addProp (o, key_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No KeyType for Key property. Falling back to PGP.");
-	addProp (o, VCPGPProp);
-	
-	return o;
-}
-
-static void
-add_strKeyType (GString *string, int key_type)
-{
-	int i;
-	char *str;
-	
-	if (key_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; key_pairs[i].str; i++)
-		  if (key_type == key_pairs[i].id) {
-			  str = my_cap (key_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_SoundType (VObject *o, enum SoundType sound_type)
-{
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (sound_type == sound_pairs[i].id) {
-		  addProp (o, sound_pairs[i].str);
-		  return o;
-	  }
-
-	return o;
-}
-
-char *card_timezn_str (CardTimeZone timezn)
-{
-	char *str;
-	
-	str = malloc (7);
-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",
-		 timezn.hours, timezn.mins);
-	return str;
-}
-
-char *card_geopos_str (CardGeoPos geopos)
-{
-	char *str;
-	
-	str = malloc (15);
-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);
-	return str;
-}
-
-static void add_CardStrProperty_to_string (GString *string, char *prop_name,
-					   CardStrProperty *strprop)
-{
-	if (strprop->prop.used) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, strprop->str);
-	}
-}
-
-static void add_strProp_to_string (GString *string, char *prop_name, char *val)
-{
-	if (val) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, val);
-	}
-}
-
-static void addProp_to_string (GString *string, char *prop_name)
-{
-	if (prop_name)
-	  g_string_append (string, prop_name);
-}
-
-char *
-card_to_string (Card *crd)
-{
-	GString *string;
-	char *ret;
-	
-	string = g_string_new ("");
-	
-	add_CardStrProperty_to_string (string, _("Card: "), &crd->fname);
-	if (crd->name.prop.used) {
-		addProp_to_string (string, N_("\nName: "));
-		add_strProp_to_string (string, N_("\n  Prefix:     "), crd->name.prefix);
-		add_strProp_to_string (string, N_("\n  Given:      "), crd->name.given);
-		add_strProp_to_string (string, N_("\n  Additional: "), crd->name.additional);
-		add_strProp_to_string (string, N_("\n  Family:     "), crd->name.family);
-		add_strProp_to_string (string, N_("\n  Suffix:     "), crd->name.suffix);
-		g_string_append_c (string, '\n');
-	}
-	
-/*	if (crd->photo.prop.used) {
-		addPropSizedValue (string, _ ("\nPhoto: "), 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (string, crd->photo.type);
-	}*/
-	
-	if (crd->bday.prop.used) {
-		char *date_str;
-		
-		date_str = card_bday_str (crd->bday);
-		add_strProp_to_string (string, N_("\nBirth Date: "), date_str);
-		free (date_str);
-	}
-	
-	if (crd->deladdr.l) {
-		GList *node;
-		
-		for (node = crd->deladdr.l; node; node = node->next) {
-			CardDelAddr *deladdr = (CardDelAddr *) node->data;
-			
-			if (deladdr->prop.used) {
-				addProp_to_string (string, N_("\nAddress:"));
-				add_strAddrType (string, deladdr->type);
-				add_strProp_to_string (string, N_("\n  Postal Box:  "), deladdr->po);
-				add_strProp_to_string (string, N_("\n  Ext:         "), deladdr->ext);
-				add_strProp_to_string (string, N_("\n  Street:      "), deladdr->street);
-				add_strProp_to_string (string, N_("\n  City:        "), deladdr->city);
-				add_strProp_to_string (string, N_("\n  Region:      "), deladdr->region);
-				add_strProp_to_string (string, N_("\n  Postal Code: "), deladdr->code);
-				add_strProp_to_string (string, N_("\n  Country:     "), deladdr->country);
-			}
-		}
-		
-		g_string_append_c (string, '\n');
-	}
-	
-	if (crd->dellabel.l) {
-		GList *node;
-		
-		for (node = crd->dellabel.l; node; node = node->next) {
-			CardDelLabel *dellabel = (CardDelLabel *) node->data;
-			
-			add_strProp_to_string (string, N_("\nDelivery Label: "),
-					    dellabel->data);
-			add_strAddrType (string, dellabel->type);
-		}
-	}
-	
-	if (crd->phone.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->phone.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nTelephones:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nTelephone:"));
-		}
-		
-		for (node = crd->phone.l; node; node = node->next) {
-			CardPhone *phone = (CardPhone *) node->data;
-
-			if (phone->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, phone->data);
-				add_strPhoneType (string, phone->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->phone.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	if (crd->email.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->email.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nE-mail:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nE-mail:"));
-		}
-		
-		
-		for (node = crd->email.l; node; node = node->next) {
-			CardEMail *email = (CardEMail *) node->data;
-			
-			if (email->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, email->data);
-				add_strEMailType (string, email->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->email.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	add_CardStrProperty_to_string (string, N_("\nMailer: "), &crd->mailer);
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		add_strProp_to_string (string, N_("\nTime Zone: "), str);
-		free (str);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		add_strProp_to_string (string, N_("\nGeo Location: "), str);
-		free (str);
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nBusiness Role: "), &crd->role);
-	
-/*	if (crd->logo.prop.used) {
-		addPropSizedValue (string, _ ("\nLogo: "), 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (string, crd->logo.type);
-	}*/
-	
-/*	if (crd->agent)
-	  addstringectProp (string, card_convert_to_stringect (crd->agent));*/
-	
-	if (crd->org.prop.used) {
-		addProp_to_string (string, N_("\nOrg: "));
-		add_strProp_to_string (string, N_("\n  Name:  "), crd->org.name);
-		add_strProp_to_string (string, N_("\n  Unit:  "), crd->org.unit1);
-		add_strProp_to_string (string, N_("\n  Unit2: "), crd->org.unit2);
-		add_strProp_to_string (string, N_("\n  Unit3: "), crd->org.unit3);
-		add_strProp_to_string (string, N_("\n  Unit4: "), crd->org.unit4);
-		g_string_append_c (string, '\n');
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nCategories: "), &crd->categories);
-        add_CardStrProperty_to_string (string, N_("\nComment: "), &crd->comment);
-	
-/*	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  addPropSizedValue (string, _ ("\nPronunciation: "),
-					    crd->sound.data, crd->sound.size);
-		else
-		  add_strProp_to_string (string, _ ("\nPronunciation: "), 
-				       crd->sound.data);
-		
-		add_SoundType (string, crd->sound.type);
-	}*/
-	
-        add_CardStrProperty_to_string (string, N_("\nUnique String: "), &crd->uid);
-	
-	if (crd->key.prop.used) {
-		add_strProp_to_string (string, N_("\nPublic Key: "), crd->key.data);
-		add_strKeyType (string, crd->key.type);
-	}
-	
-	ret = g_strdup (string->str);
-	g_string_free (string, TRUE);
-	
-	return ret;
-}
-#endif
-
-static ECardDate
-e_card_date_from_string (char *str)
-{
-	ECardDate date;
-	int length;
-
-	date.year = 0;
-	date.month = 0;
-	date.day = 0;
-
-	length = strlen(str);
-	
-	if (length == 10 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[5] * 10 + str[6] - '0' * 11;
-		date.day = str[8] * 10 + str[9] - '0' * 11;
-	} else if ( length == 8 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[4] * 10 + str[5] - '0' * 11;
-		date.day = str[6] * 10 + str[7] - '0' * 11;
-	}
-	
-	return date;
-}
-
-char *
-e_v_object_get_child_value(VObject *vobj, char *name)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, &ret_val);
-			return ret_val;
-		}
-	}
-	return NULL;
-}
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {
-			ret |= phone_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (flags & phone_pairs[i].flag) {
-				addProp (vobj, phone_pairs[i].id);
-		}
-	}
-}
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {
-			ret |= addr_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_address_flags (VObject *vobj, ECardAddressFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
-
-#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 length;
-		int i;
-
-		length = g_list_length (cards);
-
-		/* Now I have to make a CORBA sequence that represents a recipient list with
-		   one item, for the card. */
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = length;
-		to_list->_length = length;
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (length);
-
-		for (i = 0;
-		     cards;
-		     i++, cards = cards->next) {
-			ECard *card = cards->data;
-			EIterator *iterator;
-			char *file_as;
-			EList *email;
-			GNOME_Evolution_Composer_Recipient *recipient;
-
-			recipient = &(to_list->_buffer[i]);
-			gtk_object_get (GTK_OBJECT (card),
-				       "file_as", &file_as,
-				       "email", &email,
-				       NULL);
-
-			iterator = e_list_get_iterator (email);
-			if (e_iterator_is_valid (iterator)) {
-				recipient->address = CORBA_string_dup (e_iterator_get (iterator));
-			} else {  
-				recipient->address = CORBA_string_dup("");
-			}
-			gtk_object_unref (GTK_OBJECT (iterator));
-			recipient->name = CORBA_string_dup (file_as);
-		}
-
-		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 = 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;
-		
-		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);
-	}
-
-	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;
-}
-
-static gchar *
-e_card_uri_extract_book_uri (const gchar *uri)
-{
-	gchar *lastslash;
-
-	if (uri == NULL)
-		return NULL;
-
-	lastslash = strrchr (uri, '/');
-	if (lastslash == NULL)
-		return NULL;
-
-	return g_strndup (uri, lastslash - uri);
-}
-
-static gchar *
-e_card_uri_extract_card_id (const gchar *uri)
-{
-	gchar *lastslash;
-
-	if (uri == NULL)
-		return NULL;
-
-	lastslash = strrchr (uri, '/');
-	return lastslash ? g_strdup (lastslash+1) : NULL;
-}
-
-typedef struct _CardLoadData CardLoadData;
-struct _CardLoadData {
-	gchar *card_id;
-	ECardCallback cb;
-	gpointer closure;
-};
-
-static void
-card_load_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CardLoadData *data = (CardLoadData *) closure;
-	ECard *card = NULL;
-
-	if (status == E_BOOK_STATUS_SUCCESS)
-		card = e_book_get_card (book, data->card_id);
-
-	if (data->cb != NULL)
-		data->cb (card, data->closure);
-
-	g_free (data->card_id);
-	g_free (data);
-}
-
-void
-e_card_load_uri (const gchar *uri, ECardCallback cb, gpointer closure)
-{
-	CardLoadData *data;
-	gchar *book_uri;
-	gchar *card_id;
-	EBook *book;
-	
-	g_return_if_fail (uri != NULL);
-
-	book_uri = e_card_uri_extract_book_uri (uri);
-	card_id  = e_card_uri_extract_card_id  (uri);
-
-	data          = g_new (CardLoadData, 1);
-	data->card_id = g_strdup (card_id);
-	data->cb      = cb;
-	data->closure = closure;
-
-	book = e_book_new ();
-	e_book_load_uri (book, book_uri, card_load_cb, data);
-	
-	g_free (book_uri);
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index 3aaeddb813..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,201 +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.     */
-	gchar           *uri;           /* The card's uri (book uri + id)   */
-
-	char            *file_as;       /* The File As field.               */
-	char            *fname;         /* The full name.                   */
-	ECardName       *name;          /* The structured name.             */
-	EList           *address;  	/* Delivery addresses (ECardDeliveryAddress *) */
-	EList           *address_label; /* Delivery address labels
-					 * (ECardAddrLabel *)               */
-
-	EList           *phone;         /* Phone numbers (ECardPhone *)     */
-	EList           *email;         /* Email addresses (char *)         */
-	char            *url;	        /* The person's web page.           */
-
-	ECardDate       *bday;	        /* The person's birthday.           */
-
-	char            *note;
-
-
-	char            *org;           /* The person's organization.       */
-	char            *org_unit;      /* The person's organization unit.  */
-	char            *office;        /* The person's office.             */
-	char            *role;          /* The person's role w/in his org   */
-	char            *title;	        /* The person's title w/in his org  */
-
-	char            *manager;
-	char            *assistant;
-
-	char            *nickname;      /* The person's nickname            */
-	
-	char            *spouse;        /* The person's spouse.             */
-	ECardDate       *anniversary;   /* The person's anniversary.        */
-
-	char            *mailer;        /* Mailer                           */
-
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	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);
-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);
-const char           *e_card_get_uri                      (ECard                      *card);
-
-
-char                 *e_card_get_vcard                    (ECard                      *card);
-char                 *e_card_list_get_vcard               (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);
-void                  e_card_phone_free                   (ECardPhone                 *phone);
-
-/* ECardDeliveryAddress manipulation */
-ECardDeliveryAddress *e_card_delivery_address_new         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy        (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_free        (ECardDeliveryAddress       *addr);
-gboolean              e_card_delivery_address_is_empty    (const ECardDeliveryAddress *addr);
-char                 *e_card_delivery_address_to_string   (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_from_label  (const ECardAddrLabel       *label);
-ECardAddrLabel       *e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr);
-
-/* ECardAddrLabel manipulation */
-ECardAddrLabel       *e_card_address_label_new            (void);
-ECardAddrLabel       *e_card_address_label_copy           (const ECardAddrLabel       *addr);
-void                  e_card_address_label_free           (ECardAddrLabel             *addr);
-
-/* ECardName manipulation */
-ECardName            *e_card_name_new                     (void);
-ECardName            *e_card_name_copy                    (const ECardName            *name);
-void                  e_card_name_free                    (ECardName                  *name);
-char                 *e_card_name_to_string               (const ECardName            *name);
-ECardName            *e_card_name_from_string             (const char                 *full_name);
-gboolean              e_card_name_match_string            (const ECardName            *name,
-							   const gchar                *str);
-
-/* ECardArbitrary manipulation */
-ECardArbitrary       *e_card_arbitrary_new                (void);
-ECardArbitrary       *e_card_arbitrary_copy               (const ECardArbitrary       *arbitrary);
-void                  e_card_arbitrary_free               (ECardArbitrary             *arbitrary);
-
-/* ECard email manipulation */
-gboolean              e_card_email_match_string           (const ECard                *card,
-							   const gchar                *str);
-
-/* Specialized functionality */
-GList                *e_card_load_cards_from_file         (const char                 *filename);
-GList                *e_card_load_cards_from_string       (const char                 *str);
-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 *uri, 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 e836922ba3..0000000000
--- a/addressbook/backend/ebook/e-destination.c
+++ /dev/null
@@ -1,944 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <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>
-
-
-struct _EDestinationPrivate {
-
-	gchar *card_uri;
-	ECard *card;
-	gint card_email_num;
-
-	gchar *name;
-	gchar *email;
-	gchar *addr;
-
-	gboolean html_mail_override;
-	gboolean wants_html_mail;
-
-	GList *list_dests;
-};
-
-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);
-	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;
-}
-
-static void
-e_destination_init (EDestination *dest)
-{
-	dest->priv = g_new0 (struct _EDestinationPrivate, 1);
-}
-
-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));
-}
-
-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->card_uri       = g_strdup (dest->priv->card_uri);
-	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->card     = dest->priv->card;
-	if (new_dest->priv->card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->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)
-{
-	g_free (dest->priv->card_uri);
-	dest->priv->card_uri = NULL;
-
-	if (dest->priv->card)
-		gtk_object_unref (GTK_OBJECT (dest->priv->card));
-	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;
-}
-
-static void
-e_destination_clear_strings (EDestination *dest)
-{
-	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;
-}
-
-void
-e_destination_clear (EDestination *dest)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	e_destination_clear_card (dest);
-	e_destination_clear_strings (dest);
-}
-
-gboolean
-e_destination_is_empty (EDestination *dest)
-{
-	struct _EDestinationPrivate *p;
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), TRUE);
-	p = dest->priv;
-
-	return !(p->card != NULL
-		 || (p->card_uri && *p->card_uri)
-		 || (p->name && *p->name)
-		 || (p->email && *p->email)
-		 || (p->addr && *p->addr)
-		 || (p->list_dests != NULL));
-}
-
-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));
-
-	e_destination_clear (dest);
-
-	dest->priv->card = card;
-	gtk_object_ref (GTK_OBJECT (dest->priv->card));
-
-	dest->priv->card_email_num = email_num;
-}
-
-void
-e_destination_set_card_uri (EDestination *dest, const gchar *uri, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (uri != NULL);
-	
-	g_free (dest->priv->card_uri);
-	dest->priv->card_uri = g_strdup (uri);
-	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 (uri, e_card_get_uri (dest->priv->card))) {
-		gtk_object_unref (GTK_OBJECT (dest->priv->card));
-		dest->priv->card = NULL;
-	}
-}
-
-void
-e_destination_set_name (EDestination *dest, const gchar *name)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (name != NULL);
-
-	g_free (dest->priv->name);
-	dest->priv->name = g_strdup (name);
-
-	if (dest->priv->addr) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-	}
-}
-
-void
-e_destination_set_email (EDestination *dest, const gchar *email)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (email != NULL);
-
-	g_free (dest->priv->email);
-	dest->priv->email = g_strdup (email);
-
-	if (dest->priv->addr) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-	}
-}
-
-
-/* This function takes a free-form string and tries to do something
-   intelligent with it. */
-void
-e_destination_set_string (EDestination *dest, const gchar *str)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (str != NULL);
-
-	/* Default: Just treat it as a name address. */
-	e_destination_set_name (dest, str);
-}
-
-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;
-	dest->priv->wants_html_mail = x;
-}
-
-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->card_uri != NULL;
-}
-
-
-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));
-
-	}
-
-	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) {
-
-		if (cb) {
-			cb (dest, dest->priv->card, closure);
-		}
-
-	} else if (dest->priv->card_uri) {
-
-		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->card_uri, use_card_cb, uc);
-	}
-}
-
-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_uri (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->card_uri)
-		return dest->priv->card_uri;
-	
-	if (dest->priv->card)
-		return e_card_get_uri (dest->priv->card);
-
-	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->card_uri == 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 && 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 = e_destination_get_email (dest);
-		}
-	}
-	
-	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) { /* Pull the address out of the card. */
-
-			EIterator *iter = e_list_get_iterator (priv->card->email);
-			gint 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 ((gchar *) ptr);
-				}
-			}
-
-		} else if (priv->name) {
-			gchar *lt = strchr (priv->name, '<');
-			gchar *gt = strchr (priv->name, '>');
-			
-			if (lt && gt && lt+1 < gt) {
-				priv->email = g_strndup (lt+1, gt-lt-1);
-			}
-		}
-	}
-
-	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) {
-		if (e_destination_is_evolution_list (dest)) {
-			gchar **strv = g_new0 (gchar *, g_list_length (priv->list_dests) + 1);
-			gint i = 0;
-			GList *iter = dest->priv->list_dests;
-			
-			while (iter) {
-				EDestination *list_dest = E_DESTINATION (iter->data);
-				if (!e_destination_is_empty (list_dest)) {
-					strv[i++] = (gchar *) e_destination_get_address (list_dest);
-				}
-				iter = g_list_next (iter);
-			}
-			
-			priv->addr = g_strjoinv (", ", strv);
-			
-			g_message ("List address is [%s]", priv->addr);
-			
-			g_free (strv);
-		} else {
-			const gchar *name     = e_destination_get_name (dest);
-			const gchar *email    = e_destination_get_email (dest);
-			
-			/* If this isn't set, we return NULL */
-			if (email) {
-				if (name) {
-					/* uhm, yea... this'll work. NOT!!! */
-					/* what about ','? or any of the other chars that require quoting?? */
-					const gchar *lt = strchr (name, '<');
-					gchar *namecpy = lt ? g_strndup (name, lt-name) : g_strdup (name);
-					gboolean needs_quotes = (strchr (namecpy, '.') != NULL);
-					
-					g_strstrip (namecpy);
-					
-					priv->addr = g_strdup_printf ("%s%s%s <%s>",
-								      needs_quotes ? "\"" : "",
-								      namecpy,
-								      needs_quotes ? "\"" : "",
-								      email);
-					g_free (namecpy);
-				} else {
-					priv->addr = g_strdup (email);
-				}
-			} else {
-				/* Just use the name, which is the best we can do. */
-				priv->addr = g_strdup (name);
-			}
-		}
-	}
-	
-	return priv->addr;
-}
-
-const gchar *
-e_destination_get_textrep (const EDestination *dest)
-{
-	const gchar *txt;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	txt = e_destination_get_name (dest);
-	if (txt)
-		return txt;
-
-	txt = e_destination_get_email (dest);
-	if (txt)
-		return txt;
-
-	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 gchar *dest_xml = (const gchar *) 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_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;
-}
-
-gchar *
-e_destination_get_address_textv (EDestination **destv)
-{
-	gint i, j, len = 0;
-	gchar **strv;
-	gchar *str;
-	
-	g_return_val_if_fail (destv, NULL);
-
-	/* FIXME: 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 ;-) */
-	while (destv[len]) {
-		g_return_val_if_fail (E_IS_DESTINATION (destv[len]), NULL);
-		++len;
-	}
-	
-	strv = g_new0 (gchar *, len+1);
-	for (i = 0, j = 0; destv[i]; i++) {
-		if (!e_destination_is_empty (destv[i])) {
-			const gchar *addr = e_destination_get_address (destv[i]);
-			strv[j++] = addr ? (gchar *) addr : "";
-		}
-	}
-	
-	str = g_strjoinv (", ", strv);
-	
-	g_free (strv);
-	
-	return str;
-}
-
-xmlNodePtr
-e_destination_xml_encode (const EDestination *dest)
-{
-	xmlNodePtr dest_node;
-	const gchar *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");
-	}
-
-	str = e_destination_get_card_uri (dest);
-	if (str) {
-		gchar buf[16];
-		xmlNodePtr uri_node = xmlNewTextChild (dest_node, NULL, "card_uri", 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");
-
-	return dest_node;
-}
-
-gboolean
-e_destination_xml_decode (EDestination *dest, xmlNodePtr node)
-{
-	gchar *name = NULL, *email = NULL, *card_uri = NULL;
-	gint email_num = -1;
-	gboolean html_mail = FALSE;
-	gboolean is_list = FALSE;
-	gchar *tmp;
-	GList *list_dests = NULL;
-	
-	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);
-	}
-	
-	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;
-			gchar *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);
-				
-				list_dests = g_list_append (list_dests, list_dest);
-			}
-		} else if (!strcmp (node->name, "card_uri")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (card_uri);
-			card_uri = g_strdup (tmp);
-			xmlFree (tmp);
-			
-			tmp = xmlGetProp (node, "email_num");
-			email_num = atoi (tmp);
-			xmlFree (tmp);
-		}
-		
-		node = node->next;
-	}
-	
-	e_destination_clear (dest);
-	
-	if (name)
-		e_destination_set_name (dest, name);
-	if (email)
-		e_destination_set_email (dest, email);
-	if (card_uri)
-		e_destination_set_card_uri (dest, card_uri, email_num);
-	if (list_dests)
-		dest->priv->list_dests = list_dests;
-	
-	return TRUE;
-}
-
-/* FIXME: Make utf-8 safe */
-static gchar *
-null_terminate_and_remove_extra_whitespace (xmlChar *xml_in, gint size)
-{
-	gchar *xml;
-	gchar *r, *w;
-	gboolean skip_white = FALSE;
-
-	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;
-	gint       size = -1;
-	gchar     *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 ((gchar *) 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;
-	gint        size = -1;
-	gchar      *str;
-	gint        i;
-
-	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 ((gchar *)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)) {
-			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;
-}
-
-static void
-touch_cb (EBook *book, const gchar *addr, ECard *card, gpointer closure)
-{
-	if (book != NULL && card != NULL) {
-		e_card_touch (card);
-		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 gchar *email;
-
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	email = e_destination_get_email (dest);
-
-	if (email) {
-		e_book_query_address_locally (email, touch_cb, NULL);
-	}
-}
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
deleted file mode 100644
index c53f255436..0000000000
--- a/addressbook/backend/ebook/e-destination.h
+++ /dev/null
@@ -1,112 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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;
-};
-
-GtkType e_destination_get_type (void);
-
-
-EDestination  *e_destination_new                (void);
-EDestination  *e_destination_copy               (const EDestination *);
-void           e_destination_clear              (EDestination *);
-
-gboolean       e_destination_is_empty           (EDestination *);
-
-void           e_destination_set_card           (EDestination *, ECard *card, gint email_num);
-void           e_destination_set_card_uri       (EDestination *, const gchar *uri, 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_string         (EDestination *, const gchar *string);
-void           e_destination_set_html_mail_pref (EDestination *, gboolean);
-
-gboolean       e_destination_contains_card      (const EDestination *);
-gboolean       e_destination_from_card          (const EDestination *);
-
-void           e_destination_use_card           (EDestination *, EDestinationCardCallback cb, gpointer closure);
-
-ECard         *e_destination_get_card           (const EDestination *);
-const gchar   *e_destination_get_card_uri       (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) */
-
-const gchar   *e_destination_get_textrep        (const EDestination *);  /* "Jane Smith" or "jane@assbarn.com" */
-
-gboolean       e_destination_is_evolution_list  (const EDestination *);
-
-/* If true, they want HTML mail. */
-gboolean       e_destination_get_html_mail_pref (const 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);
-
-void           e_destination_touch              (EDestination *);
-
-
-#endif /* __E_DESTINATION_H__ */
-
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
deleted file mode 100644
index c74739aa27..0000000000
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ /dev/null
@@ -1,255 +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>
-
-#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);
-	char *vcard = e_card_get_vcard(card);
-
-	g_free(vcard);
-	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(gci->filename);
-	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) {
-		return FALSE;
-	}
-		
-	fgets (line, 4096, handle);
-	if (line == NULL) {
-		fclose (handle);
-		return FALSE;
-	}
-
-	if (strcmp (line, "BEGIN:VCARD") == 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;
-
-	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 5d16a26a7c..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(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = e_card_load_cards_from_file("gnomecard.vcf");
-	GList *iterator;
-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {
-		ECard *card = iterator->data;
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_list_free(list);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
deleted file mode 100644
index 2c18efb7c8..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(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-parse_line (EBook *book, char *line)
-{
-	char **strings;
-	ECardName *name;
-	ECard *card;
-	EList *list;
-
-	card = e_card_new("");
-	strings = g_strsplit(line, "\t", 3);
-	if (strings[0] && strings[1] && strings[2]) {
-		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
-		e_list_append(list, strings[2]);
-		g_strfreev(strings);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	FILE *fp = fopen (".addressbook", "r");
-	char line[2 * 1024];
-	int which = 0;
-	char *lastline = NULL;
-
-	if (!fp) {
-		g_warning ("Can't find .addressbook");
-		return;
-	}
-
-	while(fgets(line + which * 1024, 1024, fp)) {
-		int length;
-		char *thisline = line + which * 1024;
-		length = strlen(thisline);
-		if (thisline[length - 1] == '\n')
-			line[--length] = 0;
-		if (lastline && *thisline && isspace(*thisline)) {
-			char *temp;
-			while(*thisline && isspace(*thisline))
-				thisline ++;
-			temp = lastline;
-			lastline = g_strdup_printf("%s%s", lastline, thisline);
-			g_free(temp);
-			continue;
-		}
-		if (lastline) {
-			parse_line (book, lastline);
-			g_free(lastline);
-		}
-		lastline = g_strdup(thisline);
-	}
-
-	if (lastline) {
-		parse_line (book, lastline);
-		g_free(lastline);
-	}
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-#if 0
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
deleted file mode 100644
index 239ce4069f..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,196 +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;
-	EIterator *iterator;
-	ECardDate *bday;
-
-	gnome_init ("TestCard", "0.0", argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-#if 0
-	{
-	  int i;
-	  for ( i = 0; i < 100000; i++ ) {
-	    card = e_card_new (cardstr);
-	  
-	    gtk_object_unref (GTK_OBJECT (card));
-	  }
-	}
-#endif
-	card = e_card_new (cardstr);
-	gtk_object_get(GTK_OBJECT(card),
-		       "full_name",  &fname,
-		       "name",       &name,
-		       "address",    &address,
-		       "phone",      &phone,
-		       "email",      &email,
-		       "org",        &org,
-		       "org_unit",   &org_unit,
-		       "title",      &title,
-		       "role",       &role,
-		       "nickname",   &nickname,
-		       "fburl",      &fburl,
-		       "birth_date", &bday,
-		       NULL);
-	if ( fname ) {
-	  printf("Name : %s\n", fname);
-	  g_free(fname);
-	}
-	if ( name ) {
-	  printf("Full Name:\n");
-	  if ( name->prefix )
-	    printf("  prefix     : %s\n", name->prefix);
-	  if ( name->given )
-	    printf("  given      : %s\n", name->given);
-	  if ( name->additional )
-	    printf("  additional : %s\n", name->additional);
-	  if ( name->family )
-	    printf("  family     : %s\n", name->family);
-	  if ( name->suffix )
-	    printf("  suffix     : %s\n", name->suffix);
-	}
-	if ( org ) {
-	  printf("Company : %s\n", org);
-        }
-	if ( org_unit ) {
-	  printf("Department : %s\n", org_unit);
-        }
-	if ( title ) {
-	  printf("Title : %s\n", title);
-        }
-	if ( role ) {
-	  printf("Profession : %s\n", role);
-        }
-	if ( nickname ) {
-	  printf("Nickname : %s\n", nickname);
-        }
-	if ( fburl ) {
-	  printf("Free Busy URL : %s\n", fburl);
-        }
-	if ( bday ) {
-	  printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
-	}
-	if ( email ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( phone ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);
-	    printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( address ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-	    printf("Address ; %d:\n", del_address->flags);
-	    if ( del_address->po )
-	      printf("  Po      : %s\n", del_address->po);
-	    if ( del_address->ext )
-	      printf("  Ext     : %s\n", del_address->ext);
-	    if ( del_address->street )
-	      printf("  Street  : %s\n", del_address->street);
-	    if ( del_address->city )
-	      printf("  City    : %s\n", del_address->city);
-	    if ( del_address->region )
-	      printf("  Region  : %s\n", del_address->region);
-	    if ( del_address->code )
-	      printf("  Code    : %s\n", del_address->code);
-	    if ( del_address->country )
-	      printf("  Country : %s\n", del_address->country);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	printf("%s", e_card_get_vcard(card));
-	gtk_object_unref (GTK_OBJECT (card));
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
deleted file mode 100644
index 0de62d701c..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(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 6ffa099ab3..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,199 +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"
-
-#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(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	char *vcard;
-	ECard *card;
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	card = e_book_get_card (book, id);
-	g_timer_stop (timer);
-
-	vcard = e_card_get_vcard(card);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-	printf ("Card added: [%s]\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	printf ("Getting cards..\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-	printf ("Done getting all cards.\n");	
-}
-
-static void
-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_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_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/idl/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/idl/Makefile.am b/addressbook/backend/idl/Makefile.am
deleted file mode 100644
index db61d2c30c..0000000000
--- a/addressbook/backend/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA =			\
-	addressbook.idl
-
-EXTRA_DIST = $(idl_DATA)
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
deleted file mode 100644
index 7562b148a2..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,171 +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.
-		 */
-		VCard getVCard (in CardId id);
-
-		/*
-		 * Permissions.  the first form is general write
-		 * permission (whether or not the user can add or
-		 * remove or modify any entry in the addressbook.)
-		 *
-		 * if can_write returns TRUE, can_write_card can still
-		 * return FALSE if the user doesn't have permission to
-		 * modify/remove that specific card.
-		 */
-		boolean isWriteable     ();
-		boolean isCardWriteable (in CardId Id);
-
-		void authenticateUser (in string user, in string passwd);
-
-		/*
-		 * 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.  The syntax for the query
-		 * string is not yet defined.
-		 */
-		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,
-			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 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 b9f20c235d..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,58 +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		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)
-else
-LDAP_BACKEND = 
-endif
-
-noinst_LIBRARIES = libpas.a
-
-libpas_a_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	pas-book-factory.c				\
-	pas-book-factory.h				\
-	pas-book-view.c					\
-	pas-book-view.h					\
-	pas-book.c					\
-	pas-book.h					\
-	pas-backend-file.c				\
-	pas-backend-file.h				\
-	$(LDAP_BACKEND)					\
-	pas-backend.c					\
-	pas-backend.h					\
-	pas-card-cursor.c				\
-	pas-card-cursor.h
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
diff --git a/addressbook/backend/pas/TODO b/addressbook/backend/pas/TODO
deleted file mode 100644
index 0c77c1b200..0000000000
--- a/addressbook/backend/pas/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Implement pas_book_factory_activate
-* Authentication
-\ No newline at end of file
diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema
deleted file mode 100644
index edd2556796..0000000000
--- a/addressbook/backend/pas/evolutionperson.schema
+++ /dev/null
@@ -1,191 +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 )
-
-# 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 )
-	)  
-
-# 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 $ mail $ contact )
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index 56ce7dcd3d..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1755 +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 <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-sexp.h>
-#include <e-util/e-dbhash.h>
-#include <e-util/e-db3-utils.h>
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.1"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	DB       *file_db;
-	EList    *book_views;
-	gboolean  writable;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	ESExp                       *search_sexp;
-	PASBackendFileSearchContext *search_context;
-	gchar                       *change_id;
-	PASBackendFileChangeContext *change_context;
-};
-
-struct _PASBackendFileSearchContext {
-	ECardSimple *card;
-};
-
-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->search_sexp = book_view->search_sexp;
-	if (new_book_view->search_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->search_sexp));
-	if (book_view->search_context) {		
-		new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
-		new_book_view->search_context->card = book_view->search_context->card;
-	} else
-		new_book_view->search_context = NULL;
-	
-	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->search_sexp)
-		e_sexp_unref (book_view->search_sexp);
-	g_free(book_view->search_context);
-
-	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-%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-compare_email (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-		const char *email = e_card_simple_get_email (card, i);
-
-		if (email && compare(email, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_phone (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-		const ECardPhone *phone = e_card_simple_get_phone (card, i);
-
-		if (phone && compare(phone->number, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_address (ECardSimple *card, const char *str,
-		 char *(*compare)(const char*, const char*))
-{
-	g_warning("address searching not implemented\n");
-	return FALSE;
-}
-
-static 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 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" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "full_name" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),
-	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 ),
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(PASBackendFileSearchContext *ctx, struct _ESExp *f,
-	      int argc, struct _ESExpResult **argv,
-	      char *(*compare)(const char*, const char*))
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname;
-		struct prop_info *info = NULL;
-		int i;
-		gboolean any_field;
-
-		propname = argv[0]->value.string;
-
-		any_field = !strcmp(propname, "x-evolution-any-field");
-		for (i = 0; i < num_prop_infos; i ++) {
-			if (any_field
-			    || !strcmp (prop_info_table[i].query_prop, propname)) {
-				info = &prop_info_table[i];
-				
-				if (info->prop_type == PROP_TYPE_NORMAL) {
-					char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_simple_get (ctx->card, info->field_id);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					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)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);
-}
-
-static char *
-is_helper (const char *s1, const char *s2)
-{
-	if (!strcmp(s1, s2))
-		return (char*)s1;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, is_helper);
-}
-
-static char *
-endswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (strlen(p) == strlen(s2)))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, endswith_helper);
-}
-
-static char *
-beginswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, beginswith_helper);
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	ESExpResult *r;
-	gboolean retval;
-	ECard *card;
-
-	/* If this is not a search context view, it doesn't match be default */
-	if (view->search_context == NULL)
-		return FALSE;
-
-	card = e_card_new (vcard_string);
-	view->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!view->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(view->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-
-	gtk_object_unref(GTK_OBJECT(view->search_context->card));
-
-	e_sexp_result_free(view->search_sexp, r);
-
-	return retval;
-}
-
-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     i, file_version_name_len;
-	int esexp_error;
-	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->search_sexp)
-		e_sexp_unref(view->search_sexp);
-	view->search_sexp = e_sexp_new();
-	
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(view->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, view->search_context);
-		} else {
-			e_sexp_add_function(view->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, view->search_context);
-		}
-	}
-
-	e_sexp_input_text(view->search_sexp, view->search, strlen(view->search));
-	esexp_error = e_sexp_parse(view->search_sexp);
-
-	if (esexp_error == -1) {
-		/* need a different error message here. */
-		pas_book_view_notify_complete (view->book_view);
-		pas_book_view_notify_status_message (view->book_view, "Error in search expression.");
-		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 over-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);
-	pas_book_view_notify_status_message (view->book_view, "Search complete");
-
-	/*
-	** 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 == 1) {
-		char *id = id_dbt.data;
-		
-		ctx->del_ids = g_list_append (ctx->del_ids, 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;
-
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	if (!bf->priv->loaded)
-		return;
-
-	/* Find the changed ids - FIX ME, path should not be hard coded */
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/%s.db", g_get_home_dir (), view->change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	
-	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)) {
-				char *id = id_dbt.data;
-				char *vcard_string = vcard_dbt.data;
-
-				/* 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, strdup(vcard_string));
-					ctx->add_ids = g_list_append (ctx->add_ids, strdup(id));
-					break;
-				case E_DBHASH_STATUS_DIFFERENT:
-					ctx->mod_cards = g_list_append (ctx->mod_cards, strdup(vcard_string));
-					ctx->mod_ids = g_list_append (ctx->mod_ids, 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);
-
-	/* 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);
-	}	
-	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);
-	}	
-	for (i = ctx->del_ids; i != NULL; i = i->next){
-		char *id = i->data;
-		e_dbhash_remove (ehash, id);
-	}
-
-  	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-
-	/* 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);
-	}
-}
-
-static char *
-do_create(PASBackend *backend,
-	  char       *vcard_req,
-	  char      **vcard_ptr)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	char           *id;
-	ECard          *card;
-	char           *vcard;
-	char           *ret_val;
-
-	id = pas_backend_file_create_unique_id (vcard_req);
-
-	string_to_dbt (id, &id_dbt);
-	
-	card = e_card_new(vcard_req);
-	e_card_set_id(card, id);
-	vcard = e_card_get_vcard(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, 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 {
-		ret_val = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	card = NULL;
-
-	if (vcard_ptr && ret_val)
-		*vcard_ptr = vcard;
-	else
-		g_free (vcard);
-
-	return ret_val;
-}
-
-static void
-pas_backend_file_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	char *id;
-	char *vcard;
-	EIterator *iterator;
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	id = do_create(backend, req->vcard, &vcard);
-	if (id) {
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			if (vcard_matches_search (view, vcard)) {
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			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,
-				 "");
-	}
-
-	g_free(req->vcard);
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	char          *vcard_string;
-
-	string_to_dbt (req->id, &id_dbt);
-	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);
-		g_free (req->id);
-		return;
-	}
-	
-	db_error = db->del (db, NULL, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
-
-
-	vcard_string = vcard_dbt.data;
-	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	
-	g_free (req->id);
-}
-
-static void
-pas_backend_file_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	ECard         *card;
-	const char    *id;
-	char          *old_vcard_string;
-
-	/* create a new ecard from the request data */
-	card = e_card_new(req->vcard);
-	id = e_card_get_id(card);
-
-	string_to_dbt (id, &id_dbt);	
-	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);
-		g_free (req->id);
-		return;
-	}
-	old_vcard_string = g_strdup(vcard_dbt.data);
-
-	string_to_dbt (req->vcard, &vcard_dbt);	
-
-	db_error = db->put (db, 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));
-	g_free (req->vcard);
-}
-
-static void
-pas_backend_file_build_all_cards_list(PASBackend *backend,
-				      PASBackendFileCursorPrivate *cursor_data)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBC            *dbc;
-	int            db_error;
-	DBT  id_dbt, vcard_dbt;
-  
-	cursor_data->elements = NULL;
-
-	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)) {
-
-			cursor_data->elements = g_list_append(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);
-	}
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	/*
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBT            id_dbt, vcard_dbt;
-	*/
-	CORBA_Environment ev;
-	int            db_error = 0;
-	PASBackendFileCursorPrivate *cursor_data;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	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,
-					PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	PASBackendFileBookView view;
-	PASBackendFileSearchContext 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);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.search_sexp = NULL;
-	view.search_context = &ctx;
-	view.change_id = NULL;
-	view.change_context = NULL;	
-	ctx.card = 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));
-
-	g_free(req->search);
-	CORBA_exception_init(&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (book_view));
-	bonobo_object_release_unref (req->listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception unreffing "
-			  "listener.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-pas_backend_file_process_get_changes (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	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.search_sexp = NULL;
-	view.search_context = 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));
-
-	g_free(req->search);
-	CORBA_exception_init(&ev);
-	bonobo_object_release_unref (req->listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_changed: Exception unreffing "
-			  "listener.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-pas_backend_file_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	pas_book_report_connection (book, bf->priv->file_db != NULL);
-}
-
-static char *
-pas_backend_file_extract_path_from_uri (const char *uri)
-{
-	g_assert (strncasecmp (uri, "file:", 5) == 0);
-
-	return g_strdup (uri + 5);
-}
-
-static void
-pas_backend_file_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *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,
-					       PASRequest *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 gboolean
-can_write (PASBackend *backend)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char *path = pas_backend_file_extract_path_from_uri (bf->priv->uri);
-	gboolean retval;
-
-	retval = (access (path, W_OK) != -1);
-
-	g_free (path);
-
-	return retval;
-}
-
-static gboolean
-pas_backend_file_can_write (PASBook *book)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static gboolean
-pas_backend_file_can_write_card (PASBook *book,
-				 const char *id)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static void
-pas_backend_file_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_file_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		pas_backend_file_process_get_changes (backend, book, req);
-		break;
-
-	case AuthenticateUser:
-		pas_backend_file_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_file_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendFile *backend;
-
-	backend = PAS_BACKEND_FILE (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_file_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendFile *bf;
-	DBT            id_dbt, vcard_dbt;
-	DB             *db;
-	int            db_error;
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		return g_strdup (vcard_dbt.data);
-	}
-	else if (db_error == 1) {
-		/* key was not in file */
-		return g_strdup (""); /* XXX */
-	}
-	else /* if (db_error < 0)*/ {
-		/* error */
-		return g_strdup (""); /* XXX */
-	}
-}
-
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	if (!strcmp (old_version, "0.0")) {
-		/* 0.0 is the same as 0.1, we just need to add the version */
-		DB  *db = bf->priv->file_db;
-		DBT version_name_dbt, version_dbt;
-		int db_error;
-
-		string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-		string_to_dbt (PAS_BACKEND_FILE_VERSION, &version_dbt);
-
-		db_error = db->put (db, NULL, &version_name_dbt, &version_dbt, 0);
-		if (db_error == 0)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	else {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-}
-
-static gboolean
-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
-{
-	DB   *db = bf->priv->file_db;
-	DBT  version_name_dbt, version_dbt;
-	int  db_error;
-	char *version;
-	gboolean ret_val = TRUE;
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-	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 gboolean
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-	gboolean        writable = FALSE;
-	GList          *l;
-	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 FALSE;
-	}
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	db_error = e_db3_utils_maybe_recover (filename);
-	if (db_error != 0)
-		return FALSE;
-
-	db_error = db_create (&db, NULL, 0);
-	if (db_error != 0)
-		return FALSE;
-
-	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 FALSE;
-
-		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;
-			}
-		}
-	}
-
-	g_free (filename);
-
-
-	if (db_error != 0) {
-		bf->priv->file_db = NULL;
-		return FALSE;
-	}
-
-	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 FALSE;
-	}
-
-	g_free(bf->priv->uri);
-	bf->priv->uri = g_strdup (uri);
-
-	/* report the writable status of the book to all its clients */
-	for (l = bf->priv->clients; l; l = g_list_next (l)) {
-		PASBook *book = l->data;
-
-		pas_book_report_writable (book, writable);
-	}
-
-	return TRUE;
-}
-
-/* Get_uri handler for the addressbook file backend */
-static const char *
-pas_backend_file_get_uri (PASBackend *backend)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	g_return_val_if_fail (bf->priv->loaded, NULL);
-	g_assert (bf->priv->uri != NULL);
-
-	return bf->priv->uri;
-}
-
-static gboolean
-pas_backend_file_add_client (PASBackend             *backend,
-			     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,
-		pas_backend_file_get_vcard,
-		pas_backend_file_can_write,
-		pas_backend_file_can_write_card);
-
-	if (!book) {
-		if (!bf->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-			    pas_backend_file_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_file_process_client_requests, NULL);
-
-	bf->priv->clients = g_list_prepend (
-		bf->priv->clients, book);
-
-	if (bf->priv->loaded) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-		if (bf->priv->writable)
-			pas_book_report_writable (book, bf->priv->writable);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-		if (bf->priv->writable)
-			pas_book_report_writable (book, bf->priv->writable);
-	}
-
-	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);
-
-	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 056e56f28f..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,2392 +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 <time.h>
-#include <lber.h>
-#include <gtk/gtksignal.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 <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#include "pas-backend-ldap.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-
-#define LDAP_MAX_SEARCH_RESPONSES 100
-
-/* 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;
-	gchar    *ldap_rootdn;
-	int      ldap_port;
-	int      ldap_scope;
-	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 evolutionPersonChecked;
-
-	gboolean writable;
-
-	/* whether or not there's a request in process on our LDAP* */
-	LDAPOp *current_op;
-	GList *pending_ops;
-	int op_idle;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	int                   search_idle;
-	int                   search_msgid;
-	LDAPOp                *search_op;
-};
-
-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);
-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-};
-
-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_process_current (PASBackend *backend);
-static void     ldap_op_process (LDAPOp *op);
-static void     ldap_op_restart (LDAPOp *op);
-static gboolean ldap_op_process_on_idle (PASBackend *backend);
-static void     ldap_op_finished (LDAPOp *op);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e);
-
-static void email_populate (ECardSimple *card, char **values);
-struct berval** email_ber (ECardSimple *card);
-gboolean email_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void homephone_populate (ECardSimple *card, char **values);
-struct berval** homephone_ber (ECardSimple *card);
-gboolean homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void business_populate (ECardSimple *card, char **values);
-struct berval** business_ber (ECardSimple *card);
-gboolean business_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_LIST     0x02
-#define PROP_DN            0x04
-#define PROP_EVOLVE        0x08
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_LIST props */
-
-	/* used when reading from the ldap server populates ECard with the values in **values. */
-	void (*populate_ecard_func)(ECardSimple *card, char **values);
-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */
-	struct berval** (*ber_func)(ECardSimple *card);
-	/* used to compare list attributes */
-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);
-
-} prop_info[] = {
-
-#define LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST, ctor, ber, cmp}
-#define E_LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST | 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 */
-	LIST_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"),
-	LIST_PROP     (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone", "telephoneNumber", business_populate, business_ber, business_compare),
-	LIST_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_TTYTTD,       "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_STRING_PROP (E_CARD_SIMPLE_FIELD_ANNIVERSARY, "anniversary", "anniversary"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE,  "birth_date", "birthDate"), 
-	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_CARD_SIMPLE_FIELD_FBURL, */
-/*  	E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */
-
-
-#undef E_STRING_PROP
-#undef STRING_PROP
-#undef E_LIST_PROP
-#undef LIST_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-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 (view->search_idle != 0) {
-				/* we have a search running on the
-				   ldap connection.  remove the idle
-				   handler and anbandon the msg id */
-				g_source_remove(view->search_idle);
-				pas_book_view_notify_status_message (view->book_view, "Abandoning pending search.");
-				if (view->search_msgid != -1)
-					ldap_abandon (bl->priv->ldap, view->search_msgid);
-
-				/* if the search op is the current op,
-				   finish it. else, remove it from the
-				   list and nuke it ourselves. */
-				if (view->search_op == bl->priv->current_op)
-					ldap_op_finished (view->search_op);
-				else {
-					bl->priv->pending_ops = g_list_remove (bl->priv->pending_ops,
-									       view->search_op);
-					view->search_op->dtor (view->search_op->backend,
-							       view->search_op);
-				}
-			}
-			g_free (view->search);
-			g_free (view);
-			bl->priv->book_views = g_list_remove_link(bl->priv->book_views, list);
-			g_list_free_1(list);
-			break;
-		}
-	}
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	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, g_strdup(query_prop));
-
-			/* handle the list attributes here */
-			if (!strcmp (query_prop, "email")) {
-				e_list_append (bl->priv->supported_fields, g_strdup("email_2"));
-				e_list_append (bl->priv->supported_fields, g_strdup("email_3"));
-			}
-			else if (!strcmp (query_prop, "business_phone")) {
-				e_list_append (bl->priv->supported_fields, g_strdup("business_phone_2"));
-			}
-			else if (!strcmp (query_prop, "home_phone")) {
-				e_list_append (bl->priv->supported_fields, g_strdup("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;
-
-	bl->priv->evolutionPersonChecked = TRUE;
-
-	bl->priv->supported_fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	if (ldap_search_ext_s (ldap, "cn=Subschema", 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);
-			}
-		}
-	}
-}
-
-static void
-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_open (blpriv->ldap_host, blpriv->ldap_port);
-#ifdef DEBUG
-	{
-		int debug_level = ~0;
-		ldap_set_option (blpriv->ldap, LDAP_OPT_DEBUG_LEVEL, &debug_level);
-	}
-#endif
-
-	if (NULL != blpriv->ldap) {
-		ldap_simple_bind_s(blpriv->ldap,
-				   NULL /*binddn*/, NULL /*passwd*/);
-		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);
-	}
-	else {
-		g_warning ("pas_backend_ldap_connect failed for "
-			   "'ldap://%s:%d/%s'\n",
-			   blpriv->ldap_host,
-			   blpriv->ldap_port,
-			   blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
-		blpriv->connected = FALSE;
-	}
-
-}
-
-static void
-ldap_op_init (LDAPOp *op, PASBackend *backend,
-	      PASBook *book, PASBookView *view,
-	      LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->handler = handler;
-	op->dtor = dtor;
-}
-
-static void
-ldap_op_process_current (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPOp *op = bl->priv->current_op;
-
-	if (!bl->priv->connected) {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Connecting to LDAP server...");
-		pas_backend_ldap_connect(bl);
-	}
-
-	if (bl->priv->connected) {
-		if (op->handler (backend, op))
-			ldap_op_finished (op);
-	}
-	else {
-		if (op->view) {
-			pas_book_view_notify_complete (op->view);
-			pas_book_view_notify_status_message (op->view, "Unable to connect to LDAP server.");
-		}
-
-		ldap_op_finished (op);
-	}
-}
-
-static void
-ldap_op_process (LDAPOp *op)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-
-	if (bl->priv->current_op) {
-		/* operation in progress.  queue this op for later and return. */
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Waiting for connection to ldap server...");
-		bl->priv->pending_ops = g_list_append (bl->priv->pending_ops, op);
-	}
-	else {
-		/* nothing going on, do this op now */
-		bl->priv->current_op = op;
-		ldap_op_process_current (op->backend);
-	}
-}
-
-static gboolean
-ldap_op_process_on_idle (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	bl->priv->op_idle = 0;
-
-	ldap_op_process_current (backend);
-
-	return FALSE;
-}
-
-static void
-ldap_op_restart (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-}
-
-static void
-ldap_op_finished (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	op->dtor (backend, op);
-
-	if (bl->priv->pending_ops) {
-		bl->priv->current_op = bl->priv->pending_ops->data;
-		bl->priv->pending_ops = g_list_remove_link (bl->priv->pending_ops, bl->priv->pending_ops);
-
-		bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-	}
-	else {
-		bl->priv->current_op = NULL;
-	}
-}
-
-static int
-ldap_error_to_response (int ldap_error)
-{
-	if (ldap_error == LDAP_SUCCESS)
-		return 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;
-	gboolean need_comma = FALSE;
-
-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (cn) {
-		cn_part = g_strdup_printf ("cn=%s%s", cn, need_comma ? "," : "");
-	}
-	else {
-		cn_part = g_strdup ("");
-	}
-
-	dn = g_strdup_printf ("%s%s%s", cn_part,
-			      (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 /* XXX ? */);
-}
-
-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_LIST */
-				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)
-{
-	LDAPMod *objectclass_mod;
-
-	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 *vcard;
-} LDAPCreateOp;
-
-static gboolean
-create_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	ECardSimple *new_card;
-	char *dn;
-	int response;
-	int            ldap_error;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	printf ("vcard = %s\n", create_op->vcard);
-
-	new_ecard = e_card_new (create_op->vcard);
-	new_card = e_card_simple_new (new_ecard);
-
-	dn = create_dn_from_ecard (new_card, bl->priv->ldap_rootdn);
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (bl, NULL, new_card, NULL);
-
-#if 0
-	if (!mod_array) {
-		/* there's an illegal field in there.  report
-                   UnsupportedAttribute back */
-		g_free (dn);
-
-		gtk_object_unref (GTK_OBJECT(new_card));
-
-		pas_book_respond_create (create_op->op.book,
-					 GNOME_Evolution_Addressbook_BookListener_UnsupportedField,
-					 dn);
-
-		return TRUE;
-	}
-#endif
-
-	/* remove the NULL at the end */
-	g_ptr_array_remove (mod_array, NULL);
-
-	/* add our objectclass(es) */
-	add_objectclass_mod (bl, mod_array);
-
-	/* 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 (op->view)
-		pas_book_view_notify_status_message (op->view, "Adding card to LDAP server...");
-
-	/* actually perform the ldap add */
-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "");
-
-	if (ldap_error != LDAP_SUCCESS)
-		ldap_perror (ldap, "ldap_add_s");
-
-	/* and clean up */
-	free_mods (mod_array);
-	g_free (dn);
-
-	gtk_object_unref (GTK_OBJECT(new_card));
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (create_op->op.book,
-				 response,
-				 dn);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-create_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	g_free (create_op->vcard);
-	g_free (create_op);
-}
-
-static void
-pas_backend_ldap_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)create_op, backend, book,
-		      book_view,
-		      create_card_handler, create_card_dtor);
-
-	create_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)create_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static gboolean
-remove_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int response;
-	int ldap_error;
-
-	ldap_error = ldap_delete_s (bl->priv->ldap, remove_op->id);
-	if (ldap_error != LDAP_SUCCESS)
-		ldap_perror (bl->priv->ldap, "ldap_delete_s");
-
-	response = ldap_error_to_response (ldap_error);
-
-	pas_book_respond_remove (remove_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-remove_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-
-	g_free (remove_op->id);
-	g_free (remove_op);
-}
-
-static void
-pas_backend_ldap_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)remove_op, backend, book,
-		      book_view,
-		      remove_card_handler, remove_card_dtor);
-
-	remove_op->id = req->id;
-
-	ldap_op_process ((LDAPOp*)remove_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPModifyOp;
-
-static ECardSimple *
-search_for_dn (PASBackendLDAP *bl, const char *dn)
-{
-	LDAP *ldap = bl->priv->ldap;
-	LDAPMessage    *res, *e;
-	ECardSimple *result = NULL;
-
-	if (ldap_search_s (ldap,
-			   dn,
-			   LDAP_SCOPE_BASE,
-			   "(objectclass=*)",
-			   NULL, 0, &res) != -1) {
-		e = ldap_first_entry (ldap, res);
-		while (NULL != e) {
-			if (!strcmp (ldap_get_dn (ldap, e), dn)) {
-				printf ("found it\n");
-				result = build_card_from_entry (ldap, e);
-				break;
-			}
-			e = ldap_next_entry (ldap, e);
-		}
-
-		ldap_msgfree(res);
-	}
-
-	return result;
-}
-
-static gboolean
-modify_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	const char *id;
-	int response;
-	int            ldap_error = LDAP_SUCCESS;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-	ECardSimple *current_card;
-
-	new_ecard = e_card_new (modify_op->vcard);
-	id = e_card_get_id(new_ecard);
-
-	ldap = bl->priv->ldap;
-
-	current_card = search_for_dn (bl, id);
-
-	if (current_card) {
-		ECardSimple *new_card = e_card_simple_new (new_ecard);
-		gboolean need_new_dn;
-
-		/* build our mods */
-		mod_array = build_mods_from_ecards (bl, current_card, new_card, &need_new_dn);
-		if (mod_array->len > 0) {
-			ldap_mods = (LDAPMod**)mod_array->pdata;
-
-			/* actually perform the ldap modify */
-			ldap_error = ldap_modify_ext_s (ldap, id, ldap_mods, NULL, NULL);
-			if (ldap_error != LDAP_SUCCESS)
-				ldap_perror (ldap, "ldap_modify_s");
-		}
-		else {
-			g_print ("modify list empty.  no modification sent\n");
-		}
-
-		/* and clean up */
-		free_mods (mod_array);
-		gtk_object_unref (GTK_OBJECT(new_card));
-		gtk_object_unref (GTK_OBJECT(current_card));
-	}
-	else {
-		g_print ("didn't find original card\n");
-	}
-
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_modify (modify_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-modify_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	g_free (modify_op->vcard);
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)modify_op, backend, book,
-		      book_view,
-		      modify_card_handler, modify_card_dtor);
-
-	modify_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)modify_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBook *book;
-} LDAPGetCursorOp;
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	g_return_val_if_fail (n < cursor_data->num_elements, NULL);
-
-	return (char*)g_list_nth (cursor_data->elements, n);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) 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);
-
-	/* free the ldap specific cursor information */
-	g_list_foreach (cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-pas_backend_ldap_build_all_cards_list(PASBackend *backend,
-				      PASBackendLDAPCursorPrivate *cursor_data)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-
-	if ((ldap_error = ldap_search_s (ldap,
-					 bl->priv->ldap_rootdn,
-					 bl->priv->ldap_scope,
-					 "(objectclass=*)",
-					 NULL, 0, &res)) == -1) {
-		g_warning ("ldap error '%s' in "
-			   "pas_backend_ldap_build_all_cards_list\n",
-			   ldap_err2string(ldap_error));
-	}
-
-	cursor_data->elements = NULL;
-
-	cursor_data->num_elements = ldap_count_entries (ldap, res);
-
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-
-		/* for now just make a list of the dn's */
-#if 0
-		for ( a = ldap_first_attribute( ldap, e, &ber ); a != NULL;
-		      a = ldap_next_attribute( ldap, e, ber ) ) {
-		}
-#else
-		cursor_data->elements = g_list_prepend(cursor_data->elements,
-						       g_strdup(ldap_get_dn(ldap, e)));
-#endif
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	ldap_msgfree(res);
-}
-
-
-static gboolean
-get_cursor_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	CORBA_Environment ev;
-	int            ldap_error = 0;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data;
-	PASBook *book = cursor_op->book;
-
-	cursor_data = g_new(PASBackendLDAPCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_ldap_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	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,
-				     ldap_error_to_response (ldap_error),
-				     cursor);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-get_cursor_dtor (PASBackend *backend, LDAPOp *op)
-{
-	g_free (op);
-}
-
-static void
-pas_backend_ldap_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	LDAPGetCursorOp *op = g_new (LDAPGetCursorOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, backend, book, NULL, get_cursor_handler, get_cursor_dtor);
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-
-/* 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;
-}
-
-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;
-}
-
-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;
-}
-
-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 ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		(*list)->data = g_strdup_printf("(!%s)", term);
-		g_free (term);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (!strcmp (propname, "x-evolution-any-field")) {
-			int i;
-			int query_length;
-			char *big_query;
-			char *header, *footer;
-			char *match_str;
-
-			header = g_malloc0((num_prop_infos - 1) * 2 + 1);
-			footer = g_malloc0(num_prop_infos + 1);
-			for (i = 0; i < num_prop_infos - 1; i ++) {
-				strcat (header, "(|");
-				strcat (footer, ")");
-			}
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = strlen (header) + strlen (footer);
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, header);
-			for (i = 0; i < num_prop_infos; i ++) {
-				strcat (big_query, "(");
-				strcat (big_query, prop_info[i].ldap_attr);
-				strcat (big_query, match_str);
-			}
-			strcat (big_query, footer);
-
-			*list = g_list_prepend(*list, big_query);
-
-			g_free (match_str);
-			g_free (header);
-			g_free (footer);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				*list = g_list_prepend(*list,
-						       g_strdup_printf("(%s=*%s%s)",
-								       ldap_attr,
-								       str,
-								       one_star ? "" : "*"));
-		}
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s)",
-							       ldap_attr, str));
-		else {
-			g_warning ("unknown query property\n");
-			/* we want something that'll always be false */
-			*list = g_list_prepend(*list,
-					       g_strdup("objectClass=MyBarnIsBiggerThanYourBarn"));
-		}
-	}
-
-	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)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s*)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=*%s)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(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 (gchar *query)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-
-	sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function(sexp, 0, symbols[i].name,
-					    symbols[i].func, &list);
-		}
-	}
-
-	e_sexp_input_text(sexp, query, strlen(query));
-	e_sexp_parse(sexp);
-
-	r = e_sexp_eval(sexp);
-
-	e_sexp_result_free(sexp, r);
-	e_sexp_unref (sexp);
-
-	if (list) {
-		if (list->next) {
-			g_warning ("conversion to ldap query string failed");
-			retval = NULL;
-			g_list_foreach (list, (GFunc)g_free, NULL);
-		}
-		else {
-			retval = list->data;
-		}
-	}
-	else {
-		g_warning ("conversion to ldap query string failed");
-		retval = NULL;
-	}
-
-	g_list_free (list);
-	return retval;
-}
-
-static gchar *
-query_prop_to_ldap(gchar *query_prop)
-{
-	int i;
-
-	for (i = 0; i < num_prop_infos; i ++)
-		if (!strcmp (query_prop, prop_info[i].query_prop))
-			return prop_info[i].ldap_attr;
-
-	return NULL;
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *ldap_query;
-	PASBackendLDAP *bl;
-	PASBackendLDAPBookView *view;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn = ldap_get_dn(ldap, e);
-	char *attr;
-	BerElement *ber = NULL;
-
-	g_print ("build_card_from_entry, dn = %s\n", dn);
-	e_card_simple_set_id (card, dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-
-		for (i = 0; i < num_prop_infos; i ++)
-			if (!strcmp (attr, prop_info[i].ldap_attr))
-				info = &prop_info[i];
-
-		if (info) {
-			char **values;
-			values = ldap_get_values (ldap, e, attr);
-
-			if (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_LIST) {
-				/* if it's a list call the ecard-populate function,
-				   which calls gtk_object_set to set the property */
-					info->populate_ecard_func(card,
-								  values);
-				}
-
-				ldap_value_free (values);
-			}
-		}
-	}
-
-#ifndef OPENLDAP2
-	/* if ldap->ld_errno == LDAP_DECODING_ERROR there was an
-	   error decoding an attribute, and we shouldn't free ber,
-	   since the ldap library already did it. */
-	if (ldap->ld_errno != LDAP_DECODING_ERROR && ber)
-		ber_free (ber, 0);
-#endif
-
-	e_card_simple_sync_card (card);
-
-	return card;
-}
-
-static gboolean
-poll_ldap (LDAPSearchOp *op)
-{
-	PASBackendLDAPBookView *view = op->view;
-	PASBackendLDAP *bl = op->bl;
-	LDAP           *ldap = bl->priv->ldap;
-	int            rc;
-	LDAPMessage    *res, *e;
-	GList   *cards = NULL;
-	static int received = 0;
-
-	pas_book_view_notify_status_message (view->book_view, "Receiving LDAP search results...");
-
-	rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
-	
-	if (rc == -1 && received == 0) {
-		pas_book_view_notify_status_message (view->book_view, "Restarting search.");
-		/* connection went down and we never got any. */
-		bl->priv->connected = FALSE;
-
-		/* this will reopen the connection */
-		ldap_op_restart ((LDAPOp*)op);
-		return FALSE;
-	}
-
-	if (rc != LDAP_RES_SEARCH_ENTRY) {
-		view->search_idle = 0;
-		pas_book_view_notify_complete (view->book_view);
-		ldap_op_finished ((LDAPOp*)op);
-		received = 0;
-		pas_book_view_notify_status_message (view->book_view, "Search complete.");
-		return FALSE;
-	}
-
-	received = 1;
-		
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-		ECardSimple *card = build_card_from_entry (ldap, e);
-
-		cards = g_list_append (cards, e_card_simple_get_vcard (card));
-
-		gtk_object_unref (GTK_OBJECT(card));
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	if (cards) {
-		pas_book_view_notify_add (view->book_view, cards);
-			
-		g_list_foreach (cards, (GFunc)g_free, NULL);
-		g_list_free (cards);
-		cards = NULL;
-	}
-
-	ldap_msgfree(res);
-
-	return TRUE;
-}
-
-static gboolean
-ldap_search_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "Searching...");
-
-	/* it might not be NULL if we've been restarted */
-	if (search_op->ldap_query == NULL)
-		search_op->ldap_query = pas_backend_ldap_build_query(search_op->view->search);
-
-	if (search_op->ldap_query != NULL) {
-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-		PASBackendLDAPBookView *view = search_op->view;
-		LDAP *ldap = bl->priv->ldap;
-		int ldap_err;
-
-		ldap_err = ldap_search_ext (ldap, bl->priv->ldap_rootdn,
-					    bl->priv->ldap_scope,
-					    search_op->ldap_query,
-					    NULL, 0,
-					    NULL, /* XXX */
-					    NULL, /* XXX */
-					    NULL,
-					    LDAP_MAX_SEARCH_RESPONSES, &view->search_msgid);
-
-		if (ldap_err != LDAP_SUCCESS) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-
-		if (view->search_msgid == -1) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-		else {
-			view->search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);
-		}
-
-		/* we're async */
-		return FALSE;
-	}
-	else {
-		/* error doing the conversion to an ldap query, let's
-                   end this now by acting like we're synchronous. */
-		g_warning ("LDAP problem converting search query %s\n", search_op->view->search);
-		return TRUE;
-	}
-}
-
-static void
-ldap_search_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	g_free (search_op->ldap_query);
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view, ldap_search_handler, ldap_search_dtor);
-
-	op->ldap_query = NULL;
-	op->view = view;
-	op->bl = bl;
-
-	/* keep track of the search op so we can delete it from the
-           list if the view is destroyed */
-	view->search_op = (LDAPOp*)op;
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->listener != NULL);
-
-	book_view = pas_book_view_new (req->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->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);
-
-	g_free (req->search);
-	CORBA_exception_init(&ev);
-	bonobo_object_release_unref(req->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-	CORBA_exception_free(&ev);
-
-}
-
-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 = ldap_simple_bind_s(bl->priv->ldap,
-					    req->user,
-					    req->passwd);
-
-	pas_book_respond_authenticate_user (book,
-				    ldap_error_to_response (ldap_error));
-
-	bl->priv->writable = (ldap_error == LDAP_SUCCESS);
-	pas_book_report_writable (book, bl->priv->writable);
-
-	if (!bl->priv->evolutionPersonChecked)
-		check_schema_support (bl);
-}
-
-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 gboolean
-pas_backend_ldap_can_write (PASBook *book)
-{
-	return TRUE; /* XXX */
-}
-
-static gboolean
-pas_backend_ldap_can_write_card (PASBook *book,
-				 const char *id)
-{
-	return TRUE; /* XXX */
-}
-
-static void
-pas_backend_ldap_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_ldap_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_ldap_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_ldap_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_ldap_process_check_connection (backend, book, req);
-		break;
-
-	case GetCursor:
-		pas_backend_ldap_process_get_cursor (backend, book, req);
-		break;
-
-	case GetBookView:
-		pas_backend_ldap_process_get_book_view (backend, book, req);
-		break;
-
-	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;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendLDAP *backend;
-
-	backend = PAS_BACKEND_LDAP (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_ldap_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendLDAP *bl;
-	int            ldap_error = LDAP_SUCCESS; /* XXX */
-
-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));
-
-	/* XXX use ldap_search */
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* success */
-		return g_strdup ("");
-	}
-	else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-
-	g_assert (bl->priv->connected == FALSE);
-
-	ldap_error = ldap_url_parse ((char*)uri, &lud);
-	if (ldap_error == LDAP_SUCCESS) {
-		g_free(bl->priv->uri);
-		bl->priv->uri = g_strdup (uri);
-		bl->priv->ldap_host = g_strdup(lud->lud_host);
-		bl->priv->ldap_port = lud->lud_port;
-		/* if a port wasn't specified, default to LDAP_PORT */
-		if (bl->priv->ldap_port == 0)
-			bl->priv->ldap_port = LDAP_PORT;
-		bl->priv->ldap_rootdn = g_strdup(lud->lud_dn);
-		bl->priv->ldap_scope = lud->lud_scope;
-
-		ldap_free_urldesc(lud);
-
-		pas_backend_ldap_connect (bl);
-		if (bl->priv->ldap == NULL)
-			return FALSE;
-		else
-			return TRUE;
-	} else
-		return FALSE;
-}
-
-/* Get_uri handler for the addressbook LDAP backend */
-static const char *
-pas_backend_ldap_get_uri (PASBackend *backend)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (backend);
-	return bl->priv->uri;
-}
-
-static gboolean
-pas_backend_ldap_add_client (PASBackend             *backend,
-			     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,
-		pas_backend_ldap_get_vcard,
-		pas_backend_ldap_can_write,
-		pas_backend_ldap_can_write_card);
-
-	if (!book) {
-		if (!bl->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
-
-	bl->priv->clients = g_list_prepend (
-		bl->priv->clients, book);
-
-	if (bl->priv->connected) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-
-	pas_book_report_writable (book, bl->priv->writable);
-
-	return TRUE;
-}
-
-static void
-pas_backend_ldap_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendLDAP *bl;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_LDAP (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bl->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bl->priv->clients = g_list_remove_link (bl->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bl->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_ldap_get_static_capabilites (PASBackend *backend)
-{
-	return g_strdup("net");
-}
-
-static gboolean
-pas_backend_ldap_construct (PASBackendLDAP *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_ldap_new:
- */
-PASBackend *
-pas_backend_ldap_new (void)
-{
-	PASBackendLDAP *backend;
-
-	backend = gtk_type_new (pas_backend_ldap_get_type ());
-
-	if (! pas_backend_ldap_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-call_dtor (LDAPOp *op, gpointer data)
-{
-	op->dtor (op->backend, op);
-}
-
-static void
-pas_backend_ldap_destroy (GtkObject *object)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (object);
-
-	g_list_foreach (bl->priv->pending_ops, (GFunc)call_dtor, NULL);
-	g_list_free (bl->priv->pending_ops);
-
-	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;
-
-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_ldap_load_uri;
-	parent_class->get_uri                 = pas_backend_ldap_get_uri;
-	parent_class->add_client              = pas_backend_ldap_add_client;
-	parent_class->remove_client           = pas_backend_ldap_remove_client;
-	parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilites;
-
-	object_class->destroy = pas_backend_ldap_destroy;
-}
-
-static void
-pas_backend_ldap_init (PASBackendLDAP *backend)
-{
-	PASBackendLDAPPrivate *priv;
-
-	priv            = g_new0 (PASBackendLDAPPrivate, 1);
-
-	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 593ed624d2..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;
-}
-
-gboolean
-pas_backend_load_uri (PASBackend             *backend,
-		      const char             *uri)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uri != NULL, FALSE);
-
-	g_assert (CLASS (backend)->load_uri != NULL);
-
-	return (* CLASS (backend)->load_uri) (backend, uri);
-}
-
-/**
- * pas_backend_get_uri:
- * @backend: An addressbook backend.
- * 
- * Queries the URI that an addressbook backend is serving.
- * 
- * Return value: URI for the backend.
- **/
-const char *
-pas_backend_get_uri (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * pas_backend_add_client:
- * @backend: An addressbook backend.
- * @listener: Listener for notification to the client.
- *
- * Adds a client to an addressbook backend.
- *
- * Return value: TRUE on success, FALSE on failure to add the client.
- */
-gboolean
-pas_backend_add_client (PASBackend             *backend,
-			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 bd9a12c2a0..0000000000
--- a/addressbook/backend/pas/pas-backend.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * An abstract class which defines the API to a given backend.
- * There will be one PASBackend object for every URI which is loaded.
- *
- * Two people will call into the PASBackend API:
- *
- * 1. The PASBookFactory, when it has been asked to load a book.
- *    It will create a new PASBackend if one is not already running
- *    for the requested URI.  It will call pas_backend_add_client to
- *    add a new client to an existing PASBackend server.
- *
- * 2. A PASBook, when a client has requested an operation on the
- *    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 */
-	gboolean (*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);
-gboolean    pas_backend_load_uri                 (PASBackend             *backend,
-						  const char             *uri);
-const char *pas_backend_get_uri                  (PASBackend             *backend);
-
-gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  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 ca4c74631f..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,610 +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 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;
-
-	/* 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);
-}
-
-/* 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) {
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		if (!pas_backend_add_client (backend, listener))
-			goto out;
-
-		pas_backend_load_uri (backend, uri);
-
-		goto out;
-	}
-
-	pas_backend_add_client (backend, listener);
-
- out:
-	g_free (uri);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_factory_process_request(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_factory_process_queue (PASBookFactory *factory)
-{
-	/* Process pending Book-creation requests. */
-	if (factory->priv->queued_requests != NULL) {
-		PASBookFactoryQueuedRequest  *request;
-		GList *l;
-
-		l = factory->priv->queued_requests;
-		request = l->data;
-
-		pas_book_factory_process_request (factory, request);
-
-		factory->priv->queued_requests = g_list_remove_link (
-			factory->priv->queued_requests, l);
-		g_list_free_1 (l);
-	}
-
-	if (factory->priv->queued_requests == NULL) {
-
-		factory->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_factory_queue_request (PASBookFactory               *factory,
-				const char                   *uri,
-				const 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)
-{
-	PASBookFactoryPrivate *priv;
-	CORBA_Object obj;
-	OAF_RegistrationResult result;
-
-	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);
-
-	puts ("about to register addressbook");
-
-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
-	result = oaf_active_server_register (PAS_BOOK_FACTORY_OAF_ID, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		return FALSE;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		return FALSE;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		return FALSE;
-	}
-}
-
-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 (PAS_BOOK_FACTORY_OAF_ID, obj);
-		factory->priv->registered = FALSE;
-	}
-	
-	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 fc00b7b423..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,50 +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);
-
-gboolean        pas_book_factory_activate         (PASBookFactory               *factory);
-
-GtkType         pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_BOOK_FACTORY_H__ */
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
deleted file mode 100644
index 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 ec8842135d..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,884 +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;
-	PASBookGetVCardFn       get_vcard;
-	PASBookCanWriteFn       can_write;
-	PASBookCanWriteCardFn   can_write_card;
-
-	GList                  *request_queue;
-	gint                    idle_id;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->request_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (book),
-				 pas_book_signals [REQUESTS_QUEUED]);
-	}
-
-	if (book->priv->request_queue == NULL) {
-		book->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_queue_request (PASBook *book, PASRequest *req)
-{
-	book->priv->request_queue =
-		g_list_append (book->priv->request_queue, req);
-
-	if (book->priv->idle_id == 0) {
-		book->priv->idle_id = g_idle_add ((GSourceFunc) pas_book_check_queue, book);
-	}
-}
-
-static void
-pas_book_queue_create_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CreateCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_remove_card (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = RemoveCard;
-	req->id = g_strdup (id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_modify_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = ModifyCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_cursor (PASBook *book, const char *search)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = GetCursor;
-	req->search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_authenticate_user (PASBook *book,
-				  const char *user, const char *passwd)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = AuthenticateUser;
-	req->user   = g_strdup(user);
-	req->passwd = g_strdup(passwd);
-
-	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->search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->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->change_id= g_strdup(change_id);
-	
-	CORBA_exception_init (&ev);
-
-	req->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 CORBA_char *
-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));
-	char       *vcard;
-	CORBA_char *retval;
-
-	vcard = (book->priv->get_vcard) (book, (const char *) id);
-	retval = CORBA_string_dup (vcard);
-	g_free (vcard);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Addressbook_Book_isWriteable (PortableServer_Servant servant,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write) (book);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Addressbook_Book_isCardWriteable (PortableServer_Servant servant,
-						       const GNOME_Evolution_Addressbook_CardId id,
-						       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write_card) (book, (const char *) id);
-
-	return retval;
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_authenticateUser (PortableServer_Servant servant,
-							const char* user,
-							const char* passwd,
-							CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_authenticate_user (book, user, passwd);
-}
-
-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_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,
-		    PASBookGetVCardFn       get_vcard,
-		    PASBookCanWriteFn       can_write,
-		    PASBookCanWriteCardFn   can_write_card)
-{
-	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);
-	g_assert (get_vcard != NULL);
-	g_assert (can_write != NULL);
-	g_assert (can_write_card != NULL);
-
-	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->get_vcard = get_vcard;
-	book->priv->can_write = can_write;
-	book->priv->can_write_card = can_write_card;
-	book->priv->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      GNOME_Evolution_Addressbook_BookListener  listener,
-	      PASBookGetVCardFn       get_vcard,
-	      PASBookCanWriteFn       can_write,
-	      PASBookCanWriteCardFn   can_write_card)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (get_vcard != NULL,             NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener,
-				  get_vcard, can_write, can_write_card)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-static void
-pas_book_destroy (GtkObject *object)
-{
-	PASBook *book = PAS_BOOK (object);
-	GList   *l;
-	CORBA_Environment ev;
-
-	for (l = book->priv->request_queue; l != NULL; l = l->next) {
-		PASRequest *req = l->data;
-
-		g_free (req->id);
-		g_free (req->vcard);
-		g_free (req);
-	}
-	g_list_free (book->priv->request_queue);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (book->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_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->isWriteable           = impl_GNOME_Evolution_Addressbook_Book_isWriteable;
-	epv->isCardWriteable       = impl_GNOME_Evolution_Addressbook_Book_isCardWriteable;
-	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->idle_id       = 0;
-	book->priv->request_queue = NULL;
-}
-
-/**
- * pas_book_get_type:
- */
-GtkType
-pas_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBook",
-			sizeof (PASBook),
-			sizeof (PASBookClass),
-			(GtkClassInitFunc)  pas_book_class_init,
-			(GtkObjectInitFunc) pas_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
deleted file mode 100644
index 6cb6268553..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,117 +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,
-	GetCursor,
-	GetBookView,
-	GetChanges,
-	CheckConnection,
-	AuthenticateUser,
-	GetSupportedFields
-} PASOperation;
-
-typedef struct {
-	PASOperation               op;
-	char                      *id;
-	char                      *vcard;
-	char                      *search;
-	char                      *change_id;
-	char                      *user;
-        char                      *passwd;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-	GNOME_Evolution_Addressbook_stringlist fields;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef char *   (*PASBookGetVCardFn)     (PASBook *book, const char *id);
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 GNOME_Evolution_Addressbook_BookListener             listener,
-							 PASBookGetVCardFn                  get_vcard,
-							 PASBookCanWriteFn                  can_write,
-							 PASBookCanWriteCardFn              can_write_card);
-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_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_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);
-
-gboolean                pas_book_can_write              (PASBook                           *book);
-gboolean                pas_book_can_write_card         (PASBook                           *book,
-							 const char                        *id);
-GtkType                 pas_book_get_type               (void);
-
-#define PAS_BOOK_TYPE        (pas_book_get_type ())
-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))
-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))
-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))
-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))
-
-#endif /* ! __PAS_BOOK_H__ */
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
deleted file mode 100644
index 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 d95d858fd8..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,48 +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		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# Address Conduit
-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c \
-	address-conduit.h \
-	address-conduit-config.h
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/libeutil-static.la			\
-	$(top_builddir)/e-util/ename/libename-static.la			\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(GNOME_PILOT_LIBS) 						\
-	$(PISOCK_LIBS) 							\
-	$(BONOBO_GNOME_LIBS)						\
-	$(EXTRA_GNOME_LIBS)						\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_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-config.h b/addressbook/conduit/address-conduit-config.h
deleted file mode 100644
index d622aa11c6..0000000000
--- a/addressbook/conduit/address-conduit-config.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_CONFIG_H__
-#define __ADDR_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-struct _EAddrConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef ADDR_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EAddrConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef ADDR_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef ADDR_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef ADDR_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __ADDR_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 61917cc00f..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1137 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-file.h>
-#include <pi-dlp.h>
-#include <ebook/e-book.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 <e-pilot-util.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_DESTROY 1
-#include "address-conduit-config.h"
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_DESTROY
-
-#include "address-conduit.h"
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.1"
-#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;
-
-/* 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] : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_addr_context_new (EAddrConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (EAddrConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	addrconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->cfg != NULL)
-		addrconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Addressbok Server routines */
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	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);
-			
-			gtk_object_ref (GTK_OBJECT (card));
-			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)
-{
-	gchar *uri, *path;
-
-	g_return_val_if_fail(ctxt!=NULL,-2);
-
-	ctxt->ebook = e_book_new ();
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	e_book_load_uri (ctxt->ebook, uri, book_open_cb, ctxt);
-
-	/* run a sub event loop to turn ebook's async loading into a
-           synchronous call */
-	gtk_main ();
-
-	g_free (uri);
-
-	if (ctxt->address_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EAddrConduitContext *ctxt) 
-{
-	char *filename = NULL;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static 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 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
-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;
-	
-	g_assert (local->addr != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char,0xffff);
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)
-{
-	ECardSimple *simple;
-	const ECardDeliveryAddress *delivery;
-	int phone = entryPhone1;
-	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);
-
-	compute_status (ctxt, local, ecard->id);
-
-	local->addr = g_new0 (struct Address, 1);
-
-	if (ecard->name) {
-		if (ecard->name->given)
-			local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (ecard->name->given);
-		if (ecard->name->family)
-			local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (ecard->name->family);
-		if (ecard->org)
-			local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (ecard->org);
-		if (ecard->title)
-			local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (ecard->title);
-	}
-
-	delivery = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-	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);
-	}
-	
-	for (i = 0; i <= 7 && phone <= entryPhone5; i++) {
-		const char *phone_str = NULL;
-		char *phonelabel = ctxt->ai.phoneLabels[i];
-		
-		if (!strcmp (phonelabel, "E-mail"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_EMAIL);
-		else if (!strcmp (phonelabel, "Home"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_HOME);
-		else if (!strcmp (phonelabel, "Work"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS);
-		else if (!strcmp (phonelabel, "Fax"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX);
-		else if (!strcmp (phonelabel, "Other"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER);
-		else if (!strcmp (phonelabel, "Main"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY);
-		else if (!strcmp (phonelabel, "Pager"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER);
-		else if (!strcmp (phonelabel, "Mobile"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE);
-		
-		if (phone_str) {
-			local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-			local->addr->phoneLabel[phone - entryPhone1] = i;
-			phone++;
-		}		
-	}
-	for (; phone <= entryPhone5; phone++)
-		local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	ECard *ecard = NULL;
-
-	g_assert (local != NULL);
-
-	ecard = e_book_get_card (ctxt->ebook, uid);
-
-	if (ecard != NULL) {
-		local_record_from_ecard (local, ecard, ctxt);
-	} else {
-		ecard = e_card_new ("");
-		e_card_set_id (ecard, uid);
-		local_record_from_ecard (local, ecard, ctxt);
-	}
-}
-
-static ECard *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 ECard *in_card)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	ECardDeliveryAddress delivery;
-	ECardAddrLabel label;
-	char *string;
-	char *stringparts[3];
-	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);
-	simple = e_card_simple_new (ecard);
-
-	/* Name and company */
-	i = 0;
-	if (address.entry[entryFirstname] && *address.entry[entryFirstname])
-		stringparts[i++] = address.entry[entryFirstname];
-	if (address.entry[entryLastname] && *address.entry[entryLastname])
-		stringparts[i++] = address.entry[entryLastname];
-	stringparts[i] = NULL;
-
-	string = g_strjoinv(" ", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FULL_NAME, e_pilot_utf8_from_pchar (string));
-	g_free(string);
-
-	if (address.entry[entryTitle]) {
-		char *txt = get_entry_text (address, entryTitle);
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, txt);
-		g_free (txt);
-	}
-
-	if (address.entry[entryCompany]) {
-		char *txt = get_entry_text (address, entryCompany);
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, txt);
-		g_free (txt);
-	}
-
-	/* Address */
-	memset (&delivery, 0, sizeof (ECardDeliveryAddress));
-	delivery.flags = E_CARD_ADDR_WORK;
-	if (address.entry[entryAddress])
-		delivery.street = get_entry_text (address, entryAddress);
-	if (address.entry[entryCity])
-		delivery.city = get_entry_text (address, entryCity);
-	if (address.entry[entryState])
-		delivery.region = get_entry_text (address, entryState);
-	if (address.entry[entryCountry])
-		delivery.country = get_entry_text (address, entryCountry);
-	if (address.entry[entryZip])
-		delivery.code = get_entry_text (address, entryZip);
-
-	label.flags = E_CARD_ADDR_WORK;
-	label.data = e_card_delivery_address_to_string (&delivery);
-
-	e_card_simple_set_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, &label);
-	e_card_simple_set_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, &delivery);
-
-	free (delivery.street);
-	free (delivery.city);
-	free (delivery.region);
-	free (delivery.country);
-	free (delivery.code);
-	g_free (label.data);
-	
-	/* Phone numbers */
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		char *phonelabel = ctxt->ai.phoneLabels[address.phoneLabel[i - entryPhone1]];
-		char *phonenum = get_entry_text (address, i);
-
-		if (!strcmp (phonelabel, "E-mail"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_EMAIL, phonenum);
-		else if (!strcmp (phonelabel, "Home"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_HOME, phonenum);
-		else if (!strcmp (phonelabel, "Work"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, phonenum);
-		else if (!strcmp (phonelabel, "Fax"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, phonenum);
-		else if (!strcmp (phonelabel, "Other"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER, phonenum);
-		else if (!strcmp (phonelabel, "Main"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, phonenum);
-		else if (!strcmp (phonelabel, "Pager"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, phonenum);
-		else if (!strcmp (phonelabel, "Mobile"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, phonenum);
-		
-		g_free (phonenum);
-	}
-
-	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)
-{
-	int count, map_count;
-
-  	count = g_list_length (ctxt->cards);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-	} 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) {
-		CardObjectChange *coc = g_new0 (CardObjectChange, 1);
-		
-		coc->card = E_CARD (l->data);
-		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, 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) {
-		CardObjectChange *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, e_card_get_id (coc->card), coc);
-	}
-}
-
-
-static void
-card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)
-{
-	CardObjectChange *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 (!e_pilot_map_uid_is_archived (ctxt->map, id))
-		g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
-}
-
-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->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); */
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-  	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* 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 ();
-	
-	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);
-
-			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);
-		} 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 ("beginning 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);
-		} 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);
-		} 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)
-{
-	/* 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,
-	    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);
-
-	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));
-			coc->card = local->ecard;
-			g_hash_table_insert (ctxt->changed_hash, 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)
-{
-  	char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EAddrLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG ("in address's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	e_addr_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
deleted file mode 100644
index 9075957e90..0000000000
--- a/addressbook/conduit/address-conduit.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_H__
-#define __ADDR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-address.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	ECard *ecard;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EAddrConduitContext EAddrConduitContext;
-struct _EAddrConduitContext {
-	EAddrConduitCfg *cfg;
-
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	EPilotMap *map;
-};
-
-#endif __ADDR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 99b5a15221..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 merge_from_pilot merge_to_pilot"/>
-     	<conduit-attribute name="settings" value="FALSE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/contact-editor/.cvsignore b/addressbook/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/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 7350b4925e..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,147 +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_ShellComponentFactory"
-            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 Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory">
-
-	<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_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index 898a415747..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =							\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)					\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/gui/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			\
-	$(BONOBO_HTML_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-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				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(BONOBO_CONF_LIBS)						\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/menus/libmenus.la
-
-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 = addressbook-config.glade
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	addressbook-config.glade\
-	$(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 1dca130042..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,375 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <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 "addressbook-storage.h"
-#include "addressbook-component.h"
-#include "addressbook.h"
-#include "addressbook/gui/merging/e-card-merging.h"
-
-
-
-#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"
-
-EvolutionShellClient *global_shell_client;
-
-EvolutionShellClient *
-addressbook_component_get_shell_client  (void)
-{
-	return global_shell_client;
-}
-
-static BonoboGenericFactory *factory = NULL;
-
-static char *accepted_dnd_types[] = {
-	"text/x-vcard",
-	NULL
-};
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png", TRUE, accepted_dnd_types, NULL },
-	{ NULL, NULL, FALSE, NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "contacts") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static 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 (g_strcasecmp (type, "contacts") != 0)
-		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 (strcmp (type, "contacts") != 0) {
-		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);
-}
-
-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;
-	char *source_path;
-	char *destination_path;
-	
-	if (strcmp (type, "contacts") != 0) {
-		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;
-	}
-
-	/* strip the 'file://' from the beginning of each uri and add addressbook.db */
-	source_path = g_concat_dir_and_file (source_physical_uri + 7, "addressbook.db");
-	destination_path = g_concat_dir_and_file (destination_physical_uri + 7, "addressbook.db");
-
-	CORBA_exception_init (&ev);
-
-	/* XXX always fail for now, until the above stuff is written */
-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED, &ev);
-
-	g_free (source_path);
-	g_free (destination_path);
-	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_storage_setup (shell_component, evolution_homedir);
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		GNOME_Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0)
-		gtk_main_quit();
-}
-
-
-/* Destination side DnD */
-
-static CORBA_boolean
-destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *folder,
-				  const char *physical_uri,
-				  const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,
-				  GNOME_Evolution_ShellComponentDnd_Action * suggested_action_return,
-				  gpointer user_data)
-{
-	g_print ("in destination_folder_handle_motion (%s)\n", physical_uri);
-	*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 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 (data->bytes._buffer);
-
-	expanded_uri = addressbook_expand_uri (physical_uri);
-
-	book = e_book_new ();
-	e_book_load_uri (book, expanded_uri,
-			 (EBookCallback)dnd_drop_book_open_cb, card_list);
-
-	g_free (expanded_uri);
-
-	return TRUE;
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	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));
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-addressbook_component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("Cannot initialize the Evolution addressbook factory.");
-}
-
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index e5dc74e17e..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,33 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 77614a89f5..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,981 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-propertybox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <gtkhtml/gtkhtml.h>
-#include <e-util/e-html-utils.h>
-#include "addressbook-config.h"
-#include "addressbook-storage.h"
-
-/* #define INCLUDE_FILE_SOURCE */
-
-typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
-typedef struct _AddressbookSourcePageItem  AddressbookSourcePageItem;
-typedef struct _LDAPAuthPageItem LDAPAuthPageItem;
-
-struct _AddressbookSourceDialog {
-	GtkWidget *html;
-	GtkWidget *dialog;
-	GtkWidget *vbox;
-	GtkWidget *name;
-	GtkWidget *description;
-	GtkWidget *source_option;
-	GtkWidget *notebook;
-
-	GList *source_pages;
-	AddressbookSourcePageItem *source_page;
-
-	gint id; /* button we closed the dialog with */
-
-	AddressbookSource *source; /* our result if the Ok button was clicked */
-};
-
-struct _AddressbookSourcePageItem {
-	gint pnum;
-
-	AddressbookSourceType source_type;
-
-	AddressbookSourceDialog *dialog;
-
-	GtkWidget *item;
-	GtkWidget *vbox;
-
-	/* file: addressbook's */
-	GtkWidget *path;
-	GtkWidget *creat;
-
-	/* ldap: addressbook's */
-	GtkWidget *host;
-	GtkWidget *port;
-	GtkWidget *rootdn;
-	GtkWidget *scope_optionmenu;
-	GtkWidget *auth_optionmenu;
-	GtkWidget *auth_notebook;
-
-	GList *auths;
-	LDAPAuthPageItem *auth;
-};
-
-struct _LDAPAuthPageItem {
-	gint pnum;
-
-	AddressbookLDAPAuthType auth_type;
-
-	AddressbookSourceDialog *dialog;
-	AddressbookSourcePageItem *page;
-
-	GtkWidget *item;
-	GtkWidget *vbox;
-
-	/* simple (password) auth */
-	GtkWidget *binddn;
-	GtkWidget *remember_passwd;
-};
-
-static void
-html_size_req (GtkWidget *widget, GtkRequisition *requisition)
-{
-	 requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-	
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white :
-						       &style->bg[0]);
-	}
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else
-		gtk_widget_show_all (scrolled);
-	
-	return html;
-}
-
-static void
-put_html (GtkHTML *html, char *text)
-{
-	GtkHTMLStream *handle;
-	
-	text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (text);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-
-#ifdef INCLUDE_FILE_SOURCE
-static const char *
-addressbook_config_source_label (AddressbookSourceType type)
-{
-	switch (type) {
-	case ADDRESSBOOK_SOURCE_LDAP:
-		return _("LDAP Server");
-	case ADDRESSBOOK_SOURCE_FILE:
-		return _("File");
-	default:
-		g_assert(0);
-		return _("Unknown addressbook type");
-	}
-}
-#endif
-
-static const char *
-addressbook_config_auth_label (AddressbookLDAPAuthType type)
-{
-	switch (type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return _("None (anonymous mode)");
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		return _("Password");
-	default:
-		g_assert(0);
-		return _("Unknown auth type");
-	}
-}
-
-static const char *
-addressbook_config_scope_label (AddressbookLDAPScopeType scope)
-{
-	switch (scope) {
-	case ADDRESSBOOK_LDAP_SCOPE_BASE:
-		return _("Base");
-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:
-		return _("One");
-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
-		return _("Subtree");
-	default:
-		g_assert (0);
-		return _("Unknown scope type");
-	}
-}
-
-static void
-addressbook_source_edit_changed (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	char *data;
-	gboolean complete = TRUE;
-	AddressbookSourcePageItem *source_page = dialog->source_page;
-
-	if (source_page == NULL)
-		complete = FALSE;
-
-	if (complete) {
-		data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (dialog->name), 0, -1);
-		if (!data || !*data)
-			complete = FALSE;
-		g_free (data);
-	}
-
-	if (complete) {
-		if (source_page->source_type == ADDRESSBOOK_SOURCE_FILE) {
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->path), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				g_free (data);
-			}
-		}
-		else {
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->host), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				g_free (data);
-			}
-
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->port), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				/* XXX more validation on port here */
-				g_free (data);
-			}
-
-			if (complete) {
-				LDAPAuthPageItem *auth_page = source_page->auth;
-
-				if (auth_page->auth_type == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-					data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (auth_page->binddn), 0, -1);
-					if (!data || !*data)
-						complete = FALSE;
-					g_free (data);
-				}
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->port), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				/* XXX more validation on port here */
-				g_free (data);
-			}
-		}
-	}
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, complete);
-}
-
-static void
-source_type_menuitem_activate (GtkWidget *item, gpointer data)
-{
-	AddressbookSourcePageItem *sitem = data;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK(sitem->dialog->notebook), sitem->pnum);
-	sitem->dialog->source_page = sitem;
-
-	addressbook_source_edit_changed (item, sitem->dialog);	
-}
-
-typedef struct {
-	AddressbookSourceDialog *dialog;
-	char *help_text;
-} FocusHelpClosure;
-
-static void
-free_focus_help_closure (gpointer data)
-{
-	FocusHelpClosure *closure = data;
-	g_free(closure->help_text);
-	g_free(closure);
-}
-
-static gint
-focus_help (GtkWidget *widget, GdkEventFocus *event, FocusHelpClosure *closure)
-{
-	put_html (GTK_HTML(closure->dialog->html), closure->help_text);
-	return FALSE;
-}
-
-static GtkWidget *
-table_add_elem (AddressbookSourceDialog *dialog, GtkWidget *table, 
-		int row,
-		const char *label_text,
-		char *help_text)
-{
-	GtkWidget *label, *entry;
-	FocusHelpClosure *focus_closure;
-
-	label = gtk_label_new (label_text);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 
-			  row, row + 1, GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, row, row + 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	gtk_signal_connect (GTK_OBJECT (entry), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-
-	focus_closure = g_new0 (FocusHelpClosure, 1);
-	focus_closure->dialog = dialog;
-	focus_closure->help_text = g_strdup(help_text);
-
-	gtk_signal_connect_full (GTK_OBJECT (entry),
-				 "focus_in_event" /* XXX */,
-				 (GtkSignalFunc) focus_help, NULL,
-				 focus_closure,
-				 (GtkDestroyNotify) free_focus_help_closure,
-				 FALSE, FALSE);
-	return entry;
-}
-
-static void
-ldap_auth_type_menuitem_activate (GtkWidget *item, gpointer data)
-{
-	LDAPAuthPageItem *auth_item = data;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK(auth_item->page->auth_notebook), auth_item->pnum);
-
-	auth_item->page->auth = auth_item;
-
-	addressbook_source_edit_changed (item, auth_item->dialog);	
-}
-
-static LDAPAuthPageItem *
-addressbook_ldap_auth_item_new (AddressbookSourceDialog *dialog,
-				AddressbookSourcePageItem *page,
-				AddressbookLDAPAuthType type)
-{
-	LDAPAuthPageItem *item = g_new0 (LDAPAuthPageItem, 1);
-	GtkWidget *table = NULL;
-	int row = 0;
-
-	item->pnum = type;
-	item->auth_type = type;
-	item->dialog = dialog;
-	item->page = page;
-	item->vbox = gtk_vbox_new (FALSE, 0);
-
-	switch (type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		table = gtk_table_new (2, 2, FALSE);
-		item->binddn = table_add_elem (dialog, table, row++,
-					       _("Bind DN:"),
-					       _("FIXME Bind DN Help text here"));
-
-		item->remember_passwd = gtk_check_button_new_with_label (_("Remember this password"));
-
-		gtk_table_attach (GTK_TABLE (table), item->remember_passwd, 1, 2,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, TRUE, 0);
-		break;
-	default:
-		g_assert (0);
-		return item;
-	}
-
-	if (table) {
-		gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-		gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-		gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	}
-
-	gtk_widget_show_all (item->vbox);
-
-	return item;
-}
-
-static AddressbookSourcePageItem *
-addressbook_source_item_new (AddressbookSourceDialog *dialog, AddressbookSourceType type)
-{
-	AddressbookSourcePageItem *item = g_new0 (AddressbookSourcePageItem, 1);
-	GtkWidget *table = NULL;
-#if 0
-	GtkWidget *advanced_button;
-#endif
-	int row = 0;
-
-	item->pnum = type;
-	item->source_type = type;
-	item->dialog = dialog;
-
-	item->vbox = gtk_vbox_new (FALSE, 0);
-
-	switch (type) {
-	case ADDRESSBOOK_SOURCE_LDAP: {
-		GtkWidget *label;
-		GtkWidget *menu;
-		int i;
-		LDAPAuthPageItem *first_item = NULL;
-		int position;
-
-		table = gtk_table_new (6, 2, FALSE);
-
-		item->host = table_add_elem (dialog, table, row++,
-					     _("Host:"),
-					     _("FIXME Host help text here."));
-		item->rootdn = table_add_elem (dialog, table, row++,
-					       _("Root DN:"),
-					       _("FIXME Root DN help text here."));
-
-		/* XXX BEGIN PUT IN ADVANCED DIALOG */
-		item->port = table_add_elem (dialog, table, row++,
-					     _("Port:"),
-					     _("FIXME Port help text here."));
-		gtk_editable_insert_text (GTK_EDITABLE (item->port), "389", 3, &position);
-
-		item->scope_optionmenu = gtk_option_menu_new ();
-		menu = gtk_menu_new ();
-
-		for (i = 0; i < ADDRESSBOOK_LDAP_SCOPE_LAST; i ++) {
-			GtkWidget *scope_item = gtk_menu_item_new_with_label (addressbook_config_scope_label (i));
-
-			gtk_signal_connect (GTK_OBJECT (scope_item), "activate",
-					    GTK_SIGNAL_FUNC (addressbook_source_edit_changed),
-					    dialog);
-
-			gtk_menu_append (GTK_MENU (menu), scope_item);
-			gtk_widget_show (scope_item);
-		}
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (item->scope_optionmenu), menu);
-		//		ldap_auth_type_menuitem_activate (first_item->item, first_item);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(item->scope_optionmenu), 0);
-		label = gtk_label_new (_("Search Scope:"));
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-		gtk_table_attach (GTK_TABLE (table), 
-				  item->scope_optionmenu, 
-				  1, 2, row, row + 1, 
-				  GTK_EXPAND | GTK_FILL, 0,
-				  0, 0);
-
-		row++;
-		/* XXX END PUT IN ADVANCED DIALOG */
-
-		item->auth_optionmenu = gtk_option_menu_new ();
-		menu = gtk_menu_new ();
-
-		item->auth_notebook = gtk_notebook_new();
-		gtk_notebook_set_show_tabs (GTK_NOTEBOOK (item->auth_notebook), FALSE);
-
-		for (i = 0; i < ADDRESSBOOK_LDAP_AUTH_LAST; i++) {
-			LDAPAuthPageItem *auth_item;
-
-			auth_item = addressbook_ldap_auth_item_new (dialog, item, i);
-
-			item->auths = g_list_append (item->auths, auth_item);
-
-			if (!first_item)
-				first_item = auth_item;
-
-			auth_item->item = gtk_menu_item_new_with_label (addressbook_config_auth_label (i));
-
-			gtk_notebook_append_page (GTK_NOTEBOOK (item->auth_notebook),
-						  auth_item->vbox, NULL);
-
-			gtk_signal_connect (GTK_OBJECT (auth_item->item), "activate",
-					    GTK_SIGNAL_FUNC (ldap_auth_type_menuitem_activate),
-					    auth_item);
-
-			gtk_menu_append (GTK_MENU (menu), auth_item->item);
-			gtk_widget_show (auth_item->item);
-		}
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (item->auth_optionmenu), menu);
-		ldap_auth_type_menuitem_activate (first_item->item, first_item);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(item->auth_optionmenu), 0);
-
-		label = gtk_label_new (_("Authentication:"));
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-		gtk_table_attach (GTK_TABLE (table), 
-				  item->auth_optionmenu, 
-				  1, 2, row, row + 1, 
-				  GTK_EXPAND | GTK_FILL, 0,
-				  0, 0);
-
-		row++;
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, FALSE, 0);
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), item->auth_notebook,
-				    TRUE, TRUE, 0);
-
-#if 0
-		table = gtk_table_new (1, 4, FALSE);
-
-		advanced_button = gtk_button_new_with_label (_("Advanced LDAP Options"));
-
-		gtk_table_attach (GTK_TABLE (table), 
-				  advanced_button,
-				  3, 4, 0, 1,
-				  0, 0,
-				  0, 0);
-
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    FALSE, FALSE, 0);
-
-		gtk_signal_connect (GTK_OBJECT (advanced_button), "clicked",
-				    GTK_SIGNAL_FUNC (), dialog);
-#endif
-
-		break;
-	}
-	case ADDRESSBOOK_SOURCE_FILE: {
-		table = gtk_table_new (2, 2, FALSE);
-		item->path = table_add_elem (dialog, table, row++,
-					     _("Path:"),
-					     _("FIXME Path Help text here"));
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, TRUE, 0);
-
-		item->creat = gtk_check_button_new_with_label (_("Create path if it doesn't exist."));
-		gtk_table_attach (GTK_TABLE (table), item->creat, 1, 2,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		break;
-	}
-	default:
-		g_assert(0);
-		return item;
-	}
-
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-
-	gtk_widget_show_all (item->vbox);
-
-	return item;
-}
-
-static void
-addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source)
-{
-	AddressbookSourcePageItem *source_page;
-
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), source->name);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->description), source->description);
-
-	/* choose the correct server page */
-	source_page = g_list_nth_data (dialog->source_pages, source->type);
-	source_type_menuitem_activate (source_page->item, source_page);
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->source_option), source->type);
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP) {
-		LDAPAuthPageItem *auth_page;
-
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->host), source->ldap.host);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->port), source->ldap.port);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->rootdn), source->ldap.rootdn);
-
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->scope_optionmenu), source->ldap.scope);
-
-		auth_page = g_list_nth_data (source_page->auths, source->ldap.auth);
-		ldap_auth_type_menuitem_activate (auth_page->item, auth_page);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->auth_optionmenu), auth_page->auth_type);
-
-		if (auth_page->auth_type == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			e_utf8_gtk_entry_set_text (GTK_ENTRY (auth_page->binddn), source->ldap.binddn);
-		}
-	}
-	else {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->path), source->file.path);
-	}
-}
-
-static AddressbookSource *
-addressbook_source_dialog_get_source (AddressbookSourceDialog *dialog)
-{
-	AddressbookSource *source = g_new0 (AddressbookSource, 1);
-	AddressbookSourcePageItem *source_page;
-
-	source_page = dialog->source_page;
-
-	source->name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->name));
-	source->description = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->description));
-	source->type = source_page->source_type;
-
-	if (source->type == ADDRESSBOOK_SOURCE_FILE) {
-		source->file.path = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->path));
-	}
-	else {
-		LDAPAuthPageItem *auth_page;
-
-		source->ldap.host   = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->host));
-		source->ldap.port   = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->port));
-		source->ldap.rootdn = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->rootdn));
-
-		auth_page = source_page->auth;
-
-		source->ldap.auth = auth_page->auth_type;
-		if (source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			source->ldap.binddn = e_utf8_gtk_entry_get_text (GTK_ENTRY (auth_page->binddn));
-			source->ldap.remember_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (auth_page->remember_passwd));
-		}
-
-		ldap_auth_type_menuitem_activate (auth_page->item, auth_page);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->auth_optionmenu), auth_page->auth_type);
-	}
-
-	addressbook_storage_init_source_uri (source);
-
-	return source;
-}
-
-static void
-addressbook_source_dialog_ok_clicked (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-	dialog->source = addressbook_source_dialog_get_source (dialog);
-}
-
-static void
-addressbook_source_dialog_destroy (AddressbookSourceDialog *dialog)
-{
-	GList *s;
-
-	for (s = dialog->source_pages; s; s = s->next) {
-		AddressbookSourcePageItem *source_item = s->data;
-
-		g_list_foreach (source_item->auths, (GFunc)g_free, NULL);
-		g_list_free (source_item->auths);
-		g_free (source_item);
-	}
-
-	g_list_free (dialog->source_pages);
-
-	if (dialog->source)
-		addressbook_source_free (dialog->source);
-	g_free (dialog);
-}
-
-static AddressbookSourceDialog*
-addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
-{
-	GtkWidget *table;
-	AddressbookSourceDialog *dialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *vbox, *dialog_vbox;
-#ifdef INCLUDE_FILE_SOURCE
-	GtkWidget *menu;
-#endif
-	AddressbookSourcePageItem *first_item = NULL;
-	GtkWidget *area;
-	int i;
-	int row = 0;
-
-	if (source)
-		dialog->dialog = gnome_dialog_new (_("Edit Addressbook"), NULL);
-	else
-		dialog->dialog = gnome_dialog_new (_("Add Addressbook"), NULL);
-
-	gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
-	gtk_window_set_policy (GTK_WINDOW (dialog->dialog), 
-			       FALSE, TRUE, FALSE);
-#if 0
-	gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 300, 300);
-#endif
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog->dialog),
-				 GTK_WINDOW (parent));
-
-	dialog->vbox = gtk_vbox_new (FALSE, 5);
-	dialog_vbox = GNOME_DIALOG (dialog->dialog)->vbox;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-
-	dialog->html = html_new (FALSE);
-	put_html (GTK_HTML (dialog->html),
-		  _("Select the kind of addressbook you have, and enter "
-		    "the relevant information about it."));
-
-	table = gtk_table_new (2, 2, FALSE);
-
-	dialog->name = table_add_elem (dialog, table, row++,
-				       _("Name:"),
-				       _("FIXME Name help text here"));
-	dialog->description = table_add_elem (dialog, table, row++,
-					      _("Description:"),
-					      _("FIXME Description help text here"));
-
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-
-	dialog->notebook = gtk_notebook_new();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (dialog->notebook), FALSE);
-
-#ifdef INCLUDE_FILE_SOURCE
-	dialog->source_option = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-#endif
-
-	for (i = ADDRESSBOOK_SOURCE_LDAP;
-	     i < ADDRESSBOOK_SOURCE_LAST;
-	     i ++) {
-		AddressbookSourcePageItem *item;
-
-		item = addressbook_source_item_new (dialog, i);
-
-		dialog->source_pages = g_list_append (dialog->source_pages, item);
-
-#ifdef INCLUDE_FILE_SOURCE
-		item->item = gtk_menu_item_new_with_label (addressbook_config_source_label (i));
-#endif
-		
-		if (!first_item)
-			first_item = item;
-
-		gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook),
-					  item->vbox, NULL);
-
-		gtk_signal_connect (GTK_OBJECT (item->item), "activate",
-				    GTK_SIGNAL_FUNC (source_type_menuitem_activate),
-				    item);
-
-#ifdef INCLUDE_FILE_SOURCE
-		gtk_menu_append (GTK_MENU (menu), item->item);
-#endif
-		gtk_widget_show (item->item);
-	}
-
-#ifdef INCLUDE_FILE_SOURCE
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (dialog->source_option), menu);
-#endif
-	source_type_menuitem_activate (first_item->item, first_item);
-#ifdef INCLUDE_FILE_SOURCE
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->source_option), 0);
-#endif
-
-	gtk_box_pack_start (GTK_BOX (vbox), dialog->html->parent, 
-			    FALSE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (vbox), table,
-			    FALSE, FALSE, 0);
-
-#ifdef INCLUDE_FILE_SOURCE
-	gtk_box_pack_start (GTK_BOX (vbox), dialog->source_option,
-			    FALSE, FALSE, 0);
-#endif
-
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, FALSE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), dialog->notebook, 
-			    TRUE, TRUE, 0);
-
-	/* hook our ui into the gnome-dialog */
-	gtk_box_pack_start (GTK_BOX (dialog_vbox), dialog->vbox, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (dialog->vbox);
-
-	/* Buttons */
-	area = GNOME_DIALOG (dialog->dialog)->action_area;
-	gtk_widget_show (area);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (area), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (area), 8);
-
-	gnome_dialog_append_button (GNOME_DIALOG (dialog->dialog), 
-				    GNOME_STOCK_BUTTON_OK);
-	gnome_dialog_append_button (GNOME_DIALOG (dialog->dialog), 
-				    GNOME_STOCK_BUTTON_CANCEL);	
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog->dialog), 0);
-
-	/* fill in source info if there is some */
-	if (source)
-		addressbook_source_dialog_set_source (dialog, source);
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, FALSE);
-	
-	gnome_dialog_button_connect( GNOME_DIALOG (dialog->dialog), 0,
-				     GTK_SIGNAL_FUNC (addressbook_source_dialog_ok_clicked),
-				     dialog);
-
-	return dialog;
-}
-
-static AddressbookSourceDialog *
-addressbook_config_source (AddressbookSource *source, GtkWidget *parent)
-{
-	AddressbookSourceDialog* dialog = addressbook_source_dialog (source, parent);
-
-	dialog->id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog->dialog));
-
-	return dialog;
-}
-
-
-
-typedef struct {
-	GladeXML *gui;
-	GNOME_Evolution_Shell shell;
-	GtkWidget *dialog;
-	GtkWidget *clistSources;
-	GtkWidget *addSource;
-	GtkWidget *editSource;
-	GtkWidget *deleteSource;
-	gint      source_row;
-} AddressbookDialog;
-
-static void
-update_sensitivity (AddressbookDialog *dialog)
-{
-	gboolean sensitive = dialog->source_row != -1;
-
-	gtk_widget_set_sensitive (dialog->editSource, sensitive);
-	gtk_widget_set_sensitive (dialog->deleteSource, sensitive);
-}
-
-static void
-add_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSourceDialog *sdialog;
-
-	sdialog = addressbook_config_source (NULL, dialog->dialog);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		AddressbookSource *source = addressbook_source_copy(sdialog->source);
-		gint row;
-		gchar *text[2];
-
-		text[0] = source->name;
-		text[1] = source->uri;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(dialog->clistSources), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(dialog->clistSources), row, source, (GtkDestroyNotify) addressbook_source_free);
-		gnome_property_box_changed (GNOME_PROPERTY_BOX (dialog->dialog));
-		update_sensitivity (dialog);
-	}
-
-	addressbook_source_dialog_destroy (sdialog);
-}
-
-static void
-edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSource *source;
-	AddressbookSourceDialog *sdialog;
-
-	source = gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row);
-
-	sdialog = addressbook_config_source (source, dialog->dialog);
-	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->uri);
-		gtk_clist_set_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row, source);
-		gnome_property_box_changed (GNOME_PROPERTY_BOX (dialog->dialog));
-		update_sensitivity (dialog);
-	}
-
-	addressbook_source_dialog_destroy (sdialog);
-}
-
-static void
-delete_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	gtk_clist_remove (GTK_CLIST (dialog->clistSources), dialog->source_row);
-	dialog->source_row = -1;
-	gnome_property_box_changed (GNOME_PROPERTY_BOX(dialog->dialog));
-	update_sensitivity (dialog);
-}
-
-static void
-sources_select_row (GtkWidget *widget, gint row, gint column,
-		    GdkEventButton *event, AddressbookDialog *dialog)
-{
-	dialog->source_row = row;
-
-	update_sensitivity (dialog);
-}
-
-static void
-addressbook_dialog_apply (GnomePropertyBox *property_box, gint page_num, AddressbookDialog *dialog)
-{
-	int i;
-
-	if (page_num != -1)
-		return;
-
-	addressbook_storage_clear_sources();
-
-	for (i = 0; i < GTK_CLIST(dialog->clistSources)->rows; i ++) {
-		AddressbookSource *source = (AddressbookSource*)gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), i);
-		addressbook_storage_add_source (addressbook_source_copy (source));
-	}
-
-	addressbook_storage_write_sources();
-}
-
-static void
-addressbook_dialog_close (GnomePropertyBox *property_box, AddressbookDialog *dialog)
-{
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-	g_free (dialog);
-}
-
-void
-addressbook_config (GNOME_Evolution_Shell shell)
-{
-	AddressbookDialog *dialog;
-	GladeXML *gui;
-	GtkWidget *clist;
-	GList *l;
-
-	dialog = g_new0 (AddressbookDialog, 1);
-
-	dialog->source_row = -1;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/addressbook-config.glade", NULL);
-	dialog->gui = gui;
-	dialog->shell = shell;
-
-	dialog->dialog = glade_xml_get_widget (gui, "dialog");
-
-	clist = glade_xml_get_widget (gui, "clistSources");
-	dialog->clistSources = clist;
-	
-	gtk_clist_column_titles_passive (GTK_CLIST (clist));
-	gtk_clist_set_column_width (GTK_CLIST (clist), 0, 80);
-
-	dialog->addSource = glade_xml_get_widget (gui, "addSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->addSource), "clicked",
-			    GTK_SIGNAL_FUNC (add_source_clicked),
-			    dialog);
-
-	dialog->editSource = glade_xml_get_widget (gui, "editSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->editSource), "clicked",
-			    GTK_SIGNAL_FUNC (edit_source_clicked),
-			    dialog);
-
-	dialog->deleteSource = glade_xml_get_widget (gui, "deleteSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->deleteSource), "clicked",
-			    GTK_SIGNAL_FUNC (delete_source_clicked),
-			    dialog);
-
-	update_sensitivity (dialog);
-
-	l = addressbook_storage_get_sources ();
-	for (; l != NULL; l = l->next) {
-		AddressbookSource *source;
-		gint row;
-		gchar *text[2];
-
-		source = addressbook_source_copy ((AddressbookSource*)l->data);
-
-		text[0] = source->name;
-		text[1] = source->uri;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(clist), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(clist), row, source, (GtkDestroyNotify) addressbook_source_free);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (clist), "select_row",
-			    GTK_SIGNAL_FUNC (sources_select_row),
-			    dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->dialog), "apply",
-			    addressbook_dialog_apply, dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->dialog), "destroy",
-			    addressbook_dialog_close, dialog);
-
-	gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 300, 350);
-
-	gtk_widget_show (dialog->dialog);
-}
diff --git a/addressbook/gui/component/addressbook-config.glade b/addressbook/gui/component/addressbook-config.glade
deleted file mode 100644
index c327cc04cc..0000000000
--- a/addressbook/gui/component/addressbook-config.glade
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <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>GnomePropertyBox</class>
-  <name>dialog</name>
-  <width>460</width>
-  <height>360</height>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomePropertyBox:notebook</child_name>
-    <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>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-
-      <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>GtkCList</class>
-	  <name>clistSources</name>
-	  <can_focus>True</can_focus>
-	  <columns>2</columns>
-	  <column_widths>80,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>label10</name>
-	    <label>Name</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>label11</name>
-	    <label>URI</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>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>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label8</name>
-      <label>Addressbook Sources</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>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index 95635b8918..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,31 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "addressbook-storage.h"
-
-void addressbook_config (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 b4012f4223..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,82 +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 <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-
-#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"));
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-	
-	init_corba (&argc, argv);
-
-	
-	init_bonobo (argc, argv);
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_address_widget_factory_init ();
-	e_address_popup_factory_init ();
-
-	e_cursors_init();
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	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 7ef8b74fcc..0000000000
--- a/addressbook/gui/component/addressbook-storage.c
+++ /dev/null
@@ -1,583 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-/* The ldap server file goes like this:
-
-   <?xml version="1.0"?>
-   <addressbooks>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <description>This is my company address book.</description>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-	   <authmethod>simple</authmethod>
-	   <binddn>cn=Chris Toshok,dc=helixcode,dc=com</binddn>
-	   <rememberpass/>
-     </contactserver>
-     <contactfile>
-           <name>On Disk Contacts</name>
-	   <description>This is one of my private contact dbs.</description>
-           <path>/home/toshok/contacts/work-contacts.db</path>
-     </contactfile>
-   </addressbooks>
-
-   FIXME: Do we want to use a namespace for this?
-   FIXME: Do we want to have an internationalized description?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <glib.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-object.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 "evolution-storage.h"
-
-#include "addressbook-storage.h"
-
-#define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"
-
-static gboolean load_source_data (const char *file_path);
-static gboolean save_source_data (const char *file_path);
-static void register_storage(void);
-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_strdup_printf ("%s/" ADDRESSBOOK_SOURCES_XML, evolution_homedir);
-	load_source_data (storage_path);
-}
-
-static void 
-register_storage() 
-{
-	EvolutionStorageResult result;
-
-	if (storage == NULL) {
-		storage = evolution_storage_new (_("Other Contacts"), NULL, 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;
-		}
-	}
-}
-
-static void 
-deregister_storage() 
-{
-	if (evolution_storage_deregister_on_shell(storage, corba_shell) != 
-	    EVOLUTION_STORAGE_OK) {
-		g_warning("couldn't deregister storage");
-	}
-
-	storage = NULL;
-}
-
-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 char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		return "simple";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE;
-	else
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-}
-
-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 "";
-	}
-}
-
-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;
-}
-
-void
-addressbook_storage_init_source_uri (AddressbookSource *source)
-{
-	if (source->uri)
-		g_free (source->uri);
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP)
-		source->uri = g_strdup_printf  ("ldap://%s:%s/%s??%s",
-						source->ldap.host, source->ldap.port,
-						source->ldap.rootdn, ldap_unparse_scope(source->ldap.scope));
-	else
-		source->uri = g_strdup_printf ("file://%s",
-					       source->file.path);
-}
-
-static gboolean
-load_source_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
-	register_storage();
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* check to see if a ldapserver.xml.new file is
-                   there.  if it is, rename it and run with it */
-		char *new_path = g_strdup_printf ("%s.new", file_path);
-		struct stat sb;
-
-		if (stat (new_path, &sb) == 0) {
-			int rv;
-
-			rv = rename (new_path, file_path);
-			g_free (new_path);
-
-			if (0 > rv) {
-				g_error ("Failed to rename %s: %s\n",
-					 ADDRESSBOOK_SOURCES_XML,
-					 strerror(errno));
-				return FALSE;
-			}
-			else {
-				goto tryagain;
-			}
-		}
-
-		g_free (new_path);
-		return TRUE;
-	}
-
-	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->type        = ADDRESSBOOK_SOURCE_LDAP;
-			source->ldap.port   = get_string_value (child, "port");
-			source->ldap.host   = get_string_value (child, "host");
-			source->ldap.rootdn = get_string_value (child, "rootdn");
-			source->ldap.scope  = ldap_parse_scope (get_string_value (child, "scope"));
-			source->ldap.auth   = ldap_parse_auth (get_string_value (child, "authmethod"));
-			source->ldap.binddn = get_string_value (child, "binddn");
-		}
-		else if (!strcmp (child->name, "contactfile")) {
-			source->type        = ADDRESSBOOK_SOURCE_FILE;
-			source->file.path = get_string_value (child, "path");
-		}
-		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,
-					      "contacts", source->uri,
-					      source->description, FALSE);
-
-		sources = g_list_append (sources, source);
-
-		g_free (path);
-	}
-
-	if (g_list_length(sources) == 0) {
-		deregister_storage();
-	}
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-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->ldap.port);
-	xmlNewChild (source_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) source->ldap.host);
-	xmlNewChild (source_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) source->ldap.rootdn);
-	xmlNewChild (source_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) ldap_unparse_scope(source->ldap.scope));
-	xmlNewChild (source_root, NULL, (xmlChar *) "authmethod",
-		     (xmlChar *) ldap_unparse_auth(source->ldap.auth));
-	if (source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-		xmlNewChild (source_root, NULL, (xmlChar *) "binddn",
-			     (xmlChar *) source->ldap.binddn);
-		if (source->ldap.remember_passwd)
-			xmlNewChild (source_root, NULL, (xmlChar *) "rememberpass",
-				     NULL);
-	}
-}
-
-static void
-file_source_foreach (AddressbookSource *source, xmlNode *root)
-{
-	xmlNode *source_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactfile");
-
-	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 *) "path",
-		     (xmlChar *) source->file.path);
-}
-
-static void
-source_foreach(gpointer value, gpointer user_data)
-{
-	AddressbookSource *source = value;
-	xmlNode *root = user_data;
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP)
-		ldap_source_foreach(source, root);
-	else
-		file_source_foreach(source, root);
-}
-
-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, 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", ADDRESSBOOK_SOURCES_XML);
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new %s: %s\n", ADDRESSBOOK_SOURCES_XML, strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename %s: %s\n", ADDRESSBOOK_SOURCES_XML, 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 */
-	register_storage();
-	path = g_strdup_printf ("/%s", source->name);
-	evolution_storage_new_folder (storage, path, source->name, "contacts",
-				      source->uri, source->description, FALSE);
-
-	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);
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP) {
-		g_free (source->ldap.host);
-		g_free (source->ldap.port);
-		g_free (source->ldap.rootdn);
-		g_free (source->ldap.binddn);
-	} else {
-		g_free (source->file.path);
-	}
-
-	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 ()
-{
-	g_list_foreach (sources, (GFunc)addressbook_source_foreach, NULL);
-	g_list_free (sources);
-	deregister_storage();
-	sources = NULL;
-}
-
-void
-addressbook_storage_write_sources ()
-{
-	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->type = source->type;
-	copy->uri = g_strdup (source->uri);
-
-	if (copy->type == ADDRESSBOOK_SOURCE_LDAP) {
-		copy->ldap.host = g_strdup (source->ldap.host);
-		copy->ldap.port = g_strdup (source->ldap.port);
-		copy->ldap.rootdn = g_strdup (source->ldap.rootdn);
-		copy->ldap.scope = source->ldap.scope;
-		copy->ldap.auth = source->ldap.auth;
-		copy->ldap.binddn = g_strdup (source->ldap.binddn);
-		copy->ldap.remember_passwd = source->ldap.remember_passwd;
-	}
-	else {
-		copy->file.path = g_strdup (source->file.path);
-	}
-	return copy;
-}
diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
deleted file mode 100644
index f2a1910e13..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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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"
-
-typedef enum {
-	ADDRESSBOOK_SOURCE_LDAP,
-	ADDRESSBOOK_SOURCE_FILE,
-	ADDRESSBOOK_SOURCE_LAST
-} AddressbookSourceType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE,
-	ADDRESSBOOK_LDAP_AUTH_LAST
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef struct {
-	AddressbookSourceType type;
-	char *name;
-	char *description;
-	struct {
-		char *path;
-	} file;
-	struct {
-		char *host;
-		char *port;
-		char *rootdn;
-		AddressbookLDAPScopeType scope;
-		AddressbookLDAPAuthType auth;
-		char *binddn;                   /* used in AUTH_SIMPLE */
-		gboolean remember_passwd;
-	} ldap;
-	char *uri; /* filled in from the above */
-} AddressbookSource;
-
-void addressbook_storage_setup (EvolutionShellComponent *shell_component,
-				const char *evolution_homedir);
-
-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);
-
-#endif /* __ADDRESSBOOK_STORAGE_H__ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index cb52b6fd5d..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,751 +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 <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "select-names/e-select-names.h"
-#include "select-names/e-select-names-manager.h"
-
-#include "evolution-shell-component-utils.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook-config.h"
-#include "addressbook.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 <widgets/misc/e-search-bar.h>
-#include <widgets/misc/e-filter-bar.h>
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	EAddressbookView *view;
-	ESearchBar *search;
-	GtkWidget *vbox;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-	char *passwd;
-} AddressbookView;
-
-static void
-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-
-	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;
-
-	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
-config_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	addressbook_config (NULL /* XXX */);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-	g_assert (E_IS_BOOK (book));
-
-	gtk_widget_show(e_addressbook_search_dialog_new(book));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_print(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_stop(view->view);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_cut(view->view);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_copy(view->view);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	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;
-	e_addressbook_view_select_all (view->view);
-}
-
-static void
-update_command_state (EAddressbookView *eav, AddressbookView *view)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (view->control);
-
-	/* 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);
-
-	/* Print Contact */
-	bonobo_ui_component_set_prop (uic,
-				      "/commands/ContactsPrint",
-				      "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);
-
-	
-	/* Stop */
-	bonobo_ui_component_set_prop (uic,
-				      "/commands/ContactStop",
-				      "sensitive",
-				      e_addressbook_view_can_stop (view->view) ? "1" : "0", NULL);
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-}
-
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("AddressbookConfig", config_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_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/New/NewFirstItem/ContactNew", "evolution-contacts-mini.png"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"),
-	E_PIXMAP ("/menu/Tools/Component/AddressbookConfig", "configure_16_addressbook.xpm"),
-
-	E_PIXMAP ("/Toolbar/ContactNew", "new_contact.xpm"),
-	E_PIXMAP ("/Toolbar/ContactNewList", "all_contacts.xpm"),
-
-	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);
-
-	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);
-	else {
-		bonobo_ui_component_unset_container (uic);
-		e_addressbook_view_discard_menus (view->view);
-	}
-}
-
-static void
-addressbook_view_free(AddressbookView *view)
-{
-	EBook *book;
-	
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-	if (view->uri)
-		gtk_object_unref (GTK_OBJECT (book));
-	
-	if (view->properties)
-		bonobo_object_unref(BONOBO_OBJECT(view->properties));
-	g_free(view->passwd);
-	g_free(view->uri);
-	g_free(view);
-}
-
-static void
-book_auth_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 {
-		/* pop up a nice dialog, or redo the authentication
-                   bit some number of times. */
-	}
-}
-
-static void
-passwd_cb (gchar *string, gpointer data)
-{
-	AddressbookView *view = (AddressbookView*)data;
-
-	view->passwd = g_strdup (string);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookView *view = closure;
-	AddressbookSource *source;
-	source = addressbook_storage_get_source_by_uri (view->uri);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		/* check if the addressbook needs authentication */
-
-		if (source &&
-		    source->type == ADDRESSBOOK_SOURCE_LDAP &&
-		    source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			int button;
-			char *msg = g_strdup_printf (_("Enter password for %s"), source->ldap.binddn);
-			/* give a password prompt for the binddn */
-			GtkWidget *dialog = gnome_request_dialog (TRUE, msg, NULL,
-								  0, passwd_cb, view, NULL); 
-			
-			button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-			if (button == 0 && *(view->passwd)) {
-				e_book_authenticate_user (book, source->ldap.binddn, view->passwd,
-							  book_auth_cb, closure);
-				memset (view->passwd, 0, strlen (view->passwd)); /* clear out the passwd */
-				g_free (view->passwd);
-				view->passwd = NULL;
-				return;
-			}
-		}
-
-
-		/* if they either didn't configure the source to use
-                   authentication, or they canceled the dialog,
-                   proceed without authenticating */
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-
-	} else {
-		GtkWidget *warning_dialog, *label;
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-
-		if (source->type == ADDRESSBOOK_SOURCE_LDAP) {
-#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->type == ADDRESSBOOK_SOURCE_LDAP) {
-			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;
-	addressbook_view_free(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);
-	}
-}
-
-char *
-addressbook_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
-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 = addressbook_expand_uri (view->uri);
-
-		if (! e_book_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
-
-		g_free(uri_data);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-static ESearchBarItem addressbook_search_menu_items[] = {
-	E_FILTERBAR_RESET,
-	{ NULL, 0 },
-	E_FILTERBAR_ADVANCED,
-	{ NULL, -1 }
-};
-
-static void
-addressbook_menu_activated (ESearchBar *esb, int id, AddressbookView *view)
-{
-	EBook *book;
-	switch (id) {
-	case E_FILTERBAR_RESET_ID:
-		e_addressbook_view_show_all(view->view);
-		break;
-	case E_FILTERBAR_ADVANCED_ID:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		g_assert (E_IS_BOOK (book));
-
-		gtk_widget_show(e_addressbook_search_dialog_new(book));
-		break;
-	}
-}
-
-enum {
-	ESB_ANY,
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-	ESB_CATEGORY,
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Any field contains"), ESB_ANY },
-	{ N_("Name contains"), ESB_FULL_NAME },
-	{ N_("Email contains"), ESB_EMAIL },
-	{ N_("Category contains"), ESB_CATEGORY },
-	{ NULL, -1 }
-};
-
-static void
-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
-{
-	char *search_word, *search_query;
-	int search_type;
-
-	gtk_object_get(GTK_OBJECT(esb),
-		       "text", &search_word,
-		       "option_choice", &search_type,
-		       NULL);
-
-	if (search_word && strlen (search_word)) {
-		switch (search_type) {
-		case ESB_ANY:
-			search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")",
-							search_word);
-			break;
-		case ESB_FULL_NAME:
-			search_query = g_strdup_printf ("(contains \"full_name\" \"%s\")",
-							search_word);
-			break;
-		case ESB_EMAIL:
-			search_query = g_strdup_printf ("(contains \"email\" \"%s\")",
-							search_word);
-			break;
-		case ESB_CATEGORY:
-			search_query = g_strdup_printf ("(contains \"category\" \"%s\")",
-							search_word);
-			break;
-		default:
-			search_query = g_strdup ("(contains \"full_name\" \"\")");
-			break;
-		}
-	} else
-		search_query = g_strdup ("(contains \"full_name\" \"\")");
-
-	gtk_object_set (GTK_OBJECT(view->view),
-			"query", search_query,
-			NULL);
-
-	g_free (search_query);
-	g_free (search_word);
-}
-
-static 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)
-{
-	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;
-	}
-
-	if (message == NULL || message[0] == 0) {
-		GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
-	}
-	else {
-		GNOME_Evolution_ShellView_setMessage (shell_view_interface,
-						      message,
-						      e_addressbook_view_can_stop (view->view), &ev);
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 1);
-
-	view->vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	gtk_container_set_border_width(GTK_CONTAINER(view->vbox), GNOME_PAD_SMALL);
-
-	gtk_signal_connect( GTK_OBJECT( view->vbox ), "destroy",
-			    GTK_SIGNAL_FUNC( destroy_callback ),
-			    ( gpointer ) view );
-
-	/* Create the control. */
-	view->control = bonobo_control_new(view->vbox);
-
-	view->search = E_SEARCH_BAR(e_search_bar_new(addressbook_search_menu_items,
-						     addressbook_search_option_items));
-	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
-			    FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (view->search), "query_changed",
-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);
-	gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
-
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-	gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view),
-			   TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show( view->vbox );
-	gtk_widget_show( GTK_WIDGET(view->view) );
-	gtk_widget_show( GTK_WIDGET(view->search) );
-
-	view->properties = bonobo_property_bag_new (get_prop, set_prop, view);
-
-	bonobo_property_bag_add (
-		view->properties, PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,
-		BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);
-
-	bonobo_control_set_properties (view->control,
-					 view->properties);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "status_message",
-			    GTK_SIGNAL_FUNC(set_status_message),
-			    view);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "command_state_change",
-			    GTK_SIGNAL_FUNC(update_command_state),
-			    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 717b40e150..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-
-/* expand file:///foo/foo/ to file:///foo/foo/addressbook.db */
-char *         addressbook_expand_uri           (const char *uri);
-
-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 c291e95009..0000000000
--- a/addressbook/gui/component/e-address-popup.c
+++ /dev/null
@@ -1,1196 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "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, gpointer closure)
-{
-	ECard *card = E_CARD (closure);
-
-	if (book) {
-		e_book_commit_card (book, card, NULL, NULL);
-	}
-	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)
-{
-	e_book_use_local_address_book (email_table_save_card_cb, 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_destroy (GtkObject *obj)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (obj);
-
-	if (pop->card)
-		gtk_object_unref (GTK_OBJECT (pop->card));
-
-	if (pop->scheduled_refresh)
-		gtk_idle_remove (pop->scheduled_refresh);
-
-	g_free (pop->name);
-	g_free (pop->email);
-
-	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_idle_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_idle_add (refresh_idle_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);
-	}
-
-	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
-contact_editor_cb (EBook *book, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-	EContactEditor *ce = e_addressbook_show_contact_editor (book, pop->card, FALSE, TRUE);
-	e_contact_editor_raise (ce);	
-}
-
-static void
-edit_contact_info_cb (EAddressPopup *pop)
-{
-	e_book_use_local_address_book (contact_editor_cb, pop);
-	gtk_widget_destroy (GTK_WIDGET (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);
-
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (pop));
-}
-
-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);
-
-	gtk_widget_destroy (GTK_WIDGET (pop));
-	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, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-
-	if (pop->query_tag)
-		e_book_simple_query_cancel (book, pop->query_tag);
-
-	pop->query_tag = e_book_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
-}
-
-static void
-e_address_popup_query (EAddressPopup *pop)
-{
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	e_book_use_local_address_book (start_query, 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;
-	GtkWidget *w;
-
-	w = e_address_popup_new ();
-	control = bonobo_control_new (w);
-	gtk_widget_show (w);
-
-	gtk_signal_connect_object (GTK_OBJECT (w),
-				   "destroy",
-				   GTK_SIGNAL_FUNC (bonobo_object_unref),
-				   GTK_OBJECT (control));
-
-        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));
-
-        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 9cfde6cb28..0000000000
--- a/addressbook/gui/component/e-address-popup.h
+++ /dev/null
@@ -1,85 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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-card.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;
-	guint query_tag;
-	gboolean multiple_matches;
-	ECard *card;
-};
-
-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 2f81c70b36..0000000000
--- a/addressbook/gui/component/e-address-widget.c
+++ /dev/null
@@ -1,577 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 8cf425d5c9..0000000000
--- a/addressbook/gui/component/e-address-widget.h
+++ /dev/null
@@ -1,103 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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 dfdafeda58..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@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_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) {
-			gtk_object_ref(GTK_OBJECT(cards[i]));
-			model->data[model->data_count++] = e_card_simple_new (cards[i]);
-			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-		}
-	}
-}
-
-void
-e_cardlist_model_remove(ECardlistModel *model,
-			const char *id)
-{
-	int i;
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-e_cardlist_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-	
-	object_class->destroy = e_cardlist_model_destroy;
-
-	model_class->column_count = e_cardlist_model_col_count;
-	model_class->row_count = e_cardlist_model_row_count;
-	model_class->value_at = e_cardlist_model_value_at;
-	model_class->set_value_at = e_cardlist_model_set_value_at;
-	model_class->is_cell_editable = e_cardlist_model_is_cell_editable;
-	model_class->duplicate_value = e_cardlist_model_duplicate_value;
-	model_class->free_value = e_cardlist_model_free_value;
-	model_class->initialize_value = e_cardlist_model_initialize_value;
-	model_class->value_is_empty = e_cardlist_model_value_is_empty;
-	model_class->value_to_string = e_cardlist_model_value_to_string;
-}
-
-static void
-e_cardlist_model_init (GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	model->data = NULL;
-	model->data_count = 0;
-}
-
-ECard *
-e_cardlist_model_get(ECardlistModel *model,
-		     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-GtkType
-e_cardlist_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardlistModel",
-			sizeof (ECardlistModel),
-			sizeof (ECardlistModelClass),
-			(GtkClassInitFunc) e_cardlist_model_class_init,
-			(GtkObjectInitFunc) e_cardlist_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_cardlist_model_new (void)
-{
-	ECardlistModel *et;
-
-	et = gtk_type_new (e_cardlist_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
deleted file mode 100644
index 0b9a7a2265..0000000000
--- a/addressbook/gui/component/e-cardlist-model.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CARDLIST_MODEL_H_
-#define _E_CARDLIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-card-simple.h>
-
-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())
-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))
-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))
-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))
-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	ECardSimple **data;
-	int data_count;
-} ECardlistModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} ECardlistModelClass;
-
-
-GtkType e_cardlist_model_get_type (void);
-ETableModel *e_cardlist_model_new (void);
-
-/* Returns object with an extra ref count. */
-ECard *e_cardlist_model_get  (ECardlistModel  *model,
-			      int              row);
-void e_cardlist_model_add    (ECardlistModel  *model,
-			      ECard          **card,
-			      int              count);
-void e_cardlist_model_remove (ECardlistModel  *model,
-			      const char      *id);
-
-#endif /* _E_CARDLIST_MODEL_H_ */
diff --git a/addressbook/gui/component/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 244799deb2..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-
-	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 5c7b37794b..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\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-lib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	e-select-names-bonobo.c			\
-	e-select-names-bonobo.h			\
-	e-select-names-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
-
-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 428826f7fe..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,380 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <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"
-
-
-
-#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_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;
-	char *text;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ESelectNamesTextModel *text_model;
-			ESelectNamesModel *model;
-
-			gtk_object_get(GTK_OBJECT(w),
-				       "model", &text_model,
-				       NULL);
-			gtk_object_get(GTK_OBJECT(text_model),
-				       "source", &model,
-				       NULL);
-			text = e_select_names_model_export_destinationv (model);
-			BONOBO_ARG_SET_STRING (arg, text);
-			g_free (text);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       CORBA_Environment *ev,
-		       gpointer user_data)
-{
-	GtkWidget *widget;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ENTRY_PROPERTY_ID_TEXT:
-		e_entry_set_text (E_ENTRY (widget), BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		gtk_object_set_data (GTK_OBJECT (widget), "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 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, "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;
-
-	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
-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
-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);
-
-	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 49043e1756..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((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 2590a8515b..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,1156 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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>
-
-
-struct _ESelectNamesCompletionPrivate {
-
-	ESelectNamesModel *model;
-
-	EBook *book;
-	gboolean book_ready;
-	gboolean cancelled;
-
-	guint book_view_tag;
-	EBookView *book_view;
-
-	gchar *waiting_query;
-	gint waiting_pos, waiting_limit;
-	gchar *query_text;
-
-	gchar *cached_query_text;
-	GList *cached_cards;
-
-	gboolean primary_only;
-};
-
-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_begin  (ECompletion *, const gchar *txt, gint pos, gint limit);
-static void e_select_names_completion_end    (ECompletion *);
-static void e_select_names_completion_cancel (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 = g_new0 (ECompletionMatch, 1);
-	ECard *card = e_destination_get_card (dest);
-
-	e_completion_match_construct (match);
-
-	e_completion_match_set_text (match, e_destination_get_name (dest), menu_form);
-	match->sort_major = card ? floor (e_card_get_use_score (card)) : 0;
-	match->score = score;
-	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;
-}
-
-static void
-emailify_match (ECompletionMatch *match)
-{
-	EDestination *dest = E_DESTINATION (match->user_data);
-	ECard *card = e_destination_get_card (dest);
-	const gchar *email = e_destination_get_email (dest);
-	const gchar *menu_txt = e_completion_match_get_menu_text (match);
-	
-	if (card && card->email && e_list_length (card->email) > 1 && !e_card_evolution_list (card)) {
-		
-		if (email && strstr (menu_txt, email) == NULL) {
-			gchar *tmp = g_strdup_printf ("%s <%s>", menu_txt, email);
-			e_completion_match_set_text (match,
-						     e_completion_match_get_match_text (match),
-						     tmp);
-			g_free (tmp);
-		}
-
-		match->sort_minor = e_destination_get_email_num (dest);
-	}
-}
-
-/*
- * Nickname query
- */
-
-static gchar *
-sexp_nickname (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp->priv->query_text);
-
-}
-
-static ECompletionMatch *
-match_nickname (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *match = NULL;
-	gint len = strlen (comp->priv->query_text);
-	ECard *card = e_destination_get_card (dest);
-	double score;
-
-	if (card->nickname
-	    && !g_utf8_strncasecmp (comp->priv->query_text, card->nickname, len)) {
-		ECompletionMatch *match = g_new0 (ECompletionMatch, 1);
-		gchar *name = e_card_name_to_string (card->name);
-		gchar *str;
-		
-		score = len * 10; /* nickname gives 10 points per matching character */
-		str = g_strdup_printf ("(%s) %s", card->nickname, name);
-
-		match = make_match (dest, str, score);
-		g_free (name);
-		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);
-	ECard *card = e_destination_get_card (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 *name, *str;
-		
-		score = len * 2; /* 2 points for each matching character */
-
-		name = e_card_name_to_string (card->name);
-		if (name && *name)
-			str = g_strdup_printf ("<%s> %s", email, name);
-		else
-			str = g_strdup (email);
-
-		match = make_match (dest, str, score);
-
-		g_free (name);
-		g_free (str);
-
-		return match;
-	}
-
-	return NULL;
-}
-
-/*
- * Name Query
- */
-
-static gchar *
-sexp_name (ESelectNamesCompletion *comp)
-{
-	if (comp && comp->priv->query_text && *comp->priv->query_text) {
-		gchar *cpy = g_strdup (comp->priv->query_text);
-		gchar **strv;
-		gchar *query;
-		gint i, count=0;
-
-		strv = g_strsplit (cpy, " ", 0);
-		for (i=0; strv[i]; ++i) {
-			++count;
-			g_strstrip (strv[i]);
-			strv[i] = g_strdup_printf ("(contains \"full_name\" \"%s\")", strv[i]);
-		}
-
-		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);
-		}
-
-		for (i=0; strv[i]; ++i)
-			g_free (strv[i]);
-		g_free (cpy);
-		g_free (strv);
-
-
-		return query;
-	}
-
-	return NULL;
-}
-
-enum {
-	MATCHED_NOTHING = 0,
-	MATCHED_GIVEN_NAME  = 1<<0,
-	MATCHED_ADDITIONAL_NAME = 1<<1,
-	MATCHED_FAMILY_NAME   = 1<<2
-};
-
-/*
-  Match text against every substring in fragment that follows whitespace.
-  This allows the fragment "de Icaza" to match against txt "ica".
-*/
-static gboolean
-match_name_fragment (const gchar *fragment, const gchar *txt)
-{
-	gint len = strlen (txt);
-
-	while (*fragment) {
-		if (!g_utf8_strncasecmp (fragment, txt, len))
-			return TRUE;
-
-		while (*fragment && !isspace ((gint) *fragment))
-			++fragment;
-		while (*fragment && isspace ((gint) *fragment))
-			++fragment;
-	}
-
-	return FALSE;
-}
-
-static ECompletionMatch *
-match_name (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *final_match = NULL;
-	gchar *menu_text = NULL;
-	ECard *card;
-	gchar *cpy, **strv;
-	gint len, i, match_len = 0;
-	gint match = 0, first_match = 0;
-	double score = 0;
-	gboolean have_given, have_additional, have_family;
-
-	card = e_destination_get_card (dest);
-	
-	if (card->name == NULL)
-		return NULL;
-
-	cpy = g_strdup (comp->priv->query_text);
-	strv = g_strsplit (cpy, " ", 0);
-	
-	for (i=0; strv[i] && !(match & MATCHED_NOTHING); ++i) {
-		gint this_match = 0;
-
-		g_strstrip (strv[i]);
-		len = strlen (strv[i]);
-
-		if (card->name->given
-		    && *card->name->given
-		    && !(match & MATCHED_GIVEN_NAME)
-		    && match_name_fragment (card->name->given, strv[i])) {
-
-			this_match = MATCHED_GIVEN_NAME;
-
-		}
-		else if (card->name->additional
-			 && *card->name->additional
-			 && !(match & MATCHED_ADDITIONAL_NAME)
-			 && match_name_fragment (card->name->additional, strv[i])) {
-
-			this_match = MATCHED_ADDITIONAL_NAME;
-
-		} else if (card->name->family
-			   && *card->name->family
-			   && !(match & MATCHED_FAMILY_NAME)
-			   && match_name_fragment (card->name->family, strv[i])) {
-			
-			this_match = MATCHED_FAMILY_NAME;
-		}
-
-
-		if (this_match != MATCHED_NOTHING) {
-			match_len += len;
-			match |= this_match;
-			if (first_match == 0)
-				first_match = this_match;
-		} else {
-			match = first_match = 0;
-			break;
-		}
-
-	}
-	
-	score = match_len * 3; /* three points per match character */
-
-	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;
-	}
-
-	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 (first_match != MATCHED_NOTHING && e_card_evolution_list (card)) {
-
-		menu_text = e_card_name_to_string (card->name);
-
-	} else if (first_match == MATCHED_GIVEN_NAME) {
-
-		if (have_family)
-			menu_text = g_strdup_printf ("%s %s", card->name->given, card->name->family);
-		else
-			menu_text = g_strdup_printf (card->name->given);
-
-	} else if (first_match == MATCHED_ADDITIONAL_NAME) {
-
-		if (have_family) {
-			
-			menu_text = g_strdup_printf ("%s, %s%s%s",
-						     card->name->family,
-						     have_given ? card->name->given : "",
-						     have_given ? " " : "",
-						     card->name->additional);
-
-		} else {
-
-			menu_text = g_strdup_printf ("%s%s%s",
-						     have_given ? card->name->given : "",
-						     have_given ?  " " : "",
-						     card->name->additional);
-
-		}
-
-	} else if (first_match == MATCHED_FAMILY_NAME) {
-
-		if (have_given)
-			menu_text = g_strdup_printf ("%s, %s %s",
-						     card->name->family,
-						     card->name->given,
-						     have_additional ? card->name->additional : "");
-		else
-			menu_text = g_strdup_printf (card->name->family);
-	}
-
-	if (menu_text) {
-		final_match = make_match (dest, menu_text, score);
-		g_free (menu_text);
-	}
-	
-	return final_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 },
-	{ 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 (comp && E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), 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);
-				}
-			}
-		}
-	}
-
-	if (best_match)
-		emailify_match (best_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)) {
-
-			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->begin_completion = e_select_names_completion_begin;
-	completion_class->end_completion = e_select_names_completion_end;
-	completion_class->cancel_completion = e_select_names_completion_cancel;
-
-	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);
-}
-
-static void
-e_select_names_completion_destroy (GtkObject *object)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);
-
-	if (comp->priv->model)
-		gtk_object_unref (GTK_OBJECT (comp->priv->model));
-
-	if (comp->priv->book)
-		gtk_object_unref (GTK_OBJECT (comp->priv->book));
-
-	if (comp->priv->book_view)
-		gtk_object_unref (GTK_OBJECT (comp->priv->book_view));
-	
-	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';
-
-	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;
-
-	if (status != E_BOOK_STATUS_SUCCESS)
-		return;
-
-	comp = E_SELECT_NAMES_COMPLETION (user_data);
-
-	comp->priv->cancelled = FALSE;
-	
-	comp->priv->book_view_tag = 0;
-	
-	comp->priv->book_view = view;
-	gtk_object_ref (GTK_OBJECT (view));
-
-	gtk_signal_connect (GTK_OBJECT (view),
-			    "card_added",
-			    GTK_SIGNAL_FUNC (e_select_names_completion_card_added_cb),
-			    comp);
-	gtk_signal_connect (GTK_OBJECT (view),
-			    "sequence_complete",
-			    GTK_SIGNAL_FUNC (e_select_names_completion_seq_complete_cb),
-			    comp);
-}
-
-static void
-e_select_names_completion_card_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (user_data);
-
-	if (! comp->priv->cancelled)
-		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)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (user_data);
-
-	gtk_object_unref (GTK_OBJECT (comp->priv->book_view));
-
-	comp->priv->book_view = NULL;
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	if (out)
-		fprintf (out, "ending search ");
-	if (out && !e_completion_searching (E_COMPLETION (comp)))
-		fprintf (out, "while not searching!");
-	if (out)
-		fprintf (out, "\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)
-{
-	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;
-
-	if (comp->priv->book_view_tag) {
-		if (out)
-			fprintf (out, "cancelled book view creation\n");
-		e_book_cancel (comp->priv->book, comp->priv->book_view_tag);
-		comp->priv->book_view_tag = 0;
-	}
-
-	if (comp->priv->book_view) {
-		if (out)
-			fprintf (out, "unrefed book view\n");
-		gtk_object_unref (GTK_OBJECT (comp->priv->book_view));
-		comp->priv->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->book_ready) {
-		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);
-
-		sexp = book_query_sexp (comp);
-		if (sexp && *sexp) {
-
-			if (out)
-				fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text);
-
-			comp->priv->book_view_tag = e_book_get_book_view (comp->priv->book, sexp, 
-									  e_select_names_completion_got_book_view_cb, comp);
-
-			if (! comp->priv->book_view_tag)
-				g_warning ("Exception calling e_book_get_book_view");
-
-		} else {
-			g_free (comp->priv->query_text);
-		}
-		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;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	query_is_still_running = comp->priv->book_view_tag || comp->priv->book_view;
-	clean = clean_query_text (query_text);
-
-	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
-				  && (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);
-		comp->priv->cancelled = FALSE;
-		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 } },
-	{ 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_begin (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->model, pos, &index, NULL, NULL);
-	str = index >= 0 ? e_select_names_model_get_string (selcomp->priv->model, 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
-e_select_names_completion_cancel (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	E_SELECT_NAMES_COMPLETION (comp)->priv->cancelled = TRUE;
-	
-	if (out)
-		fprintf (out, "completion cancelled\n");
-}
-
-static void
-e_select_names_completion_book_ready (EBook *book, EBookStatus status, ESelectNamesCompletion *comp)
-{
-	comp->priv->book_ready = TRUE;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	/* 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->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, ESelectNamesModel *model)
-{
-	ESelectNamesCompletion *comp;
-
-	g_return_val_if_fail (book == NULL || E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (model, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	comp = (ESelectNamesCompletion *) gtk_type_new (e_select_names_completion_get_type ());
-
-	if (book == NULL) {
-
-		comp->priv->book = e_book_new ();
-		gtk_object_ref (GTK_OBJECT (comp->priv->book));
-		gtk_object_sink (GTK_OBJECT (comp->priv->book));
-
-		comp->priv->book_ready = FALSE;
-		gtk_object_ref (GTK_OBJECT (comp)); /* ref ourself before our async call */
-		e_book_load_local_address_book (comp->priv->book, (EBookCallback) e_select_names_completion_book_ready, comp);
-
-	} else {
-		comp->priv->book = book;
-		gtk_object_ref (GTK_OBJECT (comp->priv->book));
-		comp->priv->book_ready = TRUE;
-	}
-		
-	comp->priv->model = model;
-	gtk_object_ref (GTK_OBJECT (model));
-
-	return E_COMPLETION (comp);
-}
-
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 1f3de5ea3d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ /dev/null
@@ -1,65 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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-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 *, ESelectNamesModel *);
-
-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 7f65110c2a..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,59 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 dbdec8a182..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index b255942d08..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,510 +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 <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>
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_select_names_manager_signals[LAST_SIGNAL] = { 0 };
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-	ESelectNamesManager *manager;
-	guint changed_handler;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_destroy (GtkObject *object);
-static void e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-/**
- * e_select_names_manager_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesManager class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesManager class.
- **/
-GtkType
-e_select_names_manager_get_type (void)
-{
-	static GtkType manager_type = 0;
-
-	if (!manager_type) {
-		GtkTypeInfo manager_info = {
-			"ESelectNamesManager",
-			sizeof (ESelectNamesManager),
-			sizeof (ESelectNamesManagerClass),
-			(GtkClassInitFunc) e_select_names_manager_class_init,
-			(GtkObjectInitFunc) e_select_names_manager_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		manager_type = gtk_type_unique (gtk_object_get_type (), &manager_info);
-	}
-
-	return manager_type;
-}
-
-/**
- * e_select_names_manager_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesManager that wraps the @VCard.
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));
-	return manager;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesManager::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_select_names_manager_destroy;
-	object_class->get_arg = e_select_names_manager_get_arg;
-	object_class->set_arg = e_select_names_manager_set_arg;
-
-	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);
-	gtk_object_class_add_signals (object_class, e_select_names_manager_signals, LAST_SIGNAL);
-}
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	gtk_object_unref(GTK_OBJECT(manager->sections));
-	gtk_object_unref(GTK_OBJECT(manager->entries));
-}
-
-
-/* Set_arg handler for the manager */
-static void
-e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the manager */
-static void
-e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void *
-section_copy(const void *sec, void *data)
-{
-	const ESelectNamesManagerSection *section = sec;
-	ESelectNamesManagerSection *newsec;
-
-	static void section_model_changed_cb (ESelectNamesModel *, gpointer);
-
-	newsec = g_new(ESelectNamesManagerSection, 1);
-	newsec->id = g_strdup(section->id);
-	newsec->title = g_strdup(section->title);
-	newsec->model = section->model;
-	newsec->manager = section->manager;
-	newsec->changed_handler = gtk_signal_connect (GTK_OBJECT (newsec->model),
-						      "changed",
-						      GTK_SIGNAL_FUNC (section_model_changed_cb),
-						      newsec);
-
-	if (newsec->model)
-		gtk_object_ref(GTK_OBJECT(newsec->model));
-	return newsec;
-}
-
-static void
-section_free(void *sec, void *data)
-{
-	ESelectNamesManagerSection *section = sec;
-	if (section->manager && section->changed_handler) {
-		gtk_signal_disconnect (GTK_OBJECT (section->model), section->changed_handler);
-	}
-	g_free(section->id);
-	g_free(section->title);
-	if (section->model)
-		gtk_object_unref(GTK_OBJECT(section->model));
-	g_free(section);
-}
-
-static void *
-entry_copy(const void *ent, void *data)
-{
-	const ESelectNamesManagerEntry *entry = ent;
-	ESelectNamesManagerEntry *newent;
-	
-	newent = g_new(ESelectNamesManagerEntry, 1);
-	newent->id = g_strdup(entry->id);
-	newent->entry = entry->entry;
-	if (newent->entry)
-		gtk_object_ref(GTK_OBJECT(newent->entry));
-	return newent;
-}
-
-static void
-entry_free(void *ent, void *data)
-{
-	ESelectNamesManagerEntry *entry = ent;
-	g_free(entry->id);
-	if (entry->entry)
-		gtk_object_unref(GTK_OBJECT(entry->entry));
-	g_free(entry);
-}
-
-/**
- * e_select_names_manager_init:
- */
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = e_list_new(section_copy, section_free, manager);
-	manager->entries  = e_list_new(entry_copy, entry_free, manager);
-}
-
-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 void
-section_model_working_copy_changed_cb (ESelectNamesModel *model, gpointer closure)
-{
-	ESelectNamesManagerSection *section = closure;
-	gtk_signal_emit (GTK_OBJECT (section->manager),
-			 e_select_names_manager_signals[CHANGED],
-			 section->id,
-			 TRUE);
-}
-
-void
-e_select_names_manager_add_section (ESelectNamesManager *manager,
-				    const char *id,
-				    const char *title)
-{
-	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;
-	
-	section = g_new(ESelectNamesManagerSection, 1);
-	section->id = g_strdup(id);
-	section->title = g_strdup(title);
-
-	section->model = e_select_names_model_new();
-	e_select_names_model_set_limit (section->model, limit);
-
-	section->manager = manager;
-
-	section->changed_handler = gtk_signal_connect (GTK_OBJECT (section->model),
-						       "changed",
-						       GTK_SIGNAL_FUNC (section_model_changed_cb),
-						       section);
-
-	e_list_append(manager->sections, section);
-	section_free(section, manager);
-}
-
-ESelectNamesModel *
-e_select_names_manager_get_source (ESelectNamesManager *manager, const char *id)
-{
-	EIterator *iterator;
-
-	g_return_val_if_fail (manager && E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id, NULL);
-
-	iterator = e_list_get_iterator (manager->sections);
-	for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get (iterator);
-		if (!strcmp (section->id, id)) {
-			return section->model;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-entry_destroyed(EEntry *entry, ESelectNamesManager *manager)
-{
-	if(!GTK_OBJECT_DESTROYED(manager)) {
-		EIterator *iterator = e_list_get_iterator(manager->entries);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerEntry *this_entry = e_iterator_get(iterator);
-			if(entry == this_entry->entry) {
-				e_iterator_delete(iterator);
-				break;
-			}
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(manager));
-}
-
-static void
-completion_handler (EEntry *entry, ECompletionMatch *match)
-{
-	ESelectNamesModel *snm;
-	EDestination *dest;
-	gint i, pos, start_pos, len;
-
-	if (match == NULL || match->user_data == NULL)
-		return;
-
-
-	snm = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (entry), "select_names_model"));
-	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));
-
-	pos = e_entry_get_position (entry);
-	e_select_names_model_text_pos (snm, pos, &i, NULL, NULL);
-	e_select_names_model_replace (snm, i, dest);
-	e_select_names_model_name_pos (snm, i, &start_pos, &len);
-	e_entry_set_position (entry, start_pos+len);
-}
-
-static void
-popup_cb (EEntry *entry, GdkEventButton *ev, gint pos, ESelectNamesModel *model)
-{
-	e_select_names_popup (model, ev, pos);
-}
-
-GtkWidget *
-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)
-{
-	ETextModel *model;
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-			EEntry *eentry;
-			ECompletion *comp;
-
-			eentry = E_ENTRY (e_entry_new ());
-			gtk_object_set_data (GTK_OBJECT (eentry), "select_names_model", section->model);
-
-			gtk_signal_connect (GTK_OBJECT (eentry),
-					    "popup",
-					    GTK_SIGNAL_FUNC (popup_cb),
-					    section->model);
-
-			entry = g_new (ESelectNamesManagerEntry, 1);
-			entry->entry = eentry;
-			entry->id = (char *)id;
-
-			model = e_select_names_text_model_new (section->model);
-			e_list_append (manager->entries, entry);
-			g_free(entry);
-
-			comp = e_select_names_completion_new (NULL, section->model); /* NULL == use local addressbook */
-			e_entry_enable_completion_full (eentry, comp, 50, completion_handler);
-
-			gtk_object_set(GTK_OBJECT(eentry),
-				       "model", model,
-				       "editable", TRUE,
-				       "use_ellipsis", TRUE,
-				       "allow_newlines", FALSE,
-				       NULL);
-			gtk_signal_connect(GTK_OBJECT(eentry), "destroy",
-					   GTK_SIGNAL_FUNC(entry_destroyed), manager);
-			gtk_object_ref(GTK_OBJECT(manager));
-			return GTK_WIDGET(eentry);
-		}
-	}
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	switch(button) {
-	case 0: {
-		EList *list = manager->sections;
-		EIterator *iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerSection *section = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, section->id);
-			e_select_names_model_overwrite_copy (section->model, source);
-			gtk_object_unref (GTK_OBJECT (source));
-			
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-#if 0
-		list = manager->entries;
-		iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerEntry *entry = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, entry->id);
-			if (source) {
-				ETextModel *model = e_select_names_text_model_new(source);
-				if (model) {
-					gtk_object_set(GTK_OBJECT(entry->entry),
-						       "model", model,
-						       NULL);
-					gtk_object_unref(GTK_OBJECT(source));
-				}
-				gtk_object_unref(GTK_OBJECT(model));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-#endif
-		break;
-	}
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-void
-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					const char *id)
-{
-	EIterator *iterator;
-	
-	if (manager->names) {
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		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 {
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		iterator = e_list_get_iterator(manager->sections);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section->model);
-			e_select_names_add_section(manager->names, section->id, section->title, newmodel);
-			gtk_signal_connect (GTK_OBJECT (newmodel),
-					    "changed",
-					    GTK_SIGNAL_FUNC (section_model_working_copy_changed_cb),
-					    (gpointer)section); /* casting out const to avoid compiler warning */
-			gtk_object_unref(GTK_OBJECT(newmodel));
-		}
-		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));
-	}
-}
-
-#if 0
-/* Of type ECard */
-EList *
-e_select_names_manager_get_cards (ESelectNamesManager *manager,
-				  const char *id)
-{
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			return e_select_names_model_get_cards(section->model);
-		}
-	}
-	return NULL;
-}
-#endif
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 61779fb56a..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,66 +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;
-	
-	EList *sections;
-	EList *entries;
-
-	ESelectNames *names;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesManager *, const gchar *section_id, gint changed_working_copy);
-};
-
-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);
-
-#if 0
-/* Of type ECard */
-EList               *e_select_names_manager_get_cards              (ESelectNamesManager *manager,
-							            const char *id);
-#endif
-
-/* 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 dc383994d3..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,694 +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 SEPARATOR ", "
-#define SEPLEN    2
-
-
-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 */
-	gchar *text;
-	gchar *addr_text;
-
-	gint limit;
-};
-
-
-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->text);
-	g_free (model->priv->addr_text);
-
-	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)
-{
-	g_free (model->priv->text);
-	model->priv->text = NULL;
-	
-	g_free (model->priv->addr_text);
-	model->priv->addr_text = NULL;
-
-	gtk_signal_emit (GTK_OBJECT(model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-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));
-		model->priv->data = g_list_append (model->priv->data, dup);
-	}
-
-	model->priv->limit = old->priv->limit;
-
-	return model;
-}
-
-const gchar *
-e_select_names_model_get_textification (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->text == NULL) {
-
-		if (model->priv->data == NULL) {
-			
-			model->priv->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);
-			}
-
-			model->priv->text = g_strjoinv (SEPARATOR, strv);
-			
-			g_free (strv);
-		}
-	}
-
-	return model->priv->text;
-}
-
-const gchar *
-e_select_names_model_get_address_text (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->addr_text == NULL) {
-
-		if (model->priv->data == NULL) {
-
-			model->priv->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);
-			}
-
-			model->priv->addr_text = g_strjoinv (SEPARATOR, strv);
-
-			g_free (strv);
-		}
-	}
-
-	return model->priv->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) : "";
-}
-
-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;
-	}
-
-	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;
-	}
-
-	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) {
-
-		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) {
-
-			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;
-
-	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);
-	gtk_object_unref (GTK_OBJECT (node->data));
-
-	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)
-{
-	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);
-		dest = iter->data ? E_DESTINATION (iter->data) : NULL;
-
-		if (dest == NULL || e_destination_is_empty (dest)) {
-			if (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);
-}
-
-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, (GFunc) gtk_object_unref, NULL);
-	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_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length)
-{
-	gint rp = 0, i, len = 0;
-	GList *iter;
-	const gchar *str;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	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 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 (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	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 = 1;
-		++i;
-
-		iter = g_list_next (iter);
-	}
-
-	if (i != 0)
-		++sp; /* 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;
-}
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 b11e9503ec..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,76 +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);
-
-const gchar  *e_select_names_model_get_textification (ESelectNamesModel *model);
-const gchar  *e_select_names_model_get_address_text  (ESelectNamesModel *model);
-
-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);
-
-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_clean      (ESelectNamesModel *model);
-
-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length);
-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint pos, gint *index, gint *start_pos, gint *length);
-
-#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 aa668884c2..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ /dev/null
@@ -1,396 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <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 {
-	ESelectNamesModel *model;
-	const EDestination *dest;
-	gint pos;
-	gint index;
-};
-
-static PopupInfo *
-popup_info_new (ESelectNamesModel *model, const EDestination *dest, gint pos, gint index)
-{
-	PopupInfo *info = g_new0 (PopupInfo, 1);
-	info->model = model;
-	info->dest = dest;
-	info->pos = pos;
-	info->index = index;
-
-	if (model)
-		gtk_object_ref (GTK_OBJECT (model));
-
-	if (dest)
-		gtk_object_ref (GTK_OBJECT (dest));
-
-	return info;
-}
-
-static void
-popup_info_free (PopupInfo *info)
-{
-	if (info) {
-		
-		if (info->model)
-			gtk_object_unref (GTK_OBJECT (info->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);
-		EContactEditor *ce;
-		ECard *card;
-
-		card = (ECard *) e_destination_get_card (dest);
-		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->model, info->index, dest);
-
-	}
-}
-
-static void
-remove_recipient_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete (info->model, 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->model);
-}
-
-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);
-
-}
-
-#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;
-
-	/*
-	 * Build up our GnomeUIInfo array.
-	 */
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-	memset (radioinfo, 0, sizeof (radioinfo));
-
-	card = e_destination_get_card (info->dest);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = (gchar *) e_destination_get_name (info->dest); 
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	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].type = GNOME_APP_UI_ITEM;
-				radioinfo[j].label = label;
-				radioinfo[j].moreinfo = change_email_num_cb;
-				++j;
-			}
-		}
-
-		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 = (gchar *) e_destination_get_email (info->dest);
-		++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);
-
-	if (using_radio) {
-		gint n = e_destination_get_email_num (info->dest);
-		gint j;
-		for (j=0; radioinfo[j].type != GNOME_APP_UI_ENDOFINFO; ++j) {
-			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);
-		}
-	}
-
-	init_html_mail (&(uiinfo[html_toggle]), info);
-
-	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));
-
-	str = e_destination_get_name (info->dest);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = (gchar *) str;
-	++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);
-	
-	return pop;
-}
-
-void
-e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos)
-{
-	GtkWidget *popup;
-	PopupInfo *info;
-	const EDestination *dest;
-	ECard *card;
-	gint index;
-
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (ev);
-	g_return_if_fail (0 <= pos);
-
-	e_select_names_model_text_pos (model, pos, &index, NULL, NULL);
-	if (index < 0 || index >= e_select_names_model_count (model))
-		return;
-
-	dest = e_select_names_model_get_destination (model, index);
-	card = e_destination_get_card (dest);
-
-	info = popup_info_new (model, dest, pos, index);
-
-	popup = card ? popup_menu_card (info) : 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 cc93534181..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.h
+++ /dev/null
@@ -1,36 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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-model.h"
-
-void e_select_names_popup (ESelectNamesModel *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 fee84ce071..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,344 +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 {
-				model->data[i].name =  g_strdup (e_destination_get_name (dest));
-				model->data[i].email = g_strdup (e_destination_get_email (dest));
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	int i;
-	for (i = 0; i < model->count; i++) {
-		g_free(model->data[i].name);
-		g_free(model->data[i].email);
-	}
-	g_free(model->data);
-	model->data = NULL;
-	model->count = -1;
-}
-
-/*
- * ESelectNamesTableModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_table_model_destroy (GtkObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_select_names_table_model_row_count (ETableModel *etc)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->count == -1) {
-		if (e_select_names_table_model->source) {
-			fill_in_info(e_select_names_table_model);
-		} else {
-			return 0;
-		}
-	}
-	return e_select_names_table_model->count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->data == NULL) {
-		fill_in_info(e_select_names_table_model);
-	}
-	switch (col) {
-	case 0:
-		if (e_select_names_table_model->data[row].name == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].name;
-		break;
-	case 1:
-		if (e_select_names_table_model->data[row].email == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].email;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_table_model_init:
- */
-static void
-e_select_names_table_model_init (ESelectNamesTableModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-
-	model->count = -1;
-	model->data = NULL;
-}
-
-static void
-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_table_model_destroy;
-	object_class->get_arg = e_select_names_table_model_get_arg;
-	object_class->set_arg = e_select_names_table_model_set_arg;
-
-	table_model_class->column_count = e_select_names_table_model_col_count;
-	table_model_class->row_count = e_select_names_table_model_row_count;
-	table_model_class->value_at = e_select_names_table_model_value_at;
-	table_model_class->set_value_at = e_select_names_table_model_set_value_at;
-	table_model_class->is_cell_editable = e_select_names_table_model_is_cell_editable;
-	table_model_class->duplicate_value = e_select_names_table_model_duplicate_value;
-	table_model_class->free_value = e_select_names_table_model_free_value;
-	table_model_class->initialize_value = e_select_names_table_model_initialize_value;
-	table_model_class->value_is_empty = e_select_names_table_model_value_is_empty;
-	table_model_class->value_to_string = e_select_names_table_model_value_to_string;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
deleted file mode 100644
index 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 0183fdd236..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,723 +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 */
-
-#define SEPLEN 2
-
-/* 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);
-
-
-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)
-{
-}
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-	
-	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;
-
-	e_select_names_model_name_pos (source, 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
-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 (e_text_model_changed),
-								      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;
-}
-
-static const gchar *
-e_select_names_text_model_get_text (ETextModel *model)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	return snm ? e_select_names_model_get_textification (snm->source) : "";
-}
-
-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)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));
-
-	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)));
-
-	/* 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);
-
-	/* 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;
-
-		if (out) 
-			fprintf (out, "processing [%c]\n", text[i]);
-
-		e_select_names_model_text_pos (source, 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] == ',' && index >= 0) { /* Is this a quoted or an unquoted comma 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] == ',' && !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 = SEPLEN;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-					pos += 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_string (d1, str1);
-				e_destination_set_string (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 = SEPLEN;
-				e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				pos += SEPLEN;
-			}
-
-		} 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" */
-						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 = e_destination_new ();
-				e_destination_set_string (dest, new_str);
-
-				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 (E_SELECT_NAMES_TEXT_MODEL (model));
-
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-}
-
-
-static void
-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint index, start_pos, text_len, offset;
-		
-	if (out) {
-		const gchar *str = e_select_names_model_get_textification (source);
-		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;
-
-	e_select_names_model_text_pos (source, 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", str1, 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_string (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 = SEPLEN - 1;
-
-			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 + SEPLEN;
-		
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			length -= text_len + 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 = e_destination_new ();
-			e_destination_set_string (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 = SEPLEN;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-		}
-	}
-
- finished:
-	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)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	const gchar *txt;
-	gint i, pos;
-
-	i = nth_obj_index (source, n);
-	if (i < 0)
-		return NULL;
-	
-	e_select_names_model_name_pos (source, i, &pos,  len);
-	if (pos < 0)
-		return NULL;
-	
-	txt = e_select_names_model_get_textification (source);
-	return txt + 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);
-	
-	/* present read-only contact editor when someone double clicks from here */
-	contact_editor = e_addressbook_show_contact_editor (NULL, 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 7a9e0a7396..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,45 +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;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_text_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
deleted file mode 100644
index 9340bbce48..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,801 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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/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 <shell/evolution-shell-client.h>
-
-#include "e-select-names.h"
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include "e-select-names-table-model.h"
-#include <gal/widgets/e-categories-master-list-combo.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 GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char              *title;
-	ETableModel       *model;
-	ESelectNamesModel *source;
-	ESelectNames      *names;
-	GtkWidget         *label;
-} ESelectNamesChild;
-
-GtkType
-e_select_names_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"ESelectNames",
-			sizeof (ESelectNames),
-			sizeof (ESelectNamesClass),
-			(GtkClassInitFunc) e_select_names_class_init,
-			(GtkObjectInitFunc) e_select_names_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_class_init (ESelectNamesClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = e_select_names_set_arg;
-	object_class->get_arg = e_select_names_get_arg;
-	object_class->destroy = e_select_names_destroy;
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"%d\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-        	<grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);
-
-static void
-set_book(EBook *book, EBookStatus status, EAddressbookModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-	gtk_object_unref(GTK_OBJECT(model));
-}
-
-static void
-addressbook_model_set_uri(EAddressbookModel *model, char *uri)
-{
-	EBook *book;
-	book = e_book_new();
-	gtk_object_ref(GTK_OBJECT(model));
-	e_book_load_uri(book, uri, (EBookCallback) set_book, model);
-}
-
-static void
-real_add_address_cb (int model_row,
-		     gpointer closure)
-{
-	ESelectNamesChild *child = closure;
-	ESelectNames *names = child->names;
-	ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(names->model), model_row);
-	EDestination *dest = e_destination_new ();
-
-	e_destination_set_card (dest, card, 0);
-
-	e_select_names_model_append (child->source, dest);
-	e_select_names_model_clean (child->source);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-real_add_address(ESelectNames *names, ESelectNamesChild *child)
-{
-	e_table_selected_row_foreach(e_table_scrolled_get_table(names->table),
-				     real_add_address_cb, child);
-}
-
-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);
-	}
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *adapter;
-	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(model, uri);
-
-	g_free(uri);
-	g_free(filename);
-
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-
-	spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
-	table = e_table_scrolled_new (adapter, NULL, spec, NULL);
-	g_free(spec);
-
-	gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter);
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-
-	return table;
-}
-
-typedef struct {
-	char *description;
-	char *display_name;
-	char *physical_uri;
-
-} ESelectNamesFolder;
-
-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->physical_uri);
-	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");
-	gchar *uri;
-
-	uri = g_strdup_printf ("%s/addressbook.db", e_folder->physical_uri);
-	addressbook_model_set_uri(e_select_names->model, uri);
-	g_free (uri);
-}
-
-typedef struct {
-	ESelectNames *names;
-	GtkWidget *menu;
-} 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;
-
-	nnm = user_data;
-	e_folder = value;
-	menu = nnm->menu;
-	e_select_names = nnm->names;
-
-	item = gtk_menu_item_new_with_label (e_folder->display_name);
-	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);
-}
-
-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;
-
-		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")) {
-		ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);
-		e_folder->description  = g_strdup(folder->description );
-		e_folder->display_name = g_strdup(folder->display_name);
-		e_folder->physical_uri = g_strdup(folder->physical_uri);
-		g_hash_table_insert(e_select_names->folders,
-				    g_strdup(path), e_folder);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-update_folder   (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 const char *display_name,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder = g_hash_table_lookup(e_select_names->folders, path);
-	if (e_folder) {
-		g_free(e_folder->display_name);
-		e_folder->display_name = g_strdup(e_folder->display_name);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-removed_folder  (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder;
-	char *orig_path;
-
-	if (g_hash_table_lookup_extended(e_select_names->folders, path, (void **) &orig_path, (void **) &e_folder)) {
-		g_hash_table_remove(e_select_names->folders, path);
-		e_select_names_folder_free(e_folder);
-		g_free(orig_path);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-update_query (GtkWidget *button, ESelectNames *e_select_names)
-{
-	char *category = "";
-	char *search = "";
-	char *query;
-	char *q_array[4];
-	int i;
-	if (e_select_names->categories_entry) {
-		category = gtk_entry_get_text (GTK_ENTRY (e_select_names->categories_entry));
-	}
-	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 ("(contains \"x-evolution-any-field\" \"%s\")", 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
-e_select_names_hookup_shell_listener (ESelectNames *e_select_names)
-{
-	GNOME_Evolution_Storage storage;
-	GNOME_Evolution_StorageListener listener;
-	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->listener = evolution_storage_listener_new();
-
-	listener = evolution_storage_listener_corba_objref(e_select_names->listener);
-
-	/* 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;
-
-		oh_shit = gnome_error_dialog (_("Unable to get local storage.  This should never happen."));
-		gtk_widget_show (oh_shit);
-		return;
-	}
-
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "new_folder",
-			   GTK_SIGNAL_FUNC(new_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "update_folder",
-			   GTK_SIGNAL_FUNC(update_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "removed_folder",
-			   GTK_SIGNAL_FUNC(removed_folder), e_select_names);
-
-	GNOME_Evolution_Storage_addListener(storage, listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_select_names_init: Exception adding listener to "
-			   "remote GNOME_Evolution_Storage interface.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	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;
-	}
-
-	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 *combo;
-
-	ecml = e_categories_master_list_wombat_new ();
-	combo = e_categories_master_list_combo_new (ecml);
-	gtk_object_unref (GTK_OBJECT (ecml));
-
-	return combo;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);
-	e_select_names->gui = gui;
-
-	e_select_names->children = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->child_count = 0;
-	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);
-	
-	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->categories = glade_xml_get_widget (gui, "custom-categories");
-	if (e_select_names->categories && !GTK_IS_COMBO (e_select_names->categories))
-		e_select_names->categories = NULL;
-	if (e_select_names->categories) {
-		e_select_names->categories_entry = GTK_COMBO (e_select_names->categories)->entry;
-	} else
-		e_select_names->categories_entry = NULL;
-	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);
-	if (e_select_names->categories_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->categories_entry), "changed",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-
-	e_select_names->folders = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_select_names_hookup_shell_listener (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);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->model));
-	gtk_object_unref(GTK_OBJECT(child->source));
-	g_free(key);
-}
-
-static void
-e_select_names_destroy (GtkObject *object) {
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-	
-	gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->listener), e_select_names);
-	gtk_object_unref(GTK_OBJECT(e_select_names->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_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);
-}
-
-static void
-remove_address(ETable *table, int row, int col, GdkEvent *event, ESelectNamesChild *child)
-{
-	e_select_names_model_delete (child->source, row);
-}
-
-struct _RightClickData {
-	ETable *table;
-	ESelectNamesChild *child;
-};
-typedef struct _RightClickData RightClickData;
-
-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;
-
-	e_select_names_model_delete (child->source, GPOINTER_TO_INT (row));
-}
-
-static void
-remove_cb (GtkWidget *widget, void *data)
-{
-	RightClickData *rcdata = (RightClickData *)data;
-
-	/* Build a list of selected rows */
-	e_table_selected_row_foreach (rcdata->table,
-				      etable_selection_foreach_cb,
-				      rcdata->child);
-
-	/* Now process the list we made, removing each selected row */
-	g_slist_foreach (selected_rows,
-			 (GFunc)selected_rows_foreach_cb,
-			 rcdata->child);
-
-	/* Free everything we've created */
-	g_free (rcdata);
-	g_slist_free (selected_rows);
-	selected_rows = NULL;
-}
-
-static void
-section_right_click_cb (ETable *table, gint row, gint col, GdkEvent *event, ESelectNamesChild *child)
-{
-	EPopupMenu right_click_menu[] = {
-		{ N_("Remove"), NULL,
-		  GTK_SIGNAL_FUNC (remove_cb), NULL, 0 },
-		{ NULL, NULL, NULL, 0 }
-	};
-
-	RightClickData *rcdata = g_new0 (RightClickData, 1);
-	rcdata->table = table;
-	rcdata->child = child;
-
-	e_popup_menu_run (right_click_menu, event, 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;
-
-	ETableModel *model;
-	GtkWidget *etable;
-
-	if (g_hash_table_lookup(e_select_names->children, id)) {
-		return;
-	}
-
-	table = GTK_TABLE(glade_xml_get_widget (e_select_names->gui, "table-recipients"));
-
-	child = g_new(ESelectNamesChild, 1);
-
-	child->names = e_select_names;
-	child->title = g_strdup(_(name));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-
-	button = gtk_button_new ();
-
-	label_text = g_strconcat (child->title, " ->", NULL);
-	label = gtk_label_new (label_text);
-	g_free (label_text);
-	gtk_container_add (GTK_CONTAINER (button), label);
-	child->label = label;
-
-	gtk_container_add(GTK_CONTAINER(alignment), button);
-	gtk_widget_show_all(alignment);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_clicked), child);
-	gtk_table_attach(table, alignment,
-			 0, 1,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-	
-	model = e_select_names_table_model_new(source);
-	etable = e_table_scrolled_new (model, NULL, SPEC2, NULL);
-	
-	gtk_signal_connect(GTK_OBJECT(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);
-
-	child->model = model;
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->model));
-	gtk_object_ref(GTK_OBJECT(child->source));
-	
-	gtk_widget_show(etable);
-	
-	gtk_table_attach(table, etable,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-}
-
-static void *
-card_copy(const void *value, void *closure)
-{
-	gtk_object_ref(GTK_OBJECT(value));
-	return (void *)value;
-}
-
-static void
-card_free(void *value, void *closure)
-{
-	gtk_object_unref(GTK_OBJECT(value));
-}
-
-EList *
-e_select_names_get_section(ESelectNames *e_select_names, char *id)
-{
-	ESelectNamesChild *child;
-	int i;
-	int rows;
-	EList *list;
-	
-	child = g_hash_table_lookup(e_select_names->children, id);
-	if (!child)
-		return NULL;
-	rows = e_table_model_row_count(child->model);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i);
-		e_list_append(list, card);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-	return list;
-}
-
-ESelectNamesModel *
-e_select_names_get_source(ESelectNames *e_select_names,
-			  char *id)
-{
-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names->children, id);
-	if (child) {
-		if (child->source)
-			gtk_object_ref(GTK_OBJECT(child->source));
-		return child->source;
-	} else
-		return NULL;
-}
-
-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_widget_restore_default_style(child->label);
-	}
-
-	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) {
-			EFont *efont;
-			GdkFont *gdkfont;
-			GtkStyle *style, *oldstyle;
-
-			oldstyle = gtk_widget_get_style(child->label);
-			style = gtk_style_copy(oldstyle);
-
-			efont = e_font_from_gdk_font(style->font);
-			gdkfont = e_font_to_gdk_font(efont, E_FONT_BOLD);
-			e_font_unref(efont);
-
-			gdk_font_ref(gdkfont);
-			gdk_font_unref(style->font);
-			style->font = gdkfont;
-
-			gtk_widget_set_style(child->label, style);
-
-			gtk_style_unref(oldstyle);
-		}
-	}
-}
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 918dbc5794..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,107 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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;
-
-struct _ESelectNames
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *adapter;
-	EAddressbookModel *model;
-	GtkWidget *categories;
-	GtkWidget *categories_entry;
-	GtkWidget *search_entry;
-	EvolutionStorageListener *listener;
-	GHashTable *folders;
-	char *def;
-};
-
-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/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 e15a70b4ad..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Select-names</name>
-  <program_name>select-names</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-top</name>
-  <visible>False</visible>
-  <title>Select Names</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>7</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>table-source</name>
-	<creation_function>e_addressbook_create_ebook_table</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>6</top_attach>
-	  <bottom_attach>7</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-recipients</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>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>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel2</name>
-	  <label>Message Recipients</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkOptionMenu</class>
-	<name>optionmenu-folder</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<items></items>
-	<initial_choice>0</initial_choice>
-	<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>label3</name>
-	<label>Select name from _folder:</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-find</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>label2</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>
-	<focus_target>custom-categories</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>label1</name>
-	<label>_Search</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-find</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>
-	<class>GtkEntry</class>
-	<name>entry-find</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>1</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>
-	<class>Custom</class>
-	<name>custom-categories</name>
-	<can_focus>True</can_focus>
-	<creation_function>e_select_names_create_categories</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Wed, 27 Jun 2001 01:47:01 GMT</last_modification_time>
-	<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>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/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 cfdebf408a..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-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\"
-
-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
-
-# noinst_PROGRAMS =		\
-# 	contact-editor-test
-
-# contact_editor_test_SOURCES = 	\
-# 	test-editor.c
-
-# contact_editor_test_LDADD =					\
-# 	libecontacteditor.a					\
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-# 	$(top_builddir)/addressbook/backend/ebook/libebook.la   \
-# 	$(top_builddir)/e-util/ename/libename.la		\
-# 	$(top_builddir)/libversit/libversit.la			\
-# 	$(GNOMEGNORBA_LIBS)					\
-# 	$(BONOBO_GNOME_LIBS)				\
-# 	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(GNOME_PRINT_LIBS)					\
-#	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	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 a483d57d52..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2334 +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>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <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>
-	  <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>alignment10</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>
-	    <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>
-	  </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>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <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>
-	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <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>_Contacts...</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>_Address...</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>
-
-      <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>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>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>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>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>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-birthday</name>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-assistant</name>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-  </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 1fe9337503..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,243 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS,
-	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 void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	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 ++) {
-			gtk_widget_set_sensitive (glade_xml_get_widget(e_contact_editor_address->gui, entry_names[i]), 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_copy(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 f4031bea2f..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,78 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 cf97854956..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,243 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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"
-
-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_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	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 ++) {
-			gtk_widget_set_sensitive (glade_xml_get_widget(e_contact_editor_fullname->gui,
-								       entry_names[i]),
-						  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_copy(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 82411c0606..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,78 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 322a7ce79b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,2435 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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 <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 "e-util/e-gui-utils.h"
-#include "widgets/misc/e-dateedit.h"
-
-#include "e-card-merging.h"
-
-#include "e-contact-editor.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 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 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_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);
-
-  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;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-
-	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();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-
-	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_free(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
-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->changed) {
-		editor->changed = TRUE;
-		command_state_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-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);
-	}
-
-}
-
-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_free(editor->name);
-		editor->name = e_card_name_copy(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_free(address);
-		}
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_free(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));
-	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");
-	}
-}
-
-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;
-
-	g_free (ecs);
-
-	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);
-	}
-}
-
-static void
-card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	g_free (ecs);
-
-	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);
-	}
-}
-
-/* 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;
-		ecs->should_close = should_close;
-
-		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)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce, FALSE);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-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_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_DELETED],
-			 status, ce->card);
-}
-
-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)
-			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));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce, 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),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-	e_contact_editor->changed = FALSE;
-
-	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, "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);
-
-	/* 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));
-
-	if (e_contact_editor->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-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;
-
-	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_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_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);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, label), TRUE);
-		gtk_widget_set_sensitive (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 */
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-		gtk_widget_set_sensitive (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 */
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "button-fulladdr"), editor->editable);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-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" },
-};
-
-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)
-{
-	gtk_widget_set_sensitive (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 },
-
-	{ "button-fullname", E_CARD_SIMPLE_FIELD_FULL_NAME },
-	{ "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 }
-};
-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 adress button */
-	for (i = 0; i < 4; i ++) {
-		widget_name = g_strdup_printf ("label-phone%d", i+1);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-		widget_name = g_strdup_printf ("entry-phone%d", i+1);
-		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-	}
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-email1"), FALSE);
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "entry-email1"), FALSE);
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), FALSE);
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-address"), FALSE);
-	gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "button-fulladdr"), FALSE);
-	gtk_widget_set_sensitive (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) {
-			gtk_widget_set_sensitive (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)))) {
-			gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-			gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-			gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), TRUE);
-		}
-		else if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_address_to_field(editor->address_choice)))) {
-			gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-			gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "button-fulladdr"), editor->editable);
-			gtk_widget_set_sensitive (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);
-				gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, widget_name), TRUE);
-				g_free (widget_name);
-				widget_name = g_strdup_printf ("entry-phone%d", i+1);
-				gtk_widget_set_sensitive (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 = g_hash_table_lookup (supported_hash,
-							e_card_simple_get_ecard_field (simple,
-										       widget_field_mappings[i].field_id)) != NULL;
-		gtk_widget_set_sensitive (glade_xml_get_widget(editor->gui,
-							       widget_field_mappings[i].widget_name), 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 *label, *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)
-			gtk_widget_set_sensitive (glade_xml_get_widget(editor->gui,
-								       widget_field_mappings[i].widget_name), editor->editable);
-	}
-
-	/* handle the phone dropdown entries */
-	for (i = 0; i < 4; i ++) {
-		label = g_strdup_printf ("label-phone%d", i+1);
-		entry = g_strdup_printf ("entry-phone%d", i+1);
-
-		if (GTK_WIDGET_IS_SENSITIVE (glade_xml_get_widget (editor->gui, label)))
-			gtk_widget_set_sensitive (glade_xml_get_widget(editor->gui,
-								       entry), editor->editable);
-
-		g_free (label);
-		g_free (entry);
-	}
-
-	/* handle the email dropdown entry */
-	label = "label-email1";
-	entry = "entry-email1";
-	if (GTK_WIDGET_IS_SENSITIVE (glade_xml_get_widget (editor->gui, label))) {
-		gtk_widget_set_sensitive (glade_xml_get_widget(editor->gui,
-							       entry), editor->editable);
-		gtk_widget_set_sensitive (glade_xml_get_widget(editor->gui,
-							       "checkbutton-htmlmail"), editor->editable);
-	}
-
-	/* handle the address dropdown entry */
-	label = "label-address";
-	entry = "text-address";
-	if (GTK_WIDGET_IS_SENSITIVE (glade_xml_get_widget (editor->gui, label)))
-		gtk_widget_set_sensitive (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);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (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)
-{
-	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;
-}
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 5f9ac77435..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,134 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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;
-	
-	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;
-
-	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 096f038dd7..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ /dev/null
@@ -1,416 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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/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_message ("freeing %s / %s", qa->name, qa->email);
-			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;
-
-	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;
-
-	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, 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);
-	} else {
-		/* Something went wrong. */
-		if (qa->cb)
-			qa->cb (NULL, qa->closure);
-	}
-	
-	quick_add_unref (qa);
-}
-
-static void
-quick_add_merge_card (QuickAdd *qa)
-{
-	quick_add_ref (qa);
-	e_book_use_local_address_book (merge_cb, 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 *) closure;
-
-	if (qa->cb)
-		qa->cb (qa->card, qa->closure);
-	
-	quick_add_unref (qa);
-}
-
-static void
-editor_closed_cb (GtkWidget *w, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-	g_warning ("editor_closed_cb");
-	quick_add_unref (qa);
-	gtk_object_unref (GTK_OBJECT (w));
-}
-
-static void
-ce_have_book (EBook *book, 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, FALSE /* XXX */);
-
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "card_added",
-				    GTK_SIGNAL_FUNC (card_added_cb),
-				    qa);
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    qa);
-	}
-}
-
-static void
-edit_card (QuickAdd *qa)
-{
-	e_book_use_local_address_book (ce_have_book, 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 *name, const gchar *email,
-		     EContactQuickAddCallback cb, gpointer closure)
-{
-	QuickAdd *qa;
-	GtkWidget *dialog;
-
-	/* We need to have *something* to work with. */
-	if (name == NULL && email == NULL) {
-		if (cb)
-			cb (NULL, closure);
-		return;
-	}
-
-	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);
-}
-
-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 name */
-	if (name && *name)
-		g_strstrip (name);
-
-	/* 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 e01256a163..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ /dev/null
@@ -1,41 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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 0d2b81f2bd..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,100 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <unistd.h>
-#include <fcntl.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
-#include "e-contact-save-as.h"
-
-typedef struct {
-	GtkFileSelection *filesel;
-	char *vcard;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	const char *filename = gtk_file_selection_get_filename (info->filesel);
-
-	e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-
-	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);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->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));
-
-	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));
-}
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 75bd6ce957..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,43 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index 46d1a180b6..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,475 +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>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/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 4842a93bf2..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,145 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 (cardstr), 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 (cardstr), 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 e440fafdac..0000000000
--- a/addressbook/gui/contact-list-editor/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-.deps
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
deleted file mode 100644
index 1164f2c594..0000000000
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-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\"
-
-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 c6f8cab132..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,843 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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 "e-contact-editor.h"
-#include "e-contact-list-editor.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->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;
-
-	g_free (ecs);
-
-	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);
-	}
-}
-
-static void
-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	g_free (ecs);
-
-	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);
-	}
-}
-
-static void
-save_card (EContactListEditor *cle, gboolean should_close)
-{
-	extract_info (cle);
-
-	if (cle->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->cle = cle;
-		ecs->should_close = should_close;
-
-		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);
-	}
-}
-
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	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
-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)
-{
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_DELETED],
-			 status, cle->card);
-}
-
-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)
-			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),
-#if 0
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-#endif
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),
-	BONOBO_UI_VERB_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");
-}
-
-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)
-{
-	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);
-
-	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);
-
-	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)
-{
-	char *target_type;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	if (!strcmp (target_type, VCARD_TYPE)) {
-		GList *card_list = e_card_load_cards_from_string (selection_data->data);
-		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));
-			}
-		}
-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
-		g_list_free (card_list);
-	}
-}
-
-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 6c67fc6468..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,108 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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;
-};
-
-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 b2b929eaa3..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ /dev/null
@@ -1,236 +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)
-{
-	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;
-
-	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;
-
-	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)
-{
-	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;
-
-	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)
-{
-	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 09980ae6ba..0000000000
--- a/addressbook/gui/merging/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index 5a00726f26..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-card-gui\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_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 2008fb7757..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 d18c14f5bf..0000000000
--- a/addressbook/gui/merging/e-card-merging.c
+++ /dev/null
@@ -1,164 +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 d5f3602bbb..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,24 +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)\"		\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeaddressbooksearch.a
-
-libeaddressbooksearch_a_SOURCES =		\
-	e-addressbook-search-dialog.c		\
-	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml
deleted file mode 100644
index 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 5450fb5b73..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,239 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-minicard-view-widget.h"
-
-
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_destroy       (GtkObject *object);
-
-static ECanvasClass *parent_class = NULL;
-
-#define PARENT_TYPE (gnome_dialog_get_type())
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-};
-
-GtkType
-e_addressbook_search_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-	{
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookSearchDialog",
-			sizeof (EAddressbookSearchDialog),
-			sizeof (EAddressbookSearchDialogClass),
-			(GtkClassInitFunc) e_addressbook_search_dialog_class_init,
-			(GtkObjectInitFunc) e_addressbook_search_dialog_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	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->set_arg       = e_addressbook_search_dialog_set_arg;
-	object_class->get_arg       = e_addressbook_search_dialog_get_arg;
-	object_class->destroy       = e_addressbook_search_dialog_destroy;
-}
-
-static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
-{
-	FilterPart *part;
-
-	view->context = rule_context_new();
-	/* FIXME: hide this in a class */
-	rule_context_add_part_set(view->context, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-	view->rule = filter_rule_new();
-	part = rule_context_next_part(view->context, NULL);
-	if (part == NULL) {
-		g_warning("Problem loading search for addressbook no parts to load");
-		return gtk_entry_new();
-	} else {
-		filter_rule_add_part(view->rule, filter_part_clone(part));
-		return filter_rule_get_widget(view->rule, view->context);
-	}
-}
-
-static char *
-get_query (EAddressbookSearchDialog *view)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	filter_rule_build_code(view->rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-button_press (GtkWidget *widget, int button, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	if (button == 0) {
-		query = get_query(dialog);
-		gtk_object_set(GTK_OBJECT(dialog->model),
-			       "query", query,
-			       NULL);
-		g_free(query);
-	}
-	else
-		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);
-
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, FALSE, FALSE, 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);
-
-	view->model = e_addressbook_model_new ();
-	view->adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view->model));
-	view->view = e_minicard_view_widget_new(view->adapter);
-	gtk_widget_show(view->view);
-
-	view->scrolled_window = e_scroll_frame_new(NULL, NULL);
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(view->scrolled_window),
-				  GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
-	
-	gtk_widget_show(view->scrolled_window);
-	
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EBook *book)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	gtk_object_set(GTK_OBJECT(view->model),
-		       "book", book,
-		       NULL);
-	return GTK_WIDGET(view);
-}
-
-static void
-e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set(GTK_OBJECT(emvw->model),
-			       "book", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		gtk_object_get(GTK_OBJECT(emvw->model),
-			       "book", &(GTK_VALUE_OBJECT (*arg)),
-			       NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_destroy (GtkObject *object)
-{
-	EAddressbookSearchDialog *view;
-
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	gtk_object_unref((GtkObject *)view->model);
-	gtk_object_unref((GtkObject *)view->adapter);
-	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 9bc4c6ac18..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,76 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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-model.h"
-#include "addressbook/gui/widgets/e-addressbook-reflow-adapter.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;
-	GtkWidget *view;
-
-	EAddressbookModel *model;
-	EAddressbookReflowAdapter *adapter;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *scrolled_window;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EBook *book);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index 472fd2593f..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index f031b284e5..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,140 +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/ebook	\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_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					\
-#	 $(EXTRA_GNOME_LIBS)				\
-#	 $(BONOBO_GNOME_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				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_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				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
-
-#minicard_view_test_SOURCES = 	\
-#	test-minicard-view.c
-
-#minicard_view_test_LDADD =						\
-#	$(EXTRA_GNOME_LIBS)						\
-#	$(BONOBO_GNOME_LIBS)						\
-#	libeminicard.a							\
-#	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/libversit/libversit.la				\
-#	$(top_builddir)/addressbook/ename/libename.la			\
-#	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-#	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	$(top_builddir)/e-util/libeutil.la
-#
-#minicard_widget_test_SOURCES = 	\
-#	 e-minicard-widget-test.c
-#
-#minicard_widget_test_LDADD =						\
-#	 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	\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = alphabet.glade 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)
diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade
deleted file mode 100644
index dc6ee33966..0000000000
--- a/addressbook/gui/widgets/alphabet.glade
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>alphabet</name>
-  <program_name>alphabet</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window2</name>
-  <visible>False</visible>
-  <title>window2</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkScrolledWindow</class>
-    <name>scrolledwindow-top</name>
-    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-    <widget>
-      <class>GtkViewport</class>
-      <name>viewport1</name>
-      <border_width>4</border_width>
-      <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<width>27</width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-1</name>
-	  <label>123</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-a</name>
-	  <label>a</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-b</name>
-	  <label>b</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-c</name>
-	  <label>c</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-d</name>
-	  <label>d</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-e</name>
-	  <label>e</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-f</name>
-	  <label>f</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-g</name>
-	  <label>g</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-h</name>
-	  <label>h</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-i</name>
-	  <label>i</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-j</name>
-	  <label>j</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-k</name>
-	  <label>k</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-l</name>
-	  <label>l</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-m</name>
-	  <label>m</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-n</name>
-	  <label>n</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-o</name>
-	  <label>o</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-p</name>
-	  <label>p</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-q</name>
-	  <label>q</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-r</name>
-	  <label>r</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-s</name>
-	  <label>s</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-t</name>
-	  <label>t</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-u</name>
-	  <label>u</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-v</name>
-	  <label>v</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-w</name>
-	  <can_focus>True</can_focus>
-	  <label>w</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-x</name>
-	  <label>x</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-y</name>
-	  <label>y</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-z</name>
-	  <label>z</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index a44c066d4f..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,522 +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>
-
-#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,
-	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
-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);
-	int i;
-
-	if (model->get_view_idle)
-		g_source_remove(model->get_view_idle);
-
-	remove_book_view(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));
-	}
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-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 += 256;
-		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);
-}
-
-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);
-			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_object_ref(GTK_OBJECT(model->data[i]));
-				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;
-	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 [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;
-	int i;
-	remove_book_view(model);
-	model->book_view = book_view;
-	if (model->book_view)
-		gtk_object_ref(GTK_OBJECT(model->book_view));
-	model->create_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  model);
-	model->remove_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  model);
-	model->modify_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  model);
-	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);
-
-	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;
-	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);
-			}
-			model->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-	}
-
-	model->get_view_idle = 0;
-	return FALSE;
-}
-
-ECard *
-e_addressbook_model_get_card(EAddressbookModel *model,
-			     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		card = e_card_duplicate (model->data[row]);
-		gtk_object_ref (GTK_OBJECT (card));
-		return card;
-	}
-	return NULL;
-}
-
-static void
-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *model;
-
-	model = E_ADDRESSBOOK_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (model->book) {
-			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) {
-			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);
-	model->search_in_progress = FALSE;
-	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;
-}
-
-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 a0956d7003..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,72 +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 (*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);
-EBook *e_addressbook_model_get_ebook (EAddressbookModel *model);
-
-void     e_addressbook_model_stop      (EAddressbookModel *model);
-gboolean e_addressbook_model_can_stop (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 04f17fd074..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ /dev/null
@@ -1,610 +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 <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 "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,
-};
-
-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;
-}
-
-typedef struct {
-	EAddressbookReflowAdapter *adapter;
-	ESelectionModel *selection;
-} ModelAndSelection;
-
-static void
-model_and_selection_free (ModelAndSelection *mns)
-{
-	gtk_object_unref(GTK_OBJECT(mns->adapter));
-	gtk_object_unref(GTK_OBJECT(mns->selection));
-	g_free(mns);
-}
-
-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_card_list (ModelAndSelection *mns)
-{
-	EAddressbookReflowAdapterPrivate *priv = mns->adapter->priv;
-	GList *list;
-	GList *iterator;
-
-	list = NULL;
-	e_selection_model_foreach (mns->selection, add_to_list, &list);
-
-	for (iterator = list; iterator; iterator = iterator->next) {
-		iterator->data = e_addressbook_model_card_at (priv->model, GPOINTER_TO_INT (iterator->data));
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-static void
-save_as (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_contact_list_save_as (_("Save as VCard"), list);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-send_as (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-send_to (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_TO);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-print (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		gtk_widget_show (e_contact_print_card_list_dialog_new (list));
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-print_envelope (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		gtk_widget_show (e_contact_print_envelope_list_dialog_new (list));
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	d(g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status));
-}
-
-static void
-delete (GtkWidget *widget, ModelAndSelection *mns)
-{
-	EAddressbookReflowAdapterPrivate *priv = mns->adapter->priv;
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list) {
-
-		if (e_contact_editor_confirm_delete(NULL)) { /*FIXME: Give a GtkWindow here. */
-			GList *iterator;
-			EBook *book = e_addressbook_model_get_ebook(priv->model);
-
-			for (iterator = list; iterator; iterator = iterator->next) {
-				ECard *card = iterator->data;
-
-				gtk_object_ref(GTK_OBJECT(card));
-
-				e_book_remove_card (book,
-						    card,
-						    card_changed_cb,
-						    NULL);
-
-				gtk_object_unref(GTK_OBJECT(card));
-			}
-		}
-	}
-
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-gint
-e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, GdkEvent *event, ESelectionModel *selection)
-{
-	ModelAndSelection *mns = g_new(ModelAndSelection, 1);
-	EPopupMenu menu[] = { {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0},
-			      {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			      {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			      {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-			      {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-			      {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
-			      {NULL, NULL, NULL, 0}};
-
-	mns->adapter = adapter;
-	mns->selection = selection;
-	gtk_object_ref(GTK_OBJECT(mns->adapter));
-	gtk_object_ref(GTK_OBJECT(mns->selection));
-	e_popup_menu_run (menu, event, 0, 0, mns);
-	return TRUE;
-}
-
-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 - 2 && 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 strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	}
-	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);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(book);
-		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;
-	}
-	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);
-
-	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, 2, GTK_TYPE_POINTER, 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 1614a65064..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ /dev/null
@@ -1,51 +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);
-gint          e_addressbook_reflow_adapter_right_click  (EAddressbookReflowAdapter *emvm,
-							 GdkEvent           *event,
-							 ESelectionModel    *selection);
-
-#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 3fa92d2300..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,391 +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);
-	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_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)
-{
-	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 9aaa554547..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ /dev/null
@@ -1,131 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-
-#include "e-addressbook-util.h"
-#include "e-card-merging.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_("Canceled"),
-		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);
-}
-
-
-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;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h
deleted file mode 100644
index 1f3ffe074d..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.h
+++ /dev/null
@@ -1,46 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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);
-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);
-
-#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 4f39360045..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,1329 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <libgnomeui/gnome-dialog-util.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"
-
-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 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 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,
-	COMMAND_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;
-
-GtkType
-e_addressbook_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookView",
-			sizeof (EAddressbookView),
-			sizeof (EAddressbookViewClass),
-			(GtkClassInitFunc) e_addressbook_view_class_init,
-			(GtkObjectInitFunc) e_addressbook_view_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_view_class_init (EAddressbookViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	object_class->set_arg = e_addressbook_view_set_arg;
-	object_class->get_arg = e_addressbook_view_get_arg;
-	object_class->destroy = e_addressbook_view_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_TYPE);
-
-	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 [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);
-
-	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),
-			    "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("(contains \"x-evolution-any-field\" \"\")");
-
-	eav->object = NULL;
-	eav->widget = NULL;
-
-	eav->view_collection = NULL;
-	eav->view_menus = 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));
-
-	if (eav->book)
-		gtk_object_unref(GTK_OBJECT(eav->book));
-	g_free(eav->query);
-
-	if (eav->view_collection) {
-		gtk_object_unref (GTK_OBJECT (eav->view_collection));
-		eav->view_collection = 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);
-
-	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
-book_writable_cb (EBook *book, gboolean writable, EAddressbookView *eav)
-{
-	eav->editable = writable;
-	gtk_object_set (GTK_OBJECT (eav->model),
-			"editable", eav->editable,
-			NULL);
-}
-
-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));
-			gtk_signal_connect (GTK_OBJECT (eav->book),
-					    "writable_status",
-					    book_writable_cb, eav);
-		}
-		else
-			eav->book = NULL;
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "book", eav->book,
-			       "editable", eav->editable,
-			       NULL);
-
-		break;
-	case ARG_QUERY:
-		g_free(eav->query);
-		eav->query = g_strdup(GTK_VALUE_STRING(*arg));
-		if (!eav->query)
-			eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "query", eav->query,
-			       NULL);
-		break;
-	case ARG_TYPE:
-		change_view_type(eav, GTK_VALUE_ENUM(*arg));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		if (eav->book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav->book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = eav->query;
-		break;
-	case ARG_TYPE:
-		GTK_VALUE_ENUM (*arg) = eav->view_type;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-
-typedef struct {
-	EAddressbookView *view;
-	char letter;
-} LetterClosure;
-
-static void
-jump_to_letter(GtkWidget *button, LetterClosure *closure)
-{
-	if (closure->view->widget && E_IS_MINICARD_VIEW_WIDGET(closure->view->widget))
-		e_minicard_view_widget_jump_to_letter(E_MINICARD_VIEW_WIDGET(closure->view->widget), closure->letter);
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	g_free(closure);
-}
-
-static void
-connect_button (EAddressbookView *view, GladeXML *gui, char letter)
-{
-	char *name;
-	GtkWidget *button;
-	LetterClosure *closure;
-	name = g_strdup_printf("button-%c", letter);
-	button = glade_xml_get_widget(gui, name);
-	g_free(name);
-	if (!button)
-		return;
-	closure = g_new(LetterClosure, 1);
-	closure->view = view;
-	closure->letter = letter;
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(jump_to_letter), closure);
-	gtk_signal_connect(GTK_OBJECT(button), "destroy",
-			   GTK_SIGNAL_FUNC(free_closure), closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget;
-	char letter;
-	GladeXML *gui = glade_xml_new (EVOLUTION_GLADEDIR "/alphabet.glade", NULL);
-
-	widget = glade_xml_get_widget(gui, "scrolledwindow-top");
-	if (!widget) {
-		return NULL;
-	}
-	
-	connect_button(view, gui, '1');
-	for (letter = 'a'; letter <= 'z'; letter ++) {
-		connect_button(view, gui, letter);
-	}
-	
-	gtk_object_unref(GTK_OBJECT(gui));
-	return widget;
-}
-
-static void
-minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)
-{
-	command_state_change (view);
-}
-
-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);
-
-	gtk_signal_connect(GTK_OBJECT(minicard_view), "selection_change",
-			   GTK_SIGNAL_FUNC(minicard_selection_change), 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);
-	}
-}
-
-typedef struct {
-	EBook *book;
-	ECard *card;
-	EAddressbookView *view;
-	GtkWidget *widget;
-	gpointer closure;
-} CardAndBook;
-
-static void
-card_and_book_free (CardAndBook *card_and_book)
-{
-	gtk_object_unref(GTK_OBJECT(card_and_book->card));
-	gtk_object_unref(GTK_OBJECT(card_and_book->book));
-	gtk_object_unref(GTK_OBJECT(card_and_book->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;
-	ETable *table;
-
-	table = E_TABLE(card_and_book->widget);
-	card_and_book->closure = &list;
-	e_table_selected_row_foreach(table,
-				     get_card_list_1,
-				     card_and_book);
-	return list;
-}
-
-static void
-save_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_contact_save_as(_("Save as VCard"), card_and_book->card);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_to (GtkWidget *widget, CardAndBook *card_and_book)
-
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_TO);
-	card_and_book_free(card_and_book);
-}
-
-static void
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) {
-		GList *list = get_card_list(card_and_book);
-		GList *iterator;
-		for (iterator = list; iterator; iterator = iterator->next) {
-			ECard *card = iterator->data;
-			/* Add the card in the contact editor to our ebook */
-			e_book_remove_card (card_and_book->book,
-					    card,
-					    NULL,
-					    NULL);
-		}
-		e_free_object_list(list);
-	}
-	card_and_book_free(card_and_book);
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EAddressbookModel *model = view->model;
-		CardAndBook *card_and_book;
-
-		EPopupMenu menu[] = {
-			{N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, 
-			{N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			{N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			{N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-			{N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-			{N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
-			{NULL, NULL, NULL, NULL, 0}
-		};
-
-		card_and_book = g_new(CardAndBook, 1);
-		card_and_book->card = e_addressbook_model_get_card(model, row);
-		card_and_book->widget = GTK_WIDGET(table);
-		card_and_book->view = view;
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &(card_and_book->book),
-			       NULL);
-
-		gtk_object_ref(GTK_OBJECT(card_and_book->book));
-		gtk_object_ref(GTK_OBJECT(card_and_book->view));
-
-		e_popup_menu_run (menu, event, 0, 0, card_and_book);
-		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;
-
-	printf ("table_drag_data_get (row %d, col %d)\n", row, col);
-
-	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
-status_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	emit_status_message (eav, status);
-}
-
-static void
-stop_state_changed (GtkObject *object, EAddressbookView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-command_state_change (EAddressbookView *eav)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [COMMAND_STATE_CHANGE]);
-}
-
-#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=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"1\" _title=\"Full Name\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Email\"            expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Primary Phone\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Assistant Phone\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Business Phone\"   expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Callback Phone\"   expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Company Phone\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Home Phone\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Organization\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Business Address\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Home Address\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Mobile Phone\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Car Phone\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"Business Fax\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Home Fax\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Business Phone 2\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"Home Phone 2\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"ISDN\"             expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Other Phone\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Other Fax\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Pager\"            expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Radio\"            expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"Telex\"            expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"TTY\"              expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Other Address\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Email 2\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Email 3\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Web Site\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Department\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Office\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"32\" _title=\"Title\"            expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"33\" _title=\"Profession\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"34\" _title=\"Manager\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"35\" _title=\"Assistant\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"36\" _title=\"Nickname\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"37\" _title=\"Spouse\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"38\" _title=\"Note\"             expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"39\" _title=\"Free-busy URL\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"3\"/>                 \
-    <column source=\"4\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *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))), "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;
-	}
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	EAddressbookView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_TABLE);
-		e_table_set_state_object(e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)), GAL_VIEW_ETABLE(view)->state);
-	} else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);
-	}
-}
-
-void
-e_addressbook_view_setup_menus (EAddressbookView *view,
-				BonoboUIComponent *uic)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	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));
-	g_return_if_fail (view->view_collection == NULL);
-
-	g_assert (view->view_collection == NULL);
-	g_assert (view->view_menus == NULL);
-
-	view->view_collection = gal_view_collection_new();
-
-	galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
-	gal_view_collection_set_storage_directories(view->view_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 (view->view_collection, factory);
-	gtk_object_unref (GTK_OBJECT (factory));
-
-	factory = gal_view_factory_minicard_new ();
-	gal_view_collection_add_factory (view->view_collection, factory);
-	gtk_object_unref (GTK_OBJECT (factory));
-
-	gal_view_collection_load(view->view_collection);
-
-	view->view_menus = gal_view_menus_new(view->view_collection);
-	gal_view_menus_apply(view->view_menus, uic, NULL);
-	gtk_signal_connect(GTK_OBJECT(view->view_collection), "display_view",
-			   display_view, view);
-}
-
-/**
- * e_addressbook_view_discard_menus:
- * @view: An addressbook view.
- * 
- * Makes an addressbook view discard its GAL view menus and its views collection
- * 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_collection);
-
-	g_assert (view->view_collection != NULL);
-	g_assert (view->view_menus != NULL);
-
-	gtk_object_unref (GTK_OBJECT (view->view_collection));
-	view->view_collection = NULL;
-
-	gtk_object_unref (GTK_OBJECT (view->view_menus));
-	view->view_menus = NULL;
-}
-
-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_SELECTION_MODEL(E_TABLE_SCROLLED(view->widget)->table->selection);
-}
-
-
-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);
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	EAddressbookView *view = user_data;
-
-	emit_status_message (view, _("Done."));
-
-	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);
-
-	emit_status_message (view, _("Removing cards..."));
-
-	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 (selection_data->data);
-		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));
-	}
-	list = g_list_reverse (list);
-	return 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)
-{
-	e_addressbook_model_stop (view->model);
-}
-
-gboolean
-e_addressbook_view_can_create (EAddressbookView  *view)
-{
-	return e_addressbook_model_editable (view->model);
-}
-
-gboolean
-e_addressbook_view_can_print (EAddressbookView  *view)
-{
-	ESelectionModel *selection_model;
-
-	if (!e_addressbook_model_editable (view->model))
-		return FALSE;
-
-	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_delete (EAddressbookView  *view)
-{
-	ESelectionModel *selection_model;
-
-	if (!e_addressbook_model_editable (view->model))
-		return FALSE;
-
-	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_cut (EAddressbookView *view)
-{
-	return (e_addressbook_view_can_copy (view) && e_addressbook_model_editable (view->model));
-}
-
-gboolean
-e_addressbook_view_can_copy (EAddressbookView *view)
-{
-	ESelectionModel *selection_model;
-
-	if (!e_addressbook_model_editable (view->model))
-		return FALSE;
-
-	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_paste (EAddressbookView *view)
-{
-	return TRUE;
-}
-
-gboolean
-e_addressbook_view_can_select_all (EAddressbookView *view)
-{
-	return e_addressbook_model_card_count (view->model) != 0;
-}
-
-gboolean
-e_addressbook_view_can_stop (EAddressbookView  *view)
-{
-	return e_addressbook_model_can_stop (view->model);
-}
-
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index 0a594842d8..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,127 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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-collection.h>
-#include "e-addressbook-model.h"
-#include "widgets/menus/gal-view-menus.h"
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EAddressbookView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())
-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))
-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-
-typedef enum {
-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
-	E_ADDRESSBOOK_VIEW_TABLE,
-	E_ADDRESSBOOK_VIEW_MINICARD
-} EAddressbookViewType;
-
-
-typedef struct _EAddressbookView       EAddressbookView;
-typedef struct _EAddressbookViewClass  EAddressbookViewClass;
-
-struct _EAddressbookView
-{
-	GtkTable parent;
-	
-	/* item specific fields */
-	EAddressbookViewType view_type;
-
-	EAddressbookModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_cards;
-
-	EBook *book;
-	char  *query;
-	guint editable : 1;
-
-	GtkObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *vbox;
-
-	/* Menus handler and the view collection */
-	GalViewCollection *view_collection;
-	GalViewMenus *view_menus;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EAddressbookView *view, const gchar *message);
-	void (*command_state_change) (EAddressbookView *view);
-};
-
-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_print             (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);
-
-gboolean   e_addressbook_view_can_create        (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_print         (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);
-
-#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 94f762560f..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,336 +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-card.h>
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "e-card-merging.h"
-
-#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)
-{
-	ECard *card;
-	char *vcard;
-	GtkWidget *minicard = data;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	card = e_card_new(vcard);
-	g_free(vcard);
-	gtk_object_set(GTK_OBJECT(minicard),
-		       "card", card,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	char                *vcard;
-	ECard               *card;
-	EMinicardWidget     *minicard = data;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	gtk_object_get (GTK_OBJECT (minicard),
-			"card", &card,
-			NULL);
-	vcard = e_card_get_vcard(card);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-  GtkWidget *minicard = data;
-  ECard *card;
-  char *vcard;
-  gint length;
-  
-  gtk_object_get (GTK_OBJECT (minicard),
-		  "card", &card, NULL);
-  vcard = e_card_get_vcard(card);
-  length = strlen (vcard);
-  g_free (vcard);
-
-  return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = closure;
-	e_card_merging_book_add_card(book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-save_in_addressbook(GtkWidget *button, EMinicardWidget *minicard)
-{
-	EBook *book;
-	gchar *path, *uri;
-	ECard *card;
-
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	gtk_object_get(GTK_OBJECT(minicard),
-		       "card", &card,
-		       NULL);
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (! e_book_load_uri (book, uri, book_open_cb, card)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	GtkWidget	   *minicard;
-	GtkWidget          *button;
-	GtkWidget          *vbox;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(save_in_addressbook), minicard);
-	gtk_widget_show (button);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard);
-
-#if 0
-	/* Create the properties. */
-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);
-	bonobo_control_set_properties (control, pb);
-
-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,
-				 BONOBO_ARG_BOOLEAN, NULL,
-				 "Whether or not the clock is running", 0);
-#endif
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_minicard_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID: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 cdb16ef68d..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,457 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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 "e-minicard-label.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_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 eed6e1da21..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,85 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 e01ec2cbb0..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,343 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libgnomeui/gnome-canvas-rect-ellipse.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 void selection_change                     (ESelectionModel *esm, EMinicardViewWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE
-};
-
-enum {
-	SELECTION_CHANGE,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_view_widget_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);
-
-	e_minicard_view_widget_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);
-
-	gtk_object_class_add_signals (object_class, e_minicard_view_widget_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;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-	view->rect = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-	view->editable = FALSE;
-}
-
-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;
-	}
-}
-
-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;
-	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
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	view->rect = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color", "white",
-		NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		NULL );
-
-	gtk_object_set(GTK_OBJECT(view->emv),
-		       "adapter", view->adapter,
-		       NULL);
-
-	gtk_signal_connect (GTK_OBJECT (E_REFLOW(view->emv)->selection),
-			    "selection_changed",
-			    selection_change, 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);
-		gnome_canvas_item_set( view->rect,
-				       "x2", (double) width,
-				       "y2", (double) allocation->height,
-				       NULL );
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	gtk_object_get(GTK_OBJECT(view->emv),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-	gnome_canvas_item_set( view->rect,
-			       "x2", (double) width,
-			       "y2", (double) GTK_WIDGET(canvas)->allocation.height,
-			       NULL );	
-}
-
-static void
-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
-{
-	gtk_signal_emit (GTK_OBJECT(widget),
-			 e_minicard_view_widget_signals [SELECTION_CHANGE], widget);
-}
-
-gint
-e_minicard_view_widget_selected_count   (EMinicardViewWidget *view)
-{
-	if (!view->emv)
-		return 0;
-	else
-		return e_selection_model_selected_count (E_REFLOW (view->emv)->selection);
-}
-
-void
-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,
-					EBookCallback  cb,
-					gpointer       closure)
-{
-	if (view->emv)
-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view->emv), cb, closure);
-}
-
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter)
-{
-	if (view->emv)
-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view->emv), letter);
-}
-
-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;
-}
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 61d5912dd5..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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "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 *rect;
-	GnomeCanvasItem *emv;
-
-	EAddressbookReflowAdapter *adapter;
-
-	EBook *book;
-	char *query;
-	guint editable : 1;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-	void         (*selection_change) (EMinicardViewWidget*);
-};
-
-GtkType    e_minicard_view_widget_get_type (void);
-gint       e_minicard_view_widget_selected_count   (EMinicardViewWidget *view);
-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,
-						    EBookCallback  cb,
-						    gpointer       closure);
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter);
-GtkWidget *e_minicard_view_widget_new              (EAddressbookReflowAdapter *adapter);
-
-ESelectionModel *e_minicard_view_widget_get_selection_model (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 4a3925d75b..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,441 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 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;
-}
-
-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));
-}
-
-static GList *
-get_card_list (EAddressbookReflowAdapter *adapter, ESelectionModel *selection)
-{
-	ModelAndList mal;
-
-	mal.adapter = adapter;
-	mal.list = NULL;
-
-	e_selection_model_foreach (selection, add_to_list, &mal);
-
-	mal.list = g_list_reverse (mal.list);
-	return mal.list;
-}
-
-static int
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
-{
-	GdkDragContext *context;
-	GtkTargetList *target_list;
-	GdkDragAction actions = GDK_ACTION_MOVE;
-
-	view->drag_list = get_card_list (adapter, E_REFLOW (view)->selection);
-
-	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
-adapter_changed (EMinicardView *view)
-{
-	char *empty_message;
-
-	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."));
-	gtk_object_set (GTK_OBJECT(view),
-			"empty_message", empty_message,
-			NULL);
-
-	gtk_signal_connect (GTK_OBJECT (view->adapter), "drag_begin",
-			    GTK_SIGNAL_FUNC (e_minicard_view_drag_begin), view);
-
-	g_free (empty_message);
-}
-
-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)
-			gtk_object_unref (GTK_OBJECT(view->adapter));
-		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);
-		break;
-	case ARG_BOOK:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "book", GTK_VALUE_OBJECT (*arg),
-					    NULL);
-		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);
-		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);
-	}
-	gtk_object_unref (GTK_OBJECT (view->adapter));
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-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;
-	default:
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-		else
-			return FALSE;
-		break;
-	}
-}
-
-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_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			return_val = e_addressbook_reflow_adapter_right_click (view->adapter, event, 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));
-}
-
-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);
-}
-
-#if 0
-static int
-compare_to_letter(EMinicard *card, char *letter)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (*letter == '1')
-		return 1;
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return strncasecmp(file_as, letter, 1);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-
-
-void
-e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter)
-{
-#if 0
-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),
-			     (GCompareFunc) compare_to_letter,
-			     &letter);
-#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);
-
-	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;
-}
-
-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;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 5c7065fe1d..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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "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 */
-
-	ESelectionModelSimple *selection;
-
-	GList *drag_list;
-
-	int canvas_destroy_id;
-	int canvas_drag_data_get_id;
-
-	int status_message_id;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowClass parent_class;
-};
-
-GtkType    e_minicard_view_get_type (void);
-void       e_minicard_view_remove_selection (EMinicardView *view,
-					     EBookCallback  cb,
-					     gpointer       closure);
-void       e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter);
-
-#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 603f86b556..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,114 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG: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 1a8912e19d..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,250 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 6daf7f6fa3..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ /dev/null
@@ -1,77 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 6835017a5b..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,937 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "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 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_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::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->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
-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
-			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_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_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)
-{
-	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;
-			if (focus_event->in) {
-				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 (event->button.button == 1) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			e_canvas_item_grab_focus(item, TRUE);
-			e_minicard->button_x = event->button.x;
-			e_minicard->button_y = event->button.y;
-			e_minicard->drag_button_down = TRUE;
-			return ret_val;
-		} else if (event->button.button == 3) {
-			return e_minicard_selected(e_minicard, event);
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		e_minicard->drag_button_down = FALSE;
-		break;
-	case GDK_MOTION_NOTIFY:
-		/* shamelessly ripped from e-table.c, complete with
-                   broken stuck-grab behavior */
-		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 = e_minicard_drag_begin(e_minicard, event);
-
-				printf ("signalled drag begin\n");
-
-				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
-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", 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));
-		}
-	}
-
-	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_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_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 - 2 && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
-				continue;
-
-			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 strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-	} else {
-		return 0;
-	}
-}
-
-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 5a0f590c23..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,122 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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_focus : 1;
-
-	guint editable : 1;
-
-	guint drag_button_down : 1;
-
-	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 4cfa71f470..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,154 +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"
-
-#define PARENT_TYPE gal_view_get_type ()
-
-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)
-{
-}
-
-static void
-gal_view_minicard_save    (GalView *view,
-			 const char *filename)
-{
-}
-
-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 *gve, *new;
-
-	gve = GAL_VIEW_MINICARD(view);
-
-	new        = gtk_type_new (gal_view_minicard_get_type ());
-	new->title = g_strdup (gve->title);
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_destroy         (GtkObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-	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 *gve)
-{
-	gve->title = NULL;
-}
-
-/**
- * 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;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index fef98141f3..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,38 +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>
-
-#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;
-} 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);
-
-#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 90a6ed5f34..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,129 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <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 e327190987..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,204 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "config.h"
-
-#include <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 362c3fddef..0000000000
--- a/addressbook/gui/widgets/test-minicard.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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <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 0a3f34235d..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,198 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@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 fc3b174d98..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-ecpsdir    = $(datadir)/evolution/ecps
-
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	$(GNOME_PRINT_CFLAGS)			\
-        $(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontactprint.a
-
-libecontactprint_a_SOURCES = 			\
-	e-contact-print-envelope.c		\
-	e-contact-print-envelope.h		\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h			\
-	e-contact-print.c			\
-	e-contact-print.h
-
-noinst_PROGRAMS =	\
-	contact-print-test	\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_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)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_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 ea94bbffe6..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,242 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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"
-#include "addressbook/printing/e-contact-print-envelope.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_string_n (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	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 84238c2c9c..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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 "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 adb974607c..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 987c4edbf3..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 c0f76da818..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 0584ffcc48..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1141 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <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-defs.h>
-#include <libgnome/gnome-util.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 <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include "e-contact-print.h"
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintMaster *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	gchar *query;
-
-	GList *cards;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_string(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_string(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_string_n(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_string_n(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_string(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_string(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_string(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_string(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	unsigned char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_string(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_string(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_string(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)
-{
-	GList *cards = ctxt->cards;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		ECardSimple *simple = e_card_simple_new(card);
-		guchar *file_as;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if ( file_as && (!ctxt->character || *ctxt->character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!ctxt->character)
-				ctxt->character = g_strdup(" ");
-			*ctxt->character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_card(simple, ctxt);
-		ctxt->first_contact = FALSE;
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(ctxt->character);
-	if (book_view)
-		gtk_object_unref(GTK_OBJECT(book_view));
-	if (ctxt->type == GNOME_PRINT_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_master_print(ctxt->master);
-	}
-	gtk_object_unref(GTK_OBJECT(ctxt->pc));
-	gtk_object_unref(GTK_OBJECT(ctxt->master));
-	if (ctxt->book)
-		gtk_object_unref(GTK_OBJECT(ctxt->book));
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free(ctxt->cards);
-	gtk_object_unref(GTK_OBJECT(ctxt->style->headings_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->body_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->header_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->footer_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_heading_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_tab_font));
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-card_compare (ECard *card1, ECard *card2) {
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(card1),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card2),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)
-{
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		gtk_object_ref(GTK_OBJECT(card));
-		ctxt->cards = g_list_insert_sorted(ctxt->cards, card, (GCompareFunc) card_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	gtk_object_ref(GTK_OBJECT(book_view));
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "card_added",
-			   GTK_SIGNAL_FUNC(create_card),
-			   ctxt);
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "sequence_complete",
-			   GTK_SIGNAL_FUNC(complete_sequence),
-			   ctxt);
-}
-
-static void
-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-#if 0
-static double
-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	double height = 0;
-	int field;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			if ( 1 ) /* field is a phone field. */ {
-				gchar *field = string;
-				height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-				height += .2 * gnome_font_get_size (ctxt->style->body_font);
-			}
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	double xoff, dotwidth;
-	int dotcount;
-	char *dots;
-	int i;
-	char *file_as;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x, ctxt->y, -1, e_card_get_string_fileas(card));
-	
-	xoff = column_width - 9 * gnome_font_get_size (ctxt->style->body_font);
-	dotwidth = xoff - 
-		gnome_font_get_width_string(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_string(ctxt->style->body_font, " ");
-	dotcount = dotwidth / gnome_font_get_width(ctxt->style->body_font, '.');
-	dots = g_new(gchar, dotcount + 1);
-	for (i = 0; i < dotcount; i++)
-		dots[i] = '.';
-	dots[dotcount] = 0;
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff - dotcount * gnome_font_get_width(ctxt->style->body_font, '.'), ctxt->y, -1, dots);
-	g_free(dots);
-		
-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {
-		if ( 1 ) /* field is a phone field. */ {
-			gchar *field = e_card_get_string(card, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, 
-					 ctxt->x + column_width - gnome_font_get_width_string(ctxt->style->body_font, 
-											      field),
-					 ctxt->y,
-					 -1,
-					 field);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-	}
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	ECard *card = NULL;
-	int i;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-	/*
-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {
-	*/
-	for (i=0; i < 30; i++) {
-		guchar *file_as = e_card_get_string_fileas(card);
-		if ( file_as && (!character || *character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!character)
-				character = g_strdup(" ");
-			*character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!first_contact) && (ctxt->y - e_contact_get_card_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_phone_list(card, ctxt, shown_fields);
-		first_contact = FALSE;
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(character);
-}
-#endif
-
-static void
-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	switch ( ctxt->style->type ) {
-	case E_CONTACT_PRINT_TYPE_CARDS:
-		e_contact_do_print_cards( book, query, ctxt);
-		break;
-#if 0
-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:
-		e_contact_do_print_phone_list( book, query, ctxt );
-		break;
-#endif
-	default:
-		break;
-	}
-}
-
-static void lowify( char *data )
-{
-	for ( ; *data; data++ )
-		*data = tolower((unsigned char) *data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_new_from_full_name( data );
-		if ( font ) {
-			gtk_object_unref( GTK_OBJECT(*variable) );
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-	style->headings_font = gnome_font_new("Helvetica-Bold", 8);
-	style->body_font = gnome_font_new("Helvetica", 6);
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-	style->header_font = gnome_font_new("Helvetica", 6);
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-	style->footer_font = gnome_font_new("Helvetica", 6);
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->childs; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");
-	EBook *book = NULL;
-	char *query = NULL;
-	ECard *card = NULL;
-	gdouble font_size;
-	if (uses_book) {
-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");
-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");
-	} else {
-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-	}
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->cards = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			complete_sequence(NULL, ctxt);
-		}
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->cards = NULL;
-			gtk_object_ref(GTK_OBJECT(book));
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			gtk_object_ref(GTK_OBJECT(card));
-			complete_sequence(NULL, ctxt);
-		}
-		break;
-	case GNOME_PRINT_CANCEL:
-		if (uses_book)
-			gtk_object_unref(GTK_OBJECT(book));
-		else
-			gtk_object_unref(GTK_OBJECT(card));
-		g_free(query);
-		gnome_dialog_close(dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	gtk_object_ref(GTK_OBJECT(book));
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);
-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);
-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_card_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print card", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-/* 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 a5f13f1097..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <addressbook/backend/ebook/e-book.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-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 72cca146dd..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 53ca294d36..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 5844851bfb..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index 0a27e91d20..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,90 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 1cb5bb0905..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,87 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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_category_birthday.png b/art/16_category_birthday.png
deleted file mode 100644
index eb153967d2..0000000000
--- a/art/16_category_birthday.png
+++ /dev/null
diff --git a/art/16_category_business.png b/art/16_category_business.png
deleted file mode 100644
index 9021898963..0000000000
--- a/art/16_category_business.png
+++ /dev/null
diff --git a/art/16_category_favorites.png b/art/16_category_favorites.png
deleted file mode 100644
index 6e072fe219..0000000000
--- a/art/16_category_favorites.png
+++ /dev/null
diff --git a/art/16_category_gifts.png b/art/16_category_gifts.png
deleted file mode 100644
index 331720c93f..0000000000
--- a/art/16_category_gifts.png
+++ /dev/null
diff --git a/art/16_category_goals.png b/art/16_category_goals.png
deleted file mode 100644
index 90c4b13280..0000000000
--- a/art/16_category_goals.png
+++ /dev/null
diff --git a/art/16_category_holiday-cards.png b/art/16_category_holiday-cards.png
deleted file mode 100644
index 4c596e1462..0000000000
--- a/art/16_category_holiday-cards.png
+++ /dev/null
diff --git a/art/16_category_holiday.png b/art/16_category_holiday.png
deleted file mode 100644
index d123e2a11f..0000000000
--- a/art/16_category_holiday.png
+++ /dev/null
diff --git a/art/16_category_hot-contacts.png b/art/16_category_hot-contacts.png
deleted file mode 100644
index ee71411f55..0000000000
--- a/art/16_category_hot-contacts.png
+++ /dev/null
diff --git a/art/16_category_ideas.png b/art/16_category_ideas.png
deleted file mode 100644
index 239bc68037..0000000000
--- a/art/16_category_ideas.png
+++ /dev/null
diff --git a/art/16_category_international.png b/art/16_category_international.png
deleted file mode 100644
index 2f25501e49..0000000000
--- a/art/16_category_international.png
+++ /dev/null
diff --git a/art/16_category_key-customer.png b/art/16_category_key-customer.png
deleted file mode 100644
index 035ccf8b4b..0000000000
--- a/art/16_category_key-customer.png
+++ /dev/null
diff --git a/art/16_category_miscellaneous.png b/art/16_category_miscellaneous.png
deleted file mode 100644
index 452f001ada..0000000000
--- a/art/16_category_miscellaneous.png
+++ /dev/null
diff --git a/art/16_category_personal.png b/art/16_category_personal.png
deleted file mode 100644
index a35b684eb6..0000000000
--- a/art/16_category_personal.png
+++ /dev/null
diff --git a/art/16_category_phonecalls.png b/art/16_category_phonecalls.png
deleted file mode 100644
index 9124605316..0000000000
--- a/art/16_category_phonecalls.png
+++ /dev/null
diff --git a/art/16_category_status.png b/art/16_category_status.png
deleted file mode 100644
index a2c89d3870..0000000000
--- a/art/16_category_status.png
+++ /dev/null
diff --git a/art/16_category_strategies.png b/art/16_category_strategies.png
deleted file mode 100644
index f178bdd35c..0000000000
--- a/art/16_category_strategies.png
+++ /dev/null
diff --git a/art/16_category_suppliers.png b/art/16_category_suppliers.png
deleted file mode 100644
index 4609840f67..0000000000
--- a/art/16_category_suppliers.png
+++ /dev/null
diff --git a/art/16_category_time-and-expenses.png b/art/16_category_time-and-expenses.png
deleted file mode 100644
index ca9aaf4104..0000000000
--- a/art/16_category_time-and-expenses.png
+++ /dev/null
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 344c12f450..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 a8e7f0d421..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,224 +0,0 @@
-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 a70f67fae8..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,187 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-images_DATA = \
-	apply-filters-16.xpm		\
-	bcg.png				\
-	configure_16_addressbook.xpm	\
-	configure_16_calendar.xpm	\
-	configure_16_folder.xpm		\
-	configure_16_mail.xpm		\
-	contact-is-a-list.png		\
-	copy_16_message.xpm		\
-	edit.xpm			\
-	empty.gif			\
-	encrypt.xpm			\
-	es-appointments.png		\
-	es-weather.png			\
-	folder.xpm			\
-	forward.xpm			\
-	ico-calendar.png		\
-	ico-mail.png			\
-	ico-rdf.png			\
-	ico-weather.png			\
-	import.png			\
-	import.xpm			\
-	move_message.xpm		\
-	offline.png			\
-	online.png			\
-	pattern.png			\
-	print.xpm			\
-	print-preview.xpm		\
-	rdf.png				\
-	reply.xpm			\
-	reply_to_all.xpm		\
-	save.xpm			\
-	all_contacts.xpm		\
-	find_contact.xpm		\
-	find_message.xpm		\
-	briefcase.png       		\
-	butterfly.png			\
-	cellphone.png       		\
-	delete_message.xpm		\
-	compose-message.png		\
-	envelope.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	\
-	globe.png           		\
-	hide_deleted_messages.xpm	\
-	hide_read_messages.xpm		\
-	hide_selected_messages.xpm	\
-	house.png           		\
-	malehead.png			\
-	mail-config-druid.png		\
-	mail-config-druid-identity.png	\
-	mail-config-druid-receive.png	\
-	mail-config-druid-send.png	\
-	mail-config-druid-account-name.png \
-	myweather-rain.png		\
-	myweather-snow.png		\
-	myweather-storm.png		\
-	myweather-fog.png		\
-	myweather-sun.png		\
-	myweather-suncloud.png		\
-	myweather-clouds.png		\
-	new_appointment.xpm		\
-	new_contact.xpm			\
-	new-message.xpm			\
-	send-receive.xpm		\
-	service-close.png		\
-	service-configure.png		\
-	service-down.png		\
-	service-down-disabled.png	\
-	service-left.png		\
-	service-left-disabled.png	\
-	service-right.png		\
-	service-right-disabled.png	\
-	service-up.png			\
-	service-up-disabled.png		\
-	show_all_messages.xpm		\
-	splash.png			\
-	thankyou.png			\
-	undelete_message.xpm		\
-	work_offline.xpm		\
-	world_map-960.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	add-attachment.png		\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	dayview.xpm			\
-	fetch-mail.png			\
-	forward.png			\
-	monthview.xpm  			\
-	move-message.png		\
-	next-message.png		\
-	new_appointment.png		\
-	previous-message.png		\
-	print.png			\
-	reply.png			\
-	reply-to-all.png		\
-	send-24-receive.png		\
-	weekview.xpm  			\
-	workweekview.xpm		\
-	yearview.xpm	
-
-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
-
-categoriesdir = $(datadir)/images/evolution/categories
-categories_DATA =				\
-	16_category_birthday.png		\
-	16_category_business.png		\
-	16_category_favorites.png		\
-	16_category_gifts.png			\
-	16_category_goals.png			\
-	16_category_holiday.png			\
-	16_category_holiday-cards.png		\
-	16_category_hot-contacts.png		\
-	16_category_ideas.png			\
-	16_category_international.png		\
-	16_category_key-customer.png		\
-	16_category_miscellaneous.png		\
-	16_category_personal.png		\
-	16_category_phonecalls.png		\
-	16_category_status.png			\
-	16_category_strategies.png		\
-	16_category_suppliers.png		\
-	16_category_time-and-expenses.png
-	
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-EXTRA_DIST = \
-	attachment.xpm			\
-	bell.xpm			\
-	check-filled.xpm		\
-	empty.xpm			\
-	jump.xpm			\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	mail-replied.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		\
-	task.xpm			\
-	timezone-16.xpm			\
-	tree-expanded.xpm		\
-	tree-unexpanded.xpm		\
-	$(images_DATA)			\
-	$(buttons_DATA)			\
-	$(conduits_DATA)		\
-	$(appicon_DATA)			\
-	$(categories_DATA)
-
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index 024b203fe0..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-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 62ddebe678..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/all_contacts.xpm b/art/all_contacts.xpm
deleted file mode 100644
index 1f2e90123d..0000000000
--- a/art/all_contacts.xpm
+++ /dev/null
@@ -1,136 +0,0 @@
-/* XPM */
-static char * 24_all_contacts_xpm[] = {
-"24 24 109 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #E2E2E2",
-"@ 	c #FFFFFF",
-"# 	c #7C7C7C",
-"$ 	c #99A097",
-"% 	c #4D4D4D",
-"& 	c #535250",
-"* 	c #A6A6A6",
-"= 	c #798874",
-"- 	c #444F42",
-"; 	c #5B6158",
-"> 	c #909090",
-", 	c #6B6B6B",
-"' 	c #B5BCB3",
-") 	c #596555",
-"! 	c #869880",
-"~ 	c #DDDDDD",
-"{ 	c #C5C5C5",
-"] 	c #6E6E6E",
-"^ 	c #DCE1DA",
-"/ 	c #495246",
-"( 	c #575757",
-"_ 	c #929292",
-": 	c #CDCDCD",
-"< 	c #F8F8F9",
-"[ 	c #ABABAB",
-"} 	c #656565",
-"| 	c #BDBDBD",
-"1 	c #9C9FA2",
-"2 	c #1E1E1F",
-"3 	c #BEBEBE",
-"4 	c #F8F8F8",
-"5 	c #C9B49B",
-"6 	c #8E7151",
-"7 	c #876E51",
-"8 	c #BAB1A5",
-"9 	c #C4CCD4",
-"0 	c #5F6D7C",
-"a 	c #4B5E6D",
-"b 	c #34383A",
-"c 	c #F3F3F3",
-"d 	c #A88D6E",
-"e 	c #DFD0BF",
-"f 	c #5E432B",
-"g 	c #7E6C5B",
-"h 	c #9EA8B3",
-"i 	c #C0C8CF",
-"j 	c #9EA2A7",
-"k 	c #6E6F6E",
-"l 	c #80766E",
-"m 	c #665B52",
-"n 	c #969696",
-"o 	c #C3C3C3",
-"p 	c #EEDFCC",
-"q 	c #F4EEE6",
-"r 	c #765E45",
-"s 	c #F9F9FA",
-"t 	c #C9CFD6",
-"u 	c #A3AEBA",
-"v 	c #E9EEF2",
-"w 	c #91B7BA",
-"x 	c #625547",
-"y 	c #625347",
-"z 	c #D0CCC9",
-"A 	c #CFCFCF",
-"B 	c #FAFAFA",
-"C 	c #7590AE",
-"D 	c #C1665A",
-"E 	c #445B71",
-"F 	c #FDFCFC",
-"G 	c #EEF0F1",
-"H 	c #DCD8D5",
-"I 	c #BCB2A7",
-"J 	c #776E67",
-"K 	c #877D75",
-"L 	c #C8C8C8",
-"M 	c #4B6983",
-"N 	c #9DB8D2",
-"O 	c #486481",
-"P 	c #314E6C",
-"Q 	c #667A8D",
-"R 	c #FDFDFD",
-"S 	c #736A63",
-"T 	c #756C65",
-"U 	c #D6D3D1",
-"V 	c #BABABA",
-"W 	c #5F7C96",
-"X 	c #5D7A95",
-"Y 	c #4D6B87",
-"Z 	c #3B556D",
-"` 	c #344A60",
-" .	c #999999",
-"..	c #7F7F7F",
-"+.	c #F6F6F6",
-"@.	c #5D5D5D",
-"#.	c #787878",
-"$.	c #9B9B9B",
-"%.	c #C7C7C7",
-"&.	c #A3A3A3",
-"*.	c #EAE8E3",
-"=.	c #E0DDD6",
-"-.	c #918E85",
-";.	c #D5D5D5",
-">.	c #B5B5B5",
-",.	c #E1E1E1",
-"'.	c #989898",
-").	c #C1C1C1",
-"!.	c #DADADA",
-"                      . . . .                   ",
-"                  . . + @ . . . .               ",
-"              . . + @ # . + @ @ + . .           ",
-"          . . + @ $ % & . @ @ * @ @ + . .       ",
-"        . + @ @ = - ; . + @ @ > , @ @ @ + . .   ",
-"        . + @ @ ' ) ! . @ @ ~ # @ { ] @ @ @ + . ",
-"          . @ @ ^ / . + @ @ > @ @ ] @ @ ( @ + . ",
-"          . + @ @ ^ . @ @ ~ , @ _ ] @ * : @ .   ",
-"    . . . . . . . . + < @ [ ~ @ # @ @ } @ + .   ",
-"  . | @ @ @ @ @ @ . @ 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 @ . @ + . ",
-"  . @ c 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 ` @  .. . + @ @ @ ..+.. @ @ .     ",
-"  . @ @ @ @ @ @ @ @ @ @ . . + @ @ + . @ + .     ",
-"  . @ @ @.@ @.@ #.@ $.@ %.@ . . . . @ @ .       ",
-"  . &.*.*.*.*.*.*.*.*.*.*.*.=.-.. ;.@ A .       ",
-"    . . . . . . . . . . . . . . >.,.@ .         ",
-"                . . '.V V V V ).!.@ L .         ",
-"                    . . + @ @ @ @ @ .           ",
-"                        . . + @ @ L .           ",
-"                            . . . .             "};
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/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/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 2b0b97c791..0000000000
--- a/art/compose-message.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/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 98d97b788d..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 de6dcf38cd..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/delete_message.xpm b/art/delete_message.xpm
deleted file mode 100644
index d06fa01a7a..0000000000
--- a/art/delete_message.xpm
+++ /dev/null
@@ -1,161 +0,0 @@
-/* XPM */
-static char * delete_message_xpm[] = {
-"16 16 142 2",
-"  	c None",
-". 	c #0E0E0E",
-"+ 	c #424242",
-"@ 	c #4A4A4A",
-"# 	c #3E3E3E",
-"$ 	c #2C2C2C",
-"% 	c #000000",
-"& 	c #858371",
-"* 	c #F0EDD8",
-"= 	c #F2F1E9",
-"- 	c #EEEDE4",
-"; 	c #C7C6BA",
-"> 	c #535246",
-", 	c #101010",
-"' 	c #C2C0A5",
-") 	c #C1BFA5",
-"! 	c #7A7967",
-"~ 	c #484740",
-"{ 	c #272725",
-"] 	c #36352E",
-"^ 	c #878572",
-"/ 	c #A09E88",
-"( 	c #A3A18A",
-"_ 	c #A5A38C",
-": 	c #2B2B2B",
-"< 	c #D3D1BC",
-"[ 	c #DCDAC4",
-"} 	c #E2E0CF",
-"| 	c #B9B7A2",
-"1 	c #64625B",
-"2 	c #393836",
-"3 	c #3C3C33",
-"4 	c #616053",
-"5 	c #9A9883",
-"6 	c #B7B59B",
-"7 	c #B3B298",
-"8 	c #A4A28B",
-"9 	c #E7E3D0",
-"0 	c #F1EDE2",
-"a 	c #F2F1E4",
-"b 	c #EAE9DA",
-"c 	c #E5E2D2",
-"d 	c #D5D2BE",
-"e 	c #C3C1A7",
-"f 	c #AFAD94",
-"g 	c #C0BEA4",
-"h 	c #C6C4AC",
-"i 	c #B8B69C",
-"j 	c #888673",
-"k 	c #9C9A84",
-"l 	c #EFEBCB",
-"m 	c #FAF6E3",
-"n 	c #F9F5ED",
-"o 	c #F8F7EE",
-"p 	c #F8F7EC",
-"q 	c #F5F3E6",
-"r 	c #ECEAD9",
-"s 	c #DEDDCB",
-"t 	c #B1AF9A",
-"u 	c #706F5F",
-"v 	c #5D5C4F",
-"w 	c #828072",
-"x 	c #B3B1A3",
-"y 	c #E4E1C8",
-"z 	c #E9E5CF",
-"A 	c #E9E6C9",
-"B 	c #D3D1B3",
-"C 	c #92917C",
-"D 	c #8F8D79",
-"E 	c #868572",
-"F 	c #636254",
-"G 	c #4D4C41",
-"H 	c #1F1F1B",
-"I 	c #55554E",
-"J 	c #8B8980",
-"K 	c #8E8D86",
-"L 	c #99988C",
-"M 	c #8D8C83",
-"N 	c #95937E",
-"O 	c #81806D",
-"P 	c #5F5F51",
-"Q 	c #393833",
-"R 	c #34332C",
-"S 	c #1F1E19",
-"T 	c #2A2A23",
-"U 	c #666654",
-"V 	c #575748",
-"W 	c #58584E",
-"X 	c #4F4F47",
-"Y 	c #595951",
-"Z 	c #272721",
-"` 	c #262620",
-" .	c #2F2F27",
-"..	c #47473B",
-"+.	c #3B3B31",
-"@.	c #24241F",
-"#.	c #2B2B24",
-"$.	c #696856",
-"%.	c #7E7D6E",
-"&.	c #717067",
-"*.	c #7E7E68",
-"=.	c #747363",
-"-.	c #404035",
-";.	c #565647",
-">.	c #39392F",
-",.	c #4A4A3D",
-"'.	c #3F3F34",
-").	c #2C2C25",
-"!.	c #6C6C5A",
-"~.	c #9C9B8A",
-"{.	c #8B8B7F",
-"].	c #9E9D8B",
-"^.	c #88887B",
-"/.	c #58574F",
-"(.	c #60604F",
-"_.	c #5C5C4C",
-":.	c #505042",
-"<.	c #292922",
-"[.	c #6D6C5A",
-"}.	c #9E9E8B",
-"|.	c #8F8E81",
-"1.	c #B5B5A0",
-"2.	c #ACAB99",
-"3.	c #5D5D52",
-"4.	c #747460",
-"5.	c #4D4D40",
-"6.	c #5D5D4D",
-"7.	c #6C6C59",
-"8.	c #999986",
-"9.	c #8D8D80",
-"0.	c #4F4F41",
-"a.	c #282822",
-"b.	c #656553",
-"c.	c #0A0A0A",
-"d.	c #212121",
-"e.	c #5D5C54",
-"f.	c #8C8C74",
-"g.	c #949482",
-"h.	c #4D4C43",
-"i.	c #060606",
-"j.	c #0F0F0F",
-"k.	c #050505",
-"          . + @ # $ %           ",
-"      % % & * = - ; > % %       ",
-"    , ' ) ! ~ { ] ^ / ( _ %     ",
-"  : < [ } | 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 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 `  ...+.@.    ",
-"    #.$.%.&.*.=.-.;.>.,.'.`     ",
-"    ).!.~.{.].^./.(.,._.:.<.    ",
-"    ).[.}.|.1.2.3.4.5.6.:.<.    ",
-"    #.7.8.9.1.2.3.4.5.6.0.a.    ",
-"    Z b.}.9.1.2.3.4.5.6.5.Z     ",
-"      c.d.e.f.g.h.U -.% %       ",
-"          i.% j.k.% %           "};
diff --git a/art/edit-16.xpm b/art/edit-16.xpm
deleted file mode 100644
index 54dfc4b816..0000000000
--- a/art/edit-16.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * edit_16_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #FBFBFB",
-"#	c #FCFCFC",
-"$	c #FEFEFE",
-"%	c #9E9E9E",
-"&	c #D2D2D2",
-"*	c #FFFFFF",
-"=	c #F0F0F0",
-"-	c #D8D8D2",
-";	c #D3CDA4",
-">	c #B5ABA3",
-",	c #ABC8D8",
-"'	c #FBFAF8",
-")	c #F6F6EF",
-"!	c #E7E7E7",
-"~	c #DFDFDF",
-"{	c #F5F5F5",
-"]	c #BAB8A9",
-"^	c #C5BC91",
-"/	c #685143",
-"(	c #5B7CA2",
-"_	c #DAD699",
-":	c #E2E2DF",
-"<	c #A5A5A3",
-"[	c #777777",
-"}	c #C3C3C3",
-"|	c #727063",
-"1	c #AFA27D",
-"2	c #4A2E1D",
-"3	c #20314B",
-"4	c #9B9352",
-"5	c #BFBFBF",
-"6	c #8B8B8B",
-"7	c #E0E0E0",
-"8	c #FAFAFA",
-"9	c #F9F9F9",
-"0	c #DDDDDD",
-"a	c #E8E8E8",
-"       ..       ",
-"      .++..     ",
-"      .@#+$..   ",
-" .........%&*.. ",
-".=-;>,,,')..&!~.",
-".{]^/(((_:<..[~.",
-".}|1233344..5~. ",
-" .........6&@~. ",
-"   .+{77$$$8~.  ",
-"  .+$$$$77$9~.  ",
-"  .~~$$$$$$~.   ",
-"   ..~~$$$$~.   ",
-"     ..~7$+.    ",
-"       ..0a.    ",
-"         ..     ",
-"                "};
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 5736b9c8bb..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 a3260d718e..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 3b0f90b292..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/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/filters.xpm b/art/filters.xpm
deleted file mode 100644
index f4a015e85c..0000000000
--- a/art/filters.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char * filters_xpm[] = {
-"16 16 52 1",
-" 	c None",
-".	c #000000",
-"+	c #D1BB70",
-"@	c #DEC777",
-"#	c #EBD37E",
-"$	c #D7C173",
-"%	c #E2CB79",
-"&	c #EAD27D",
-"*	c #DFC877",
-"=	c #DBC575",
-"-	c #E3CC7A",
-";	c #E9D17D",
-">	c #E0CA78",
-",	c #CEB96E",
-"'	c #D4BF72",
-")	c #C4B169",
-"!	c #ECD47E",
-"~	c #D6C173",
-"{	c #C7B36B",
-"]	c #E1CB79",
-"^	c #E5CE7B",
-"/	c #E4CD7A",
-"(	c #C4B069",
-"_	c #EDD57F",
-":	c #BDAA65",
-"<	c #E9E9E9",
-"[	c #F8F8F8",
-"}	c #FEFEFE",
-"|	c #CAB66C",
-"1	c #B6A361",
-"2	c #E2B3A7",
-"3	c #EEBEB3",
-"4	c #FFFFFF",
-"5	c #FDFDFD",
-"6	c #F6F6F6",
-"7	c #E2C9C2",
-"8	c #F3F3F3",
-"9	c #F3C3B8",
-"0	c #F1C1B6",
-"a	c #F5F5F5",
-"b	c #BCA965",
-"c	c #E5E5E5",
-"d	c #F1F1F1",
-"e	c #F2CDC5",
-"f	c #F4F4F4",
-"g	c #EBEBEB",
-"h	c #DDDDDD",
-"i	c #FBFBFB",
-"j	c #EDEDED",
-"k	c #E2E2E2",
-"l	c #EFEFEF",
-"m	c #E6E6E6",
-"                ",
-"                ",
-"           ...  ",
-"          .+@#. ",
-"         .$%#&*.",
-"        .=-&;>,.",
-"       .=-&&%').",
-"      .@-&!-~{. ",
-"     .]^#!/'(.  ",
-"    .%^#_%+:.   ",
-"   .<[}_-|1.    ",
-"  .23456,1.     ",
-" .7890a<b.      ",
-" cd5efgh.       ",
-"   i8jk.        ",
-"    lm.         "};
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/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/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 45ac85807b..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/forward.xpm b/art/forward.xpm
deleted file mode 100644
index 7d2d1457df..0000000000
--- a/art/forward.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char * 16_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/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/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/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/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-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.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/marlboro_filters.xpm b/art/marlboro_filters.xpm
deleted file mode 100644
index 1af8d2d8a3..0000000000
--- a/art/marlboro_filters.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * marlboro_filters_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #7E7E7E",
-"@	c #B9B9B9",
-"#	c #CACACA",
-"$	c #DF421E",
-"%	c #A0A0A0",
-"&	c #C8C8C8",
-"*	c #E2E2E2",
-"=	c #F2B8AB",
-"-	c #8B2912",
-";	c #6F6F6F",
-">	c #C9C9C9",
-",	c #FFFFFF",
-"'	c #9E9E9E",
-")	c #FDE6A1",
-"!	c #999999",
-"~	c #B03417",
-"{	c #EDD57F",
-"]	c #CBB76C",
-"^	c #C5B268",
-"/	c #FBE9E5",
-"(	c #D09486",
-"_	c #B1B1B1",
-":	c #8A8A8A",
-"<	c #CF9F94",
-"    ........... ",
-"    .+@#######$.",
-"   .++%&*****=$-",
-"   .;+>,,,,,,$$.",
-"   ............ ",
-"  .')+)+)+)+.   ",
-" .!)+)+)+)+~.   ",
-" .${]{]{]$~~.   ",
-" .${^{]{]$~~.   ",
-" .$$$$$$$$~~.   ",
-" .$$$/$$$$~~.   ",
-" .$$/,/$$$~~.   ",
-" .$/&,,/$$~(.   ",
-" ./&_&:&/$<+.   ",
-" .,*****,,+.    ",
-" ..........     "};
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/meeting_widget.png b/art/meeting_widget.png
deleted file mode 100644
index b1979a6e5c..0000000000
--- a/art/meeting_widget.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/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_appointment.png b/art/new_appointment.png
deleted file mode 100644
index 55fc2e7f8e..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 9fa89b68a2..0000000000
--- a/art/new_appointment.xpm
+++ /dev/null
@@ -1,102 +0,0 @@
-/* XPM */
-static char * new_appointment_xpm[] = {
-"16 16 83 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #B5B5B5",
-"#	c #535353",
-"$	c #161616",
-"%	c #F6F6F6",
-"&	c #676767",
-"*	c #BA8D31",
-"=	c #EAB23D",
-"-	c #403011",
-";	c #E5E5E5",
-">	c #B4B4B4",
-",	c #EFB63E",
-"'	c #F6D591",
-")	c #F3B840",
-"!	c #916D26",
-"~	c #F8F8F8",
-"{	c #F3F3F3",
-"]	c #E7E7E7",
-"^	c #DDDDDD",
-"/	c #EEB53E",
-"(	c #FAE7BC",
-"_	c #FCD584",
-":	c #FEC142",
-"<	c #FFC243",
-"[	c #CECECE",
-"}	c #0B0B0B",
-"|	c #B9B9B9",
-"1	c #B88B30",
-"2	c #F9E2B2",
-"3	c #FDD789",
-"4	c #D0D0D0",
-"5	c #373737",
-"6	c #898989",
-"7	c #F1F1F1",
-"8	c #ABABAB",
-"9	c #E7AF3C",
-"0	c #F9DDA4",
-"a	c #FECA5E",
-"b	c #D09E36",
-"c	c #8B8B8B",
-"d	c #FEFEFE",
-"e	c #DADADA",
-"f	c #3A2B0F",
-"g	c #8F6C25",
-"h	c #FDC042",
-"i	c #2D220C",
-"j	c #6F6F6F",
-"k	c #8F8F8F",
-"l	c #353535",
-"m	c #DFDFDF",
-"n	c #F0F0F0",
-"o	c #FCFCFC",
-"p	c #363636",
-"q	c #AAAAAA",
-"r	c #FDFDFD",
-"s	c #C8C8C8",
-"t	c #A9A9A9",
-"u	c #E1E1E1",
-"v	c #4A4A4A",
-"w	c #FAFAFA",
-"x	c #C4C4C4",
-"y	c #A1A1A1",
-"z	c #CCCCCC",
-"A	c #D6D6D6",
-"B	c #F4F4F4",
-"C	c #FBFBFB",
-"D	c #F7F7F7",
-"E	c #BABABA",
-"F	c #BFBFBF",
-"G	c #C9C9C9",
-"H	c #767676",
-"I	c #CBCBCB",
-"J	c #ACACAC",
-"K	c #B3B3B3",
-"L	c #A0A0A0",
-"M	c #444444",
-"N	c #A7A7A7",
-"O	c #989898",
-"P	c #D5D5D5",
-"Q	c #EDEDED",
-"R	c #CDCDCD",
-"............... ",
-".+++@#$.$#@++%. ",
-".++&.*=-;>.&%;. ",
-".+&.,')!~{].&^. ",
-".@./(_:<+[}|.@. ",
-".#123<<<45678#. ",
-".$90a<<b5cd%e$. ",
-"..fgh<<ij+dkl.. ",
-".$mno++4pqrns$. ",
-".#tu%dd+4vwxy#. ",
-".@.zABwoCDzE.@. ",
-".+&.FEGHIJK.&^. ",
-".++&.LJMNO.&P^. ",
-".QPP@#$.$#@^^R. ",
-"............... ",
-"                "};
diff --git a/art/new_contact.xpm b/art/new_contact.xpm
deleted file mode 100644
index 08742387dd..0000000000
--- a/art/new_contact.xpm
+++ /dev/null
@@ -1,137 +0,0 @@
-/* XPM */
-static char * 24_new_contact_xpm[] = {
-"24 24 110 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #030303",
-"@ 	c #0F0F0F",
-"# 	c #1B1B1B",
-"$ 	c #272727",
-"% 	c #333333",
-"& 	c #404040",
-"* 	c #4C4C4C",
-"= 	c #585858",
-"- 	c #646464",
-"; 	c #707070",
-"> 	c #7C7C7C",
-", 	c #888888",
-"' 	c #949494",
-") 	c #BDBDBD",
-"! 	c #FFFFFF",
-"~ 	c #DBDBDB",
-"{ 	c #A9A9A9",
-"] 	c #F8F8F8",
-"^ 	c #CFBDA7",
-"/ 	c #A18A6F",
-"( 	c #A18E77",
-"_ 	c #CCC6BD",
-": 	c #FDFDFD",
-"< 	c #FCFCFC",
-"[ 	c #F7F6F5",
-"} 	c #B1B1B1",
-"| 	c #050505",
-"1 	c #F4F4F4",
-"2 	c #B59F85",
-"3 	c #E5D9CC",
-"4 	c #877261",
-"5 	c #A4988C",
-"6 	c #828282",
-"7 	c #A1A1A1",
-"8 	c #FEFEFE",
-"9 	c #F8F7F6",
-"0 	c #BABABA",
-"a 	c #0E0E0E",
-"b 	c #F1E5D6",
-"c 	c #F6F2EC",
-"d 	c #9D8C7A",
-"e 	c #A2968B",
-"f 	c #F8F8F6",
-"g 	c #C2C2C2",
-"h 	c #161616",
-"i 	c #FAFAFA",
-"j 	c #94A9C0",
-"k 	c #D29087",
-"l 	c #808F9E",
-"m 	c #E5E5E3",
-"n 	c #D3D3D3",
-"o 	c #DEDEDE",
-"p 	c #CBCBCB",
-"q 	c #1F1F1F",
-"r 	c #71899D",
-"s 	c #B6CADD",
-"t 	c #8094A8",
-"u 	c #7A8DA0",
-"v 	c #A3AFBB",
-"w 	c #EED886",
-"x 	c #D4D4D4",
-"y 	c #879CB0",
-"z 	c #8DA1B4",
-"A 	c #8A9EB0",
-"B 	c #8797A6",
-"C 	c #8D99A5",
-"D 	c #CFCFCF",
-"E 	c #D5D5D5",
-"F 	c #EEDC96",
-"G 	c #ECECEC",
-"H 	c #F2E2A6",
-"I 	c #DCDCDC",
-"J 	c #EFDA8D",
-"K 	c #303030",
-"L 	c #F9F1D5",
-"M 	c #E5E5E5",
-"N 	c #393939",
-"O 	c #989898",
-"P 	c #A7A7A7",
-"Q 	c #F0F0F0",
-"R 	c #F8F1D4",
-"S 	c #EEEEEE",
-"T 	c #414141",
-"U 	c #BEBEBE",
-"V 	c #F1F0EC",
-"W 	c #F2F1EE",
-"X 	c #F3F2EF",
-"Y 	c #F4F3F0",
-"Z 	c #F5F4F2",
-"` 	c #F6F5F3",
-" .	c #F7F6F4",
-"..	c #F9F8F7",
-"+.	c #FAF9F8",
-"@.	c #FBFAFA",
-"#.	c #565656",
-"$.	c #626262",
-"%.	c #6E6E6E",
-"&.	c #7A7A7A",
-"*.	c #868686",
-"=.	c #929292",
-"-.	c #9E9E9E",
-";.	c #AAAAAA",
-">.	c #EED98A",
-",.	c #F5E8B9",
-"'.	c #EED682",
-").	c #F0DC94",
-"!.	c #EFDB90",
-"~.	c #F0DE99",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"          . + @ # $ % & * = - ; > , '           ",
-"        . ) ! ! ! ! ! ! ! ! ! ! ! ! ~ {         ",
-"        . ! ] ^ / ( _ ! : ! < ! ! ! [ }         ",
-"        | ! 1 2 3 4 5 ! 6 7 : } 8 ! 9 0         ",
-"        a ! 1 b c d e ! ! ! ! ! ! ! f g         ",
-"        h ! i j k l m ! n ! 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 ! g ! ~ ! Q R ! ! S L       ",
-"        T U V W X Y Z `  .9 ..+.@.! ! !         ",
-"          #.$.%.&.*.=.-.;.>.,.L ! ! ! ! ! L H '.",
-"                                  ! ! !         ",
-"                                L   !   L       ",
-"                                    L           ",
-"                            ).      ,.      !.  ",
-"                                    ~.          ",
-"                                                ",
-"                                                ",
-"                                                "};
diff --git a/art/next-message.png b/art/next-message.png
deleted file mode 100644
index e9bc259466..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/paste.png b/art/paste.png
deleted file mode 100644
index 3112af6cf0..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/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 6113895352..0000000000
--- a/art/previous-message.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/rdf.png b/art/rdf.png
deleted file mode 100644
index b4bdbafa99..0000000000
--- a/art/rdf.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 6f42de1de0..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index cc8be8511f..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/reply.xpm b/art/reply.xpm
deleted file mode 100644
index 059d3ebc12..0000000000
--- a/art/reply.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * 16_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 0c0a00e020..0000000000
--- a/art/reply_to_all.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * 16_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.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/send-24-receive.png b/art/send-24-receive.png
deleted file mode 100644
index 1ecef23a96..0000000000
--- a/art/send-24-receive.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-receive.xpm b/art/send-receive.xpm
deleted file mode 100644
index 59d9bfb5d5..0000000000
--- a/art/send-receive.xpm
+++ /dev/null
@@ -1,43 +0,0 @@
-/* XPM */
-static char * 16_send_receive_xpm[] = {
-"16 16 24 1",
-" 	c None",
-".	c #000000",
-"+	c #EEC7C1",
-"@	c #8B625D",
-"#	c #F2D1CB",
-"$	c #CE3216",
-"%	c #D25B46",
-"&	c #CF8173",
-"*	c #F4D8D3",
-"=	c #B72C13",
-"-	c #D29C94",
-";	c #C99A93",
-">	c #95220D",
-",	c #7F8488",
-"'	c #C5CED6",
-")	c #CDD5DC",
-"!	c #BAC6CF",
-"~	c #506D89",
-"{	c #9EADBB",
-"]	c #95A6B7",
-"^	c #4F575E",
-"/	c #3A4148",
-"(	c #42484E",
-"_	c #3F3F3F",
-"                ",
-"                ",
-"                ",
-"   ..           ",
-"  .+@..         ",
-" .#$%&.         ",
-".*$$$=.         ",
-" .-$==.    ..   ",
-"  .;>..  ..,'.  ",
-"   ..    .)!~{. ",
-"         .]~~~^.",
-"         .]~~/. ",
-"         ...(.  ",
-"           ._   ",
-"                ",
-"                "};
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 fe30494ef7..0000000000
--- a/art/splash-1-0.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index ef2e773776..0000000000
--- a/art/splash.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.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 6e77c66795..0000000000
--- a/art/timezone-16.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char * timezone_16_xpm[] = {
-"16 16 47 1",
-" 	c None",
-".	c #000000",
-"+	c #F0F2F4",
-"@	c #ADBECB",
-"#	c #D1D4CA",
-"$	c #E5E2CA",
-"%	c #E2E0CA",
-"&	c #67889D",
-"*	c #DEDFD4",
-"=	c #D5CC90",
-"-	c #006594",
-";	c #F4E490",
-">	c #8E9E90",
-",	c #BFBE90",
-"'	c #D9D090",
-")	c #BABA90",
-"!	c #00006C",
-"~	c #EFEAD4",
-"{	c #769292",
-"]	c #A2AA91",
-"^	c #A1AA90",
-"/	c #97A391",
-"(	c #D7C667",
-"_	c #F9F2D4",
-":	c #A3AB90",
-"<	c #CAC490",
-"[	c #BECBD5",
-"}	c #CDC790",
-"|	c #B8AE67",
-"1	c #C8C490",
-"2	c #C8C491",
-"3	c #D6CD90",
-"4	c #1C7E98",
-"5	c #167697",
-"6	c #859990",
-"7	c #94A290",
-"8	c #E5D890",
-"9	c #578794",
-"0	c #076996",
-"a	c #8B9D91",
-"b	c #C3C090",
-"c	c #D1CA90",
-"d	c #8D9D91",
-"e	c #448091",
-"f	c #8399AA",
-"g	c #B7AE67",
-"h	c #ABA667",
-"................",
-".+@@@@@#@@$%@@&.",
-".*=----;>,;')-!.",
-".~{---];^/;,;;(.",
-"._;]----],',';(.",
-"._;;---:;;;;;'(.",
-"._<---;;;{;;;;(.",
-"._----;;-]-;{;(.",
-".[;----}';;{-;|.",
-".[-;)--12;;345!.",
-".[;;;]-678;}90!.",
-".[];;{---=;a--!.",
-".[-;)----bc{--!.",
-".[-;-----de---!.",
-".f!gh!!!!!!!!!..",
-"................"};
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.xpm b/art/undelete_message.xpm
deleted file mode 100644
index e5698be5af..0000000000
--- a/art/undelete_message.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * undelete_message_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #314E6C",
-"+	c #9DB8D2",
-"@	c #4B6983",
-"#	c #000000",
-"$	c #586A52",
-"%	c #64795D",
-"&	c #6E8567",
-"*	c #A4B29F",
-"=	c #ABB5A8",
-"-	c #96A790",
-";	c #3B4039",
-">	c #C2C9BF",
-",	c #6C8265",
-"'	c #6D8466",
-")	c #799271",
-"!	c #FFFFFF",
-"~	c #C0CBBC",
-"{	c #A3B19C",
-"]	c #83957D",
-"^	c #E7E9E5",
-"/	c #BFCABE",
-"(	c #718869",
-"_	c #9DAB99",
-":	c #333C30",
-"<	c #626A5F",
-"[	c #959B90",
-"}	c #D5D6D5",
-"|	c #C7CBC5",
-"1	c #B4BCB3",
-"2	c #7A8676",
-"3	c #758271",
-"4	c #455241",
-"5	c #3A4436",
-"6	c #879B81",
-"7	c #9FA89C",
-"8	c #556550",
-"9	c #879B83",
-"0	c #424D40",
-"a	c #84967F",
-"b	c #414A3D",
-"c	c #465443",
-"d	c #B0BAAD",
-"e	c #84957F",
-"f	c #687B63",
-"g	c #5A6257",
-"h	c #C3CEBF",
-"i	c #84957E",
-"j	c #AEBDA9",
-"k	c #83957E",
-"l	c #4A5846",
-"m	c #465341",
-"n	c #7A9472",
-"o	c #728A6B",
-"p	c #5E7058",
-"q	c #6D8267",
-"r	c #4D5C49",
-"s	c #7B8678",
-"       .        ",
-"      +@.       ",
-"     +@@@.      ",
-"                ",
-"     ######     ",
-"    #$%&*=-#    ",
-"   ;>,')!~{]#   ",
-"   ;^/(!!!_:#   ",
-"   <[}|12345#   ",
-"   <67890abc#   ",
-"   <6d890ebf#   ",
-"   g6h890ibf#   ",
-"   <6j860klm#   ",
-"    <jnopqr#    ",
-"     s#####     ",
-"                "};
diff --git a/art/vfolder-16.xpm b/art/vfolder-16.xpm
deleted file mode 100644
index 29384beb77..0000000000
--- a/art/vfolder-16.xpm
+++ /dev/null
@@ -1,82 +0,0 @@
-/* XPM */
-static char * vfolder_xpm[] = {
-"16 16 63 1",
-" 	c None",
-".	c #000000",
-"+	c #CFCFCF",
-"@	c #FFFFFF",
-"#	c #E6E6E6",
-"$	c #E4E5DF",
-"%	c #D5D6CB",
-"&	c #D6D7CA",
-"*	c #A3A39D",
-"=	c #BABABA",
-"-	c #F5F6F0",
-";	c #ADB198",
-">	c #C2C6A9",
-",	c #C0C3A7",
-"'	c #B4B89D",
-")	c #6D705F",
-"!	c #EAECDB",
-"~	c #F6F6F4",
-"{	c #F0F0EA",
-"]	c #EFF0E7",
-"^	c #EEF0E5",
-"/	c #E8EAD8",
-"(	c #E6E8D5",
-"_	c #E5E8D4",
-":	c #E4E7D2",
-"<	c #C7C9B6",
-"[	c #F7F7F7",
-"}	c #DADEBF",
-"|	c #DADEBE",
-"1	c #D8DCBC",
-"2	c #D2D6B4",
-"3	c #CDD2AD",
-"4	c #CBD1AA",
-"5	c #95997C",
-"6	c #A3A3A3",
-"7	c #F0F1E7",
-"8	c #CFD4AF",
-"9	c #D1D5B2",
-"0	c #CED2AF",
-"a	c #C6CBA4",
-"b	c #C3C99E",
-"c	c #8D9270",
-"d	c #929292",
-"e	c #EFF1E5",
-"f	c #CACFA8",
-"g	c #C8CDA5",
-"h	c #C3C89D",
-"i	c #BFC598",
-"j	c #9B9B9B",
-"k	c #EBECDE",
-"l	c #C6CCA3",
-"m	c #C9CCB9",
-"n	c #929778",
-"o	c #919576",
-"p	c #8F9474",
-"q	c #8F9372",
-"r	c #666951",
-"s	c #969696",
-"t	c #878787",
-"u	c #7E7E7E",
-"v	c #8B8B8B",
-"w	c #919191",
-"x	c #888888",
-"   ...          ",
-"  .+@+. ... ..  ",
-" .+@@@#.+@+.#+. ",
-" .@@....@@@#@@+.",
-".+@.$%&*.@@@@@=.",
-".@.-;>,')....+. ",
-".+.!~{]^/(_:<.+.",
-" ..[}|1233345.6.",
-".#.78920aaabc.d.",
-".#.e34fghhhic.j.",
-" ..kfglhhhhic.. ",
-" ..mnopqccccr.s.",
-".+@..........t=.",
-".##.suuuv..wx+=.",
-" .. .#@+.  .... ",
-"     ...        "};
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/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 0049fa248e..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,5 +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>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index a21a0ea9c1..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,11702 +0,0 @@
-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 e17d581184..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
diff --git a/calendar/TODO b/calendar/TODO
deleted file mode 100644
index 4a5dd6c6ff..0000000000
--- a/calendar/TODO
+++ /dev/null
@@ -1,88 +0,0 @@
-Cal-util:
-
-- calobj.h depends on libversit/vcc.h, because it uses a VObject for
-  ical_object_create_from_vobject().  This should be an internal
-  function in the PCS and nothing else (we do not install libversit,
-  so our public libraries should not depend on it).
-
-- Or maybe we *should* install libversit, since the addressbook code
-  uses it as well.
-
-- timeutil has a lot of crap and some namespace pollution.  Clean it
-  up.
-
-PCS:
-
-- When loading a calendar, substitute duplicated UIDs by new ones, and
-  possibly print out a warning message.
-
------ Old Gnomecal TODO starts here -----
-
-Pilot:
-
-* Better support for untimed events (we have none now).
-
-* Hash objects based on their UIDs.
-
-* Add placeholders for deleted events, so that we can kill those
-  when syncing to the pilot.
-
-BUGS:
-
-- Recurrence end date is wrong.  An event that repeats daily will not
-  be included in the ending date of the recurrence (off-by-one
-  error?).
-
-- X-fields (extensions) are stripped from a vCal file when it is
-  saved.  They should be preserved.
-
-Features:
-
-- Add a calendar-week so that people know which week of the year it is
-
-Year view:
-
-- See why it is so fucking slow when opening its notebook page for the
-  first time.
-
-Month view:
-
-- Popup menu like in the year view.
-
-- Double click on a day takes you to the day view.
-
-- DnD of appointments to move them around.
-
-Week view:
-
-- Nice display as in the Palm Pilot.
-
-Day view:
-
-- Rewrite in terms of the canvas and make it pretty.
-
-Preferences:
-
-- BUG: 12/24 hours stuff is not consistent - I remember that on editing
-  new appointment you get the time-selectors always on 12-hr format
-
-Event editor dialog:
-
-- Make it figure out whether the alarm is in
-  minutes/hours/days/etc. (via a cascade of conditions) and set the
-  widgets appropriately.
-
-Gnome date selection widget:
-
-- Make the displayed date be localized properly -- use strftime().
-
-General:
-
-- Write online help.  Nice help.  Lots of help.
-
-- If you leave the calendar running overnight, the "current day"
-  marker in the GnomeMonthItems does not get updated.
-
-- Add categories support.  Color-coded categories.
-
-- Untimed events
diff --git a/calendar/cal-client/.cvsignore b/calendar/cal-client/.cvsignore
deleted file mode 100644
index 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 e7b32ca973..0000000000
--- a/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,89 +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			\
-	$(BONOBO_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libcal-client.la
-
-libcal_clientincludedir = $(includedir)/evolution/cal-client
-
-libcal_client_la_SOURCES =	\
-	$(CORBA_GENERATED)	\
-	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-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 =						\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.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-types.c b/calendar/cal-client/cal-client-types.c
deleted file mode 100644
index 5a31ed4530..0000000000
--- a/calendar/cal-client/cal-client-types.c
+++ /dev/null
@@ -1,53 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 4819d551be..0000000000
--- a/calendar/cal-client/cal-client-types.h
+++ /dev/null
@@ -1,51 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 4d2ba2805b..0000000000
--- a/calendar/cal-client/cal-client.c
+++ /dev/null
@@ -1,2023 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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 factory we are contacting */
-	GNOME_Evolution_Calendar_CalFactory factory;
-
-	/* 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;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_OPENED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	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 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;
-}
-
-/* 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[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[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);
-
-	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->factory = CORBA_OBJECT_NIL;
-	priv->timezones = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* create the WombatClient */
-	priv->w_client = wombat_client_new (
-		(WombatClientGetPasswordFn) client_get_password_cb,
-                (WombatClientForgetPasswordFn) client_forget_password_cb,
-                (gpointer) client);
-}
-
-/* Gets rid of the WombatClient that a client knows about */
-static void
-destroy_wombat_client (CalClient *client)
-{
-        CalClientPrivate *priv;
-
-        priv = client->priv;
-
-        if (!priv->w_client)
-                return;
-
-        bonobo_object_unref (BONOBO_OBJECT (priv->w_client));
-        priv->w_client = NULL;
-}
-
-/* Gets rid of the factory that a client knows about */
-static void
-destroy_factory (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_factory(): could not see if the factory was nil");
-		priv->factory = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_factory(): could not release the factory");
-
-	CORBA_exception_free (&ev);
-	priv->factory = CORBA_OBJECT_NIL;
-}
-
-/* Gets rid of the listener that a client knows about */
-static void
-destroy_listener (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = client->priv;
-
-	if (!priv->listener)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-}
-
-/* Gets rid of the calendar client interface object that a client knows about */
-static void
-destroy_cal (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_cal(): could not see if the "
-			   "calendar client interface object was nil");
-		priv->cal = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_unref (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not unref the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not release the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-	priv->cal = CORBA_OBJECT_NIL;
-
-}
-
-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;
-
-	destroy_wombat_client (client);
-	destroy_factory (client);
-	destroy_listener (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 (ev._major != CORBA_NO_EXCEPTION) {
-			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 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 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 the calendar factory of the
- * calendar server.
- *
- * Return value: The same object as the @client argument, or NULL if the
- * calendar factory could not be contacted.
- **/
-CalClient *
-cal_client_construct (CalClient *client)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_CalFactory factory, factory_copy;
-	CORBA_Environment ev;
-
-	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);
-	factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id (
-		"OAFIID:GNOME_Evolution_Wombat_CalendarFactory",
-		0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): Could not activate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-	factory_copy = CORBA_Object_duplicate (factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not duplicate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	priv->factory = factory_copy;
-	return client;
-}
-
-/**
- * cal_client_new:
- *
- * Creates a new calendar client.  It should be initialized by calling
- * cal_client_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;
-}
-
-/**
- * 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)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_Listener corba_listener;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == 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,
-					   obj_updated_cb,
-					   obj_removed_cb,
-					   client);
-	if (!priv->listener) {
-		g_message ("cal_client_open_calendar(): could not create the listener");
-		return FALSE;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (priv->listener),
-				     BONOBO_OBJECT (priv->w_client));
-
-	corba_listener = (GNOME_Evolution_Calendar_Listener) bonobo_object_corba_objref (
-		BONOBO_OBJECT (priv->listener));
-	
-	CORBA_exception_init (&ev);
-
-	priv->load_state = CAL_CLIENT_LOAD_LOADING;
-	priv->uri = g_strdup (str_uri);
-
-	GNOME_Evolution_Calendar_CalFactory_open (priv->factory, str_uri, only_if_exists,
-						  corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-
-		g_message ("cal_client_open_calendar(): open request failed");
-		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;
-	}
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/**
- * 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));
-}
-
-/**
- * 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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_n_objects(): could not get the number of objects");
-		CORBA_exception_free (&ev);
-		return -1;
-	}
-
-	CORBA_exception_free (&ev);
-	return n;
-}
-
-/**
- * cal_client_get_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @comp: Return value for the calendar component object.
- *
- * Queries a calendar for a calendar component object based on its unique
- * identifier.
- *
- * Return value: Result code based on the status of the operation.
- **/
-CalClientGetStatus
-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObj comp_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == 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 (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_object(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (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;
-	}
-
-	retval = CAL_CLIENT_GET_SUCCESS;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-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_print ("In cal_client_get_timezone: %s\n", tzid);
-
-	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;
-		g_print ("  zone is local time (NULL)\n");
-		return CAL_CLIENT_GET_SUCCESS;
-	}
-
-	/* If it is UTC, we return the special UTC timezone. */
-	if (!strcmp (tzid, "UTC")) {
-		*zone = icaltimezone_get_utc_timezone ();
-		g_print ("  zone is UTC\n");
-		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;
-		g_print ("  zone is in cache\n");
-		return CAL_CLIENT_GET_SUCCESS;
-	}
-
-	retval = CAL_CLIENT_GET_NOT_FOUND;
-	*zone = NULL;
-
-	g_print ("  getting zone from server\n");
-
-	/* 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 (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_timezone(): could not get the object");
-		goto out;
-	}
-
-	g_print ("  parsing zone:\n%s\n", comp_str);
-	icalcomp = icalparser_parse_string (comp_str);
-	CORBA_free (comp_str);
-
-	if (!icalcomp) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	g_print ("  creating icaltimezone\n");
-	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);
-
-	g_print ("  returning icaltimezone\n");
-	*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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_uids(): could not get the list of UIDs");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Builds a GList of 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 (ev._major != CORBA_NO_EXCEPTION) {
-		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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_objects_in_range(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/**
- * cal_client_get_free_busy
- * @client:: A calendar client.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Gets free/busy information from the calendar server
- */
-CalClientGetStatus
-cal_client_get_free_busy (CalClient *client, time_t start, time_t end, CalComponent **comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	CORBA_char *calobj;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, CAL_CLIENT_GET_NOT_FOUND);
-
-	g_return_val_if_fail (start != -1 && end != -1, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (start <= end, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	*comp = NULL;
-
-	CORBA_exception_init (&ev);
-
-	calobj = GNOME_Evolution_Calendar_Cal_getFreeBusy (priv->cal, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_free_busy(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return CAL_CLIENT_GET_NOT_FOUND;
-	}
-	CORBA_exception_free (&ev);
-
-	icalcomp = icalparser_parse_string (calobj);
-	CORBA_free (calobj);
-	if (!icalcomp) {
-		return CAL_CLIENT_GET_SYNTAX_ERROR;
-	}
-
-	*comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (*comp));
-		*comp = NULL;
-		return CAL_CLIENT_GET_SYNTAX_ERROR;
-	}
-
-	return CAL_CLIENT_GET_SUCCESS;
-}
-
-/* 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);
-		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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	alarms = build_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 (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
-		goto out;
-	}
-
-	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;
-};
-
-/* 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 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 we've already added it to the GHashTable. */
-	if (g_hash_table_lookup (data->timezone_hash, 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 converts the VEVENT/VTODO to a string. It checks if we need to send
-   any builtin timezones to the server along with the object.
-   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 (CalClient *client,
-				    CalComponent *comp)
-{
-	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 builtin 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;
-	icalcomponent_foreach_tzid (cal_component_get_icalcomponent (comp),
-				    foreach_tzid_callback, &cbdata);
-
-	/* 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");
-	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 (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_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 (client, comp);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_updateObjects (priv->cal, obj_string, &ev);
-	g_free (obj_string);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_InvalidObject) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_update_object(): could not update the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * 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 (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev),
-		    ex_GNOME_Evolution_Calendar_Cal_InvalidObject) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		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 (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_remove_object(): could not remove the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * 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);
-}
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
deleted file mode 100644
index 4681574289..0000000000
--- a/calendar/cal-client/cal-client.h
+++ /dev/null
@@ -1,157 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-/* 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 (* obj_updated) (CalClient *client, const char *uid);
-	void (* obj_removed) (CalClient *client, const char *uid);
-
-	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);
-
-gboolean cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists);
-
-CalClientLoadState cal_client_get_load_state (CalClient *client);
-
-const char *cal_client_get_uri (CalClient *client);
-
-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);
-
-CalClientGetStatus cal_client_get_free_busy (CalClient *client, time_t start, time_t end,
-					     CalComponent **comp);
-
-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);
-
-
-
-
-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 aeeccef7dc..0000000000
--- a/calendar/cal-client/cal-listener.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* Evolution calendar listener
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 {
-	/* The calendar this listener refers to */
-	GNOME_Evolution_Calendar_Cal cal;
-
-	/* Notification functions and their closure data */
-	CalListenerCalOpenedFn cal_opened_fn;
-	CalListenerObjUpdatedFn obj_updated_fn;
-	CalListenerObjRemovedFn obj_removed_fn;
-	gpointer fn_data;
-};
-
-
-
-static void cal_listener_class_init (CalListenerClass *class);
-static void cal_listener_init (CalListener *listener);
-static void cal_listener_destroy (GtkObject *object);
-
-static POA_GNOME_Evolution_Calendar_Listener__vepv cal_listener_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_listener_get_type:
- * @void:
- *
- * Registers the #CalListener class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalListener class.
- **/
-GtkType
-cal_listener_get_type (void)
-{
-	static GtkType cal_listener_type = 0;
-
-	if (!cal_listener_type) {
-		static const GtkTypeInfo cal_listener_info = {
-			"CalListener",
-			sizeof (CalListener),
-			sizeof (CalListenerClass),
-			(GtkClassInitFunc) cal_listener_class_init,
-			(GtkObjectInitFunc) cal_listener_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info);
-	}
-
-	return cal_listener_type;
-}
-
-/* CORBA class initialization function for the calendar listener */
-static void
-init_cal_listener_corba_class (void)
-{
-	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_listener_vepv.GNOME_Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
-}
-
-/* Class initialization function for the calendar listener */
-static void
-cal_listener_class_init (CalListenerClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = cal_listener_destroy;
-
-	init_cal_listener_corba_class ();
-}
-
-/* Object initialization function for the calendar listener */
-static void
-cal_listener_init (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	priv = g_new0 (CalListenerPrivate, 1);
-	listener->priv = priv;
-
-	priv->cal = CORBA_OBJECT_NIL;
-	priv->cal_opened_fn = NULL;
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-}
-
-/* Destroy handler for the calendar listener */
-static void
-cal_listener_destroy (GtkObject *object)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment ev;
-	gboolean result;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (object));
-
-	listener = CAL_LISTENER (object);
-	priv = listener->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_listener_destroy(): could not see if the calendar was NIL");
-	else if (!result) {
-		CORBA_exception_free (&ev);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->cal, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("cal_listener_destroy(): could not release the calendar");
-
-		priv->cal = CORBA_OBJECT_NIL;
-	}
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-	listener->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Listener::notifyCalOpened method */
-static void
-Listener_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->cal != CORBA_OBJECT_NIL) {
-		g_message ("Listener_notifyCalOpened(): calendar was already open!");
-		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);
-
-	priv->cal = cal_copy;
-
-	g_assert (priv->cal_opened_fn != NULL);
-	(* priv->cal_opened_fn) (listener, status, cal, priv->fn_data);
-}
-
-/* Listener::notifyObjUpdated method */
-static void
-Listener_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;
-
-	g_assert (priv->obj_updated_fn != NULL);
-	(* priv->obj_updated_fn) (listener, uid, priv->fn_data);
-}
-
-/* Listener::notifyObjRemoved method */
-static void
-Listener_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;
-
-	g_assert (priv->obj_removed_fn != NULL);
-	(* priv->obj_removed_fn) (listener, uid, priv->fn_data);
-}
-
-/**
- * cal_listener_get_epv:
- * @void:
- *
- * Creates an EPV for the Listener CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_GNOME_Evolution_Calendar_Listener__epv *
-cal_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Calendar_Listener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Calendar_Listener__epv, 1);
-	epv->notifyCalOpened  = Listener_notifyCalOpened;
-	epv->notifyObjUpdated = Listener_notifyObjUpdated;
-	epv->notifyObjRemoved = Listener_notifyObjRemoved;
-	return epv;
-}
-
-
-
-/**
- * cal_listener_construct:
- * @listener: A calendar listener.
- * @corba_listener: CORBA object for the 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.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Constructs a calendar listener by binding the corresponding CORBA object to
- * it.
- *
- * Return value: the same object as the @listener argument.
- **/
-CalListener *
-cal_listener_construct (CalListener *listener,
-			GNOME_Evolution_Calendar_Listener corba_listener,
-			CalListenerCalOpenedFn cal_opened_fn,
-			CalListenerObjUpdatedFn obj_updated_fn,
-			CalListenerObjRemovedFn obj_removed_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 (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-
-	priv = listener->priv;
-
-	priv->cal_opened_fn = cal_opened_fn;
-	priv->obj_updated_fn = obj_updated_fn;
-	priv->obj_removed_fn = obj_removed_fn;
-	priv->fn_data = fn_data;
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener);
-	return listener;
-}
-
-/**
- * cal_listener_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar listener @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-GNOME_Evolution_Calendar_Listener
-cal_listener_corba_object_create (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Calendar_Listener *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * 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.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Creates a new #CalListener object.
- *
- * Return value: A newly-created #CalListener, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-CalListener *
-cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-		  CalListenerObjUpdatedFn obj_updated_fn,
-		  CalListenerObjRemovedFn obj_removed_fn,
-		  gpointer fn_data)
-{
-	CalListener *listener;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_Listener corba_listener;
-	gboolean result;
-
-	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);
-
-	listener = gtk_type_new (CAL_LISTENER_TYPE);
-
-	corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (corba_listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION || result) {
-		g_message ("cal_listener_new(): could not create the CORBA listener");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_listener_construct (listener,
-				       corba_listener,
-				       cal_opened_fn,
-				       obj_updated_fn,
-				       obj_removed_fn,
-				       fn_data);
-}
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
deleted file mode 100644
index fa9209cc79..0000000000
--- a/calendar/cal-client/cal-listener.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Evolution calendar listener
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_LISTENER_H
-#define CAL_LISTENER_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_LISTENER_TYPE            (cal_listener_get_type ())
-#define CAL_LISTENER(obj)            (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener))
-#define CAL_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE,	\
-				      CalListenerClass))
-#define IS_CAL_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE))
-#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE))
-
-typedef struct _CalListener CalListener;
-typedef struct _CalListenerClass CalListenerClass;
-
-typedef struct _CalListenerPrivate CalListenerPrivate;
-
-struct _CalListener {
-	BonoboObject object;
-
-	/* Private data */
-	CalListenerPrivate *priv;
-};
-
-struct _CalListenerClass {
-	BonoboObjectClass parent_class;
-};
-
-/* Notification functions */
-typedef void (* CalListenerCalOpenedFn) (CalListener *listener,
-					 GNOME_Evolution_Calendar_Listener_OpenStatus status,
-					 GNOME_Evolution_Calendar_Cal cal,
-					 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);
-
-
-GtkType cal_listener_get_type (void);
-
-CalListener *cal_listener_construct (CalListener *listener,
-				     GNOME_Evolution_Calendar_Listener corba_listener,
-				     CalListenerCalOpenedFn cal_opened_fn,
-				     CalListenerObjUpdatedFn obj_updated_fn,
-				     CalListenerObjRemovedFn obj_removed_fn,
-				     gpointer fn_data);
-
-GNOME_Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
-
-CalListener *cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-			       CalListenerObjUpdatedFn obj_updated_fn,
-			       CalListenerObjRemovedFn obj_removed_fn,
-			       gpointer fn_data);
-
-POA_GNOME_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
-
-
-
-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 727a2dcb3b..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-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 */
-	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 (ev._major != CORBA_NO_EXCEPTION)
-			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 (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev),
-		       ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate) == 0) {
-		g_message ("cal_query_construct(): The server could not create the query");
-		goto error;
-	} else if (ev._major != CORBA_NO_EXCEPTION) {
-		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;
-	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 53bc7382da..0000000000
--- a/calendar/cal-client/cal-query.h
+++ /dev/null
@@ -1,82 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 fc4ef639fd..0000000000
--- a/calendar/cal-client/client-test.c
+++ /dev/null
@@ -1,216 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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"
-
-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)
-		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)
-{
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	textdomain (PACKAGE);
-
-	gnome_init ("tl-test", VERSION, argc, argv);
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): could not initialize Bonobo");
-		exit (1);
-	}
-
-	create_client (&client1, "/tmp/calendar.ics", FALSE);
-	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 980b0a1ece..0000000000
--- a/calendar/cal-client/query-listener.c
+++ /dev/null
@@ -1,281 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-};
-
-
-
-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;
-}
-
-/* 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;
-
-	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;
-
-	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;
-
-	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;
-
-	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;
-
-	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);
-}
diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h
deleted file mode 100644
index 53be9f3229..0000000000
--- a/calendar/cal-client/query-listener.h
+++ /dev/null
@@ -1,96 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-
-
-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 80c8da2662..0000000000
--- a/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-noinst_PROGRAMS = test-recur
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"cal-util\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/calendar			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-        $(GNOME_INCLUDEDIR)
-
-#
-# cal util library
-#
-
-lib_LTLIBRARIES = libcal-util.la
-
-libcal_util_la_SOURCES = 	\
-	cal-component.c		\
-	cal-recur.c		\
-	cal-util.c		\
-	timeutil.c
-
-libcal_utilincludedir = $(includedir)/evolution/cal-util
-
-libcal_utilinclude_HEADERS =	\
-	cal-component.h		\
-	cal-recur.h		\
-	cal-util.h		\
-	timeutil.h
-
-#
-# static library for use in conduits' shared libraries
-#
-noinst_LTLIBRARIES = libcal-util-static.la
-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
-libcal_util_static_la_LDFLAGS = --all-static
-
-test_recur_SOURCES = 	\
-	 test-recur.c
-
-test_recur_LDADD = 	\
-	 libcal-util.la	\
-	 $(top_builddir)/libversit/libversit.la		\
-	 $(top_builddir)/libical/src/libical/libical.la	\
-	 $(EXTRA_GNOME_LIBS)
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
deleted file mode 100644
index 596618733d..0000000000
--- a/calendar/cal-util/cal-component.c
+++ /dev/null
@@ -1,4974 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "cal-component.h"
-#include "timeutil.h"
-
-
-
-/* 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;
-	icalproperty *created;
-
-	GSList *description_list; /* list of struct text */
-
-	struct datetime {
-		icalproperty *prop;
-		icalparameter *tzid_param;
-	};
-
-	struct datetime dtstart;
-	struct datetime dtend;
-
-	icalproperty *dtstamp;
-
-	struct datetime due;
-
-	GSList *exdate_list; /* list of 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;
-
-	/* 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)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!priv->icalcomp)
-		return;
-
-	/* Free the icalcomponent */
-
-	if (icalcomponent_get_parent (priv->icalcomp) == NULL)
-		icalcomponent_free (priv->icalcomp);
-
-	priv->icalcomp = NULL;
-
-	/* Free the mappings */
-
-	priv->uid = NULL;
-
-	priv->status = NULL;
-
-	priv->categories = NULL;
-
-	priv->classification = NULL;
-	priv->comment_list = NULL;
-	priv->completed = NULL;
-	priv->created = NULL;
-
-	priv->description_list = free_slist (priv->description_list);
-
-	priv->dtend.prop = NULL;
-	priv->dtend.tzid_param = NULL;
-
-	priv->dtstamp = NULL;
-
-	priv->dtstart.prop = NULL;
-	priv->dtstart.tzid_param = NULL;
-
-	priv->due.prop = NULL;
-	priv->due.tzid_param = NULL;
-
-	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;
-
-	/* 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);
-	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_CREATED_PROPERTY:
-		priv->created = prop;
-		break;
-
-	case ICAL_DESCRIPTION_PROPERTY:
-		scan_text (comp, &priv->description_list, prop);
-		break;
-
-	case ICAL_DTEND_PROPERTY:
-		scan_datetime (comp, &priv->dtend, prop);
-		break;
-
-	case ICAL_DTSTAMP_PROPERTY:
-		priv->dtstamp = prop;
-		break;
-
-	case ICAL_DTSTART_PROPERTY:
-		scan_datetime (comp, &priv->dtstart, prop);
-		break;
-
-	case ICAL_DUE_PROPERTY:
-		scan_datetime (comp, &priv->due, prop);
-		break;
-
-	case ICAL_EXDATE_PROPERTY:
-		scan_exdate (comp, prop);
-		break;
-
-	case ICAL_EXRULE_PROPERTY:
-		scan_recur (comp, &priv->exrule_list, prop);
-		break;
-
-	case ICAL_GEO_PROPERTY:
-		priv->geo = prop;
-		break;
-
-	case ICAL_LASTMODIFIED_PROPERTY:
-		priv->last_modified = prop;
-		break;
-
-	case ICAL_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;
-
-	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);
-
-	if (type == CAL_COMPONENT_NO_TYPE)
-		return;
-
-	/* Figure out the kind and create the icalcomponent */
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		kind = ICAL_VEVENT_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		kind = ICAL_VTODO_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		kind = ICAL_VJOURNAL_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_FREEBUSY:
-		kind = ICAL_VFREEBUSY_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TIMEZONE:
-		kind = ICAL_VTIMEZONE_COMPONENT;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		kind = ICAL_NO_COMPONENT;
-	}
-
-	icalcomp = icalcomponent_new (kind);
-	if (!icalcomp) {
-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");
-		return;
-	}
-
-	/* Scan the component to build our mapping table */
-
-	priv->icalcomp = icalcomp;
-	scan_icalcomponent (comp);
-
-	/* Add missing stuff */
-
-	ensure_mandatory_properties (comp);
-}
-
-/**
- * cal_component_set_icalcomponent:
- * @comp: A calendar component object.
- * @icalcomp: An #icalcomponent.
- *
- * Sets the contents of a calendar component object from an #icalcomponent
- * structure.  If the @comp already had an #icalcomponent set into it, it will
- * will be freed automatically if the #icalcomponent does not have a parent
- * component itself.
- *
- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.
- *
- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component
- * type.
- **/
-gboolean
-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-
-	if (priv->icalcomp == icalcomp)
-		return TRUE;
-
-	free_icalcomponent (comp);
-
-	if (!icalcomp) {
-		priv->icalcomp = NULL;
-		return TRUE;
-	}
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT
-	      || kind == ICAL_VFREEBUSY_COMPONENT
-	      || kind == ICAL_VTIMEZONE_COMPONENT))
-		return FALSE;
-
-	priv->icalcomp = icalcomp;
-
-	scan_icalcomponent (comp);
-	ensure_mandatory_properties (comp);
-
-	return TRUE;
-}
-
-/**
- * cal_component_get_icalcomponent:
- * @comp: A calendar component object.
- *
- * Queries the #icalcomponent structure that a calendar component object is
- * wrapping.
- *
- * Return value: An #icalcomponent structure, or NULL if the @comp has no
- * #icalcomponent set to it.
- **/
-icalcomponent *
-cal_component_get_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	return priv->icalcomp;
-}
-
-/**
- * cal_component_get_vtype:
- * @comp: A calendar component object.
- *
- * Queries the type of a calendar component object.
- *
- * Return value: The type of the component, as defined by RFC 2445.
- **/
-CalComponentVType
-cal_component_get_vtype (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, CAL_COMPONENT_NO_TYPE);
-
-	kind = icalcomponent_isa (priv->icalcomp);
-	switch (kind) {
-	case ICAL_VEVENT_COMPONENT:
-		return CAL_COMPONENT_EVENT;
-
-	case ICAL_VTODO_COMPONENT:
-		return CAL_COMPONENT_TODO;
-
-	case ICAL_VJOURNAL_COMPONENT:
-		return CAL_COMPONENT_JOURNAL;
-
-	case ICAL_VFREEBUSY_COMPONENT:
-		return CAL_COMPONENT_FREEBUSY;
-
-	case ICAL_VTIMEZONE_COMPONENT:
-		return CAL_COMPONENT_TIMEZONE;
-
-	default:
-		/* We should have been loaded with a supported type! */
-		g_assert_not_reached ();
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/**
- * cal_component_get_as_string:
- * @comp: A calendar component.
- *
- * Gets the iCalendar string representation of a calendar component.  You should
- * call cal_component_commit_sequence() before this function to ensure that the
- * component's sequence number is consistent with the state of the object.
- *
- * Return value: String representation of the calendar component according to
- * RFC 2445.
- **/
-char *
-cal_component_get_as_string (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	char *str, *buf;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	/* Ensure that the user has committed the new SEQUENCE */
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	/* We dup the string; libical owns that memory */
-
-	str = icalcomponent_as_ical_string (priv->icalcomp);
-
-	if (str)
-		buf = g_strdup (str);
-	else
-		buf = NULL;
-
-	return buf;
-}
-
-/**
- * cal_component_commit_sequence:
- * @comp:
- *
- * Increments the sequence number property in a calendar component object if it
- * needs it.  This needs to be done when any of a number of properties listed in
- * RFC 2445 change values, such as the start and end dates of a component.
- *
- * This function must be called before calling cal_component_get_as_string() to
- * ensure that the component is fully consistent.
- **/
-void
-cal_component_commit_sequence (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->need_sequence_inc)
-		return;
-
-	if (priv->sequence) {
-		int seq;
-
-		seq = icalproperty_get_sequence (priv->sequence);
-		icalproperty_set_sequence (priv->sequence, seq + 1);
-	} else {
-		/* The component had no SEQUENCE property, so assume that the
-		 * default would have been zero.  Since it needed incrementing
-		 * anyways, we use a value of 1 here.
-		 */
-		priv->sequence = icalproperty_new_sequence (1);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/**
- * cal_component_get_uid:
- * @comp: A calendar component object.
- * @uid: Return value for the UID string.
- *
- * Queries the unique identifier of a calendar component object.
- **/
-void
-cal_component_get_uid (CalComponent *comp, const char **uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	*uid = icalproperty_get_uid (priv->uid);
-}
-
-/**
- * cal_component_set_uid:
- * @comp: A calendar component object.
- * @uid: Unique identifier.
- *
- * Sets the unique identifier string of a calendar component object.
- **/
-void
-cal_component_set_uid (CalComponent *comp, const char *uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	icalproperty_set_uid (priv->uid, (char *) uid);
-}
-
-/**
- * cal_component_get_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);
-}
-
-/* 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 = icalparameter_get_tzid (datetime->tzid_param);
-	else if (dt->value && dt->value->is_utc)
-		dt->tzid = "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 (!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;
-
-	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;
-	}
-}
-
-/**
- * cal_component_get_dtend:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time end.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time end of a calendar component object.
- **/
-void
-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtend, icalproperty_get_dtend, dt);
-}
-
-/**
- * cal_component_set_dtend:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the date/time end property of a calendar component object.
- **/
-void
-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtend,
-		      icalproperty_new_dtend,
-		      icalproperty_set_dtend,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_dtstamp:
- * @comp: A calendar component object.
- * @t: 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);
-}
-
-/**
- * cal_component_set_due:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the due date/time property of a calendar component object.
- **/
-void
-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->due,
-		      icalproperty_new_due,
-		      icalproperty_set_due,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */
-static void
-get_period_list (GSList *period_list,
-		 struct 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 = 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;
-
-		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_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) {
-			switch (icalparameter_get_cutype (attendee->cutype_param)) {
-			case ICAL_CUTYPE_INDIVIDUAL:
-				a->cutype = CAL_COMPONENT_CUTYPE_INDIVIDUAL;
-				break;
-			case ICAL_CUTYPE_GROUP:
-				a->cutype = CAL_COMPONENT_CUTYPE_GROUP;
-				break;
-			case ICAL_CUTYPE_RESOURCE:
-				a->cutype = CAL_COMPONENT_CUTYPE_RESOURCE;
-				break;
-			case ICAL_CUTYPE_ROOM:
-				a->cutype = CAL_COMPONENT_CUTYPE_ROOM;
-				break;
-			default:
-				a->cutype = CAL_COMPONENT_CUTYPE_UNKNOWN;
-			}
-		}
-			
-		if (attendee->role_param) {
-			switch (icalparameter_get_role (attendee->role_param)) {
-			case ICAL_ROLE_CHAIR:
-				a->role = CAL_COMPONENT_ROLE_CHAIR;
-				break;
-			case ICAL_ROLE_REQPARTICIPANT:
-				a->role = CAL_COMPONENT_ROLE_REQUIRED;
-				break;
-			case ICAL_ROLE_OPTPARTICIPANT:
-				a->role = CAL_COMPONENT_ROLE_OPTIONAL;
-				break;
-			case ICAL_ROLE_NONPARTICIPANT:
-				a->role = CAL_COMPONENT_ROLE_NON;
-				break;
-			default:
-				a->role = CAL_COMPONENT_ROLE_UNKNOWN;
-			}
-		}
-
-		if (attendee->partstat_param) {
-			switch (icalparameter_get_role (attendee->partstat_param)) {
-			case ICAL_PARTSTAT_NEEDSACTION:
-				a->status = CAL_COMPONENT_PARTSTAT_NEEDSACTION;
-				break;
-			case ICAL_PARTSTAT_ACCEPTED:
-				a->status = CAL_COMPONENT_PARTSTAT_ACCEPTED;
-				break;
-			case ICAL_PARTSTAT_DECLINED:
-				a->status = CAL_COMPONENT_PARTSTAT_DECLINED;
-				break;
-			case ICAL_PARTSTAT_TENTATIVE:
-				a->status = CAL_COMPONENT_PARTSTAT_TENTATIVE;
-				break;
-			case ICAL_PARTSTAT_DELEGATED:
-				a->status = CAL_COMPONENT_PARTSTAT_DELEGATED;
-				break;
-			case ICAL_PARTSTAT_COMPLETED:
-				a->status = CAL_COMPONENT_PARTSTAT_COMPLETED;
-				break;
-			case ICAL_PARTSTAT_INPROCESS:
-				a->status = CAL_COMPONENT_PARTSTAT_INPROCESS;
-				break;
-			default:
-				a->status = CAL_COMPONENT_PARTSTAT_UNKNOWN;
-			}
-		}
-
-		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;
-		icalparameter_cutype ct;
-		icalparameter_role r;
-		icalparameter_partstat p;
-
-		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);
-		}
-
-		switch (a->cutype) {
-			case CAL_COMPONENT_CUTYPE_INDIVIDUAL:
-				ct = ICAL_CUTYPE_INDIVIDUAL;
-				break;
-			case CAL_COMPONENT_CUTYPE_GROUP:
-				ct = ICAL_CUTYPE_GROUP;
-				break;
-			case CAL_COMPONENT_CUTYPE_RESOURCE:
-				ct = ICAL_CUTYPE_RESOURCE;
-				break;
-			case CAL_COMPONENT_CUTYPE_ROOM:
-				ct = ICAL_CUTYPE_ROOM;
-				break;
-			default:
-				ct = ICAL_CUTYPE_UNKNOWN;
-		}
-		attendee->cutype_param = icalparameter_new_cutype (ct);
-		icalproperty_add_parameter (attendee->prop, attendee->cutype_param);
-
-		switch (a->role) {
-			case CAL_COMPONENT_ROLE_CHAIR:
-				r = ICAL_ROLE_CHAIR;
-				break;
-			case CAL_COMPONENT_ROLE_REQUIRED:
-				r = ICAL_ROLE_REQPARTICIPANT;
-				break;
-			case CAL_COMPONENT_ROLE_OPTIONAL:
-				r = ICAL_ROLE_OPTPARTICIPANT;
-				break;
-			case CAL_COMPONENT_ROLE_NON:
-				r = ICAL_ROLE_NONPARTICIPANT;
-				break;
-			default:
-				r = ICAL_ROLE_NONE;
-		}
-		attendee->role_param = icalparameter_new_role (r);
-		icalproperty_add_parameter (attendee->prop, attendee->role_param);
-
-		switch (a->status) {
-			case CAL_COMPONENT_PARTSTAT_NEEDSACTION:
-				p = ICAL_PARTSTAT_NEEDSACTION;
-				break;
-			case CAL_COMPONENT_PARTSTAT_ACCEPTED:
-				p = ICAL_PARTSTAT_ACCEPTED;
-				break;
-			case CAL_COMPONENT_PARTSTAT_DECLINED:
-				p = ICAL_PARTSTAT_DECLINED;
-				break;
-			case CAL_COMPONENT_PARTSTAT_TENTATIVE:
-				p = ICAL_PARTSTAT_TENTATIVE;
-				break;
-			case CAL_COMPONENT_PARTSTAT_DELEGATED:
-				p = ICAL_PARTSTAT_DELEGATED;
-				break;
-			case CAL_COMPONENT_PARTSTAT_COMPLETED:
-				p = ICAL_PARTSTAT_COMPLETED;
-				break;
-			case CAL_COMPONENT_PARTSTAT_INPROCESS:
-				p = ICAL_PARTSTAT_INPROCESS;
-				break;
-			default:
-				p = ICAL_PARTSTAT_NONE;
-		}
-		attendee->partstat_param = icalparameter_new_partstat (p);
-		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);
-}
-
-
-
-
-/**
- * cal_component_free_categories_list:
- * @categ_list: List of category strings.
- *
- * Frees a list of category strings.
- **/
-void
-cal_component_free_categories_list (GSList *categ_list)
-{
-	GSList *l;
-
-	for (l = categ_list; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (categ_list);
-}
-
-/**
- * cal_component_free_datetime:
- * @dt: A date/time structure.
- *
- * Frees a date/time structure.
- **/
-void
-cal_component_free_datetime (CalComponentDateTime *dt)
-{
-	g_return_if_fail (dt != NULL);
-
-	if (dt->value)
-		g_free (dt->value);
-}
-
-/**
- * cal_component_free_exdate_list:
- * @exdate_list: List of #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 (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);
-}
-
-
-/* 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;
-}
-
-/* Used from g_hash_table_foreach(); adds an alarm UID to a list */
-static void
-add_alarm_uid (gpointer key, gpointer value, gpointer data)
-{
-	const char *auid;
-	GList **l;
-
-	auid = key;
-	l = data;
-
-	*l = g_list_prepend (*l, g_strdup (auid));
-}
-
-/**
- * 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;
-	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;
-	g_hash_table_foreach (priv->alarm_uid_hash, add_alarm_uid, &l);
-
-	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 icalattachtype_free().
- * 
- * Queries the attachment property of an alarm.
- **/
-void
-cal_component_alarm_get_attach (CalComponentAlarm *alarm, struct icalattachtype **attach)
-{
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (attach != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (alarm->attach) {
-		*attach = icalattachtype_new ();
-		**attach = icalproperty_get_attach (alarm->attach);
-		/* FIXME: This is bogus in libical; icalattachtype is supposed
-		 * to be refcounted but the property functions return it by
-		 * value.
-		 */
-	} 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, struct icalattachtype *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;
-
-	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)
-			return FALSE;
-	} else {
-		if (icaltime_compare (*comp1_dtstart.value,
-				      *comp2_dtstart.value))
-			return FALSE;
-	}
-
-	if (comp1_dtend.value == NULL || comp2_dtend.value == NULL) {
-		if (comp1_dtend.value != comp2_dtend.value)
-			return FALSE;
-	} else {
-		if (icaltime_compare (*comp1_dtend.value,
-				      *comp2_dtend.value))
-			return FALSE;
-	}
-
-	/* Now check the timezones. */
-	if (!cal_component_strings_match (comp1_dtstart.tzid,
-					  comp2_dtstart.tzid))
-		return FALSE;
-
-	if (!cal_component_strings_match (comp1_dtend.tzid,
-					  comp2_dtend.tzid))
-		return FALSE;
-
-	return TRUE;
-}
-
-/* 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;
-}
-
-/* Returns TRUE if the component uses the given timezones for both DTSTART
-   and DTEND. */
-gboolean
-cal_component_compare_event_timezone (CalComponent *comp, icaltimezone *zone)
-{
-	CalComponentDateTime datetime;
-	const char *tzid;
-	gboolean match;
-
-	tzid = icaltimezone_get_tzid (zone);
-
-	cal_component_get_dtstart (comp, &datetime);
-	match = cal_component_compare_tzid (tzid, datetime.tzid);
-	cal_component_free_datetime (&datetime);
-	if (!match)
-		return FALSE;
-
-	/* FIXME: DURATION may be used instead. */
-	cal_component_get_dtend (comp, &datetime);
-	match = cal_component_compare_tzid (tzid, datetime.tzid);
-	cal_component_free_datetime (&datetime);
-
-	return match;
-}
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
deleted file mode 100644
index f0628cb967..0000000000
--- a/calendar/cal-util/cal-component.h
+++ /dev/null
@@ -1,456 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 */
-	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 enum {
-	CAL_COMPONENT_CUTYPE_INDIVIDUAL,
-	CAL_COMPONENT_CUTYPE_GROUP,
-	CAL_COMPONENT_CUTYPE_RESOURCE,
-	CAL_COMPONENT_CUTYPE_ROOM,
-	CAL_COMPONENT_CUTYPE_UNKNOWN
-} CalComponentCUType;
-
-typedef enum {
-	CAL_COMPONENT_ROLE_CHAIR,
-	CAL_COMPONENT_ROLE_REQUIRED,
-	CAL_COMPONENT_ROLE_OPTIONAL,
-	CAL_COMPONENT_ROLE_NON,
-	CAL_COMPONENT_ROLE_UNKNOWN
-} CalComponentRole;
-
-typedef enum {
-	CAL_COMPONENT_PARTSTAT_NEEDSACTION,
-	CAL_COMPONENT_PARTSTAT_ACCEPTED,
-	CAL_COMPONENT_PARTSTAT_DECLINED,
-	CAL_COMPONENT_PARTSTAT_TENTATIVE,
-	CAL_COMPONENT_PARTSTAT_DELEGATED,
-	CAL_COMPONENT_PARTSTAT_COMPLETED,
-	CAL_COMPONENT_PARTSTAT_INPROCESS,
-	CAL_COMPONENT_PARTSTAT_UNKNOWN
-} CalComponentPartStat;
-	
-typedef struct {
-	const char *value;
-	
-	const char *member;
-	CalComponentCUType cutype;
-	CalComponentRole role;
-	CalComponentPartStat 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);
-
-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_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);
-
-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_event_dates_match (CalComponent *comp1, CalComponent *comp2);
-
-/* Returns TRUE if the component uses the given timezones for both DTSTART
-   and DTEND. */
-gboolean cal_component_compare_event_timezone (CalComponent *comp, icaltimezone *zone);
-
-/* 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);
-
-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, struct icalattachtype **attach);
-void cal_component_alarm_set_attach (CalComponentAlarm *alarm, struct icalattachtype *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 13c9f0533f..0000000000
--- a/calendar/cal-util/cal-recur.c
+++ /dev/null
@@ -1,3881 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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.
- */
-
-/* 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);
-
-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,
-						    gboolean exception,
-						    icaltimezone *zone);
-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,
-						 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);
-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)
-{
-#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);
-}
-
-
-/*
- * 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)
-{
-	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;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (cb != NULL);
-	g_return_if_fail (start >= -1);
-	g_return_if_fail (end >= -1);
-
-	/* Get dtstart, dtend, recurrences, and exceptions */
-
-	cal_component_get_dtstart (comp, &dtstart);
-	cal_component_get_dtend (comp, &dtend);
-
-	if (!dtstart.value) {
-		g_message ("cal_recur_generate_instances_of_rule(): bogus "
-			   "component, does not have DTSTART.  Skipping...");
-		goto out;
-	}
-
-	if (dtstart.tzid && tz_cb)
-		start_zone = (*tz_cb) (dtstart.tzid, tz_cb_data);
-	if (dtend.tzid && tz_cb)
-		end_zone = (*tz_cb) (dtend.tzid, tz_cb_data);
-
-	dtstart_time = icaltime_as_timet_with_zone (*dtstart.value,
-						    start_zone);
-	if (start == -1)
-		start = dtstart_time;
-
-	/* FIXME: DURATION could be used instead, couldn't it? - Damon */
-	if (!dtend.value) {
-		*dtend.value = *dtstart.value;
-		dtend.value->hour = 0;
-		dtend.value->minute = 0;
-		dtend.value->second = 0;
-		icaltime_adjust (dtend.value, 1, 0, 0, 0);
-	}
-	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++) {
-		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,
-						   cb, cb_data))
-			break;
-	}
-
-	if (!prop) {
-		cal_component_free_period_list (rdates);
-		cal_component_free_exdate_list (exdates);
-	}
-
- out:
-	cal_component_free_datetime (&dtstart);
-	cal_component_free_datetime (&dtend);
-}
-
-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a
- * struct icalrecurrencetype.
- */
-static GList *
-array_to_list (short *array, int max_elements)
-{
-	GList *l;
-	int i;
-
-	l = NULL;
-
-	for (i = 0; i < max_elements && array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)
-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));
-	return g_list_reverse (l);
-}
-
-/**
- * cal_recur_from_icalproperty:
- * @ir: An RRULE or EXRULE #icalproperty.
- * @zone: The DTSTART timezone, used for converting the UNTIL property if it
- * is given as a DATE value.
- * 
- * 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)
-{
-	struct icalrecurrencetype ir;
-	CalRecurrence *r;
-	gint max_elements, i;
-
-	g_return_val_if_fail (prop != NULL, NULL);
-
-	r = g_new (CalRecurrence, 1);
-
-	if (exception)
-		ir = icalproperty_get_exrule (prop);
-	else
-		ir = icalproperty_get_rrule (prop);
-
-	r->freq = ir.freq;
-	r->interval = ir.interval;
-
-	if (ir.count != 0) {
-		/* If COUNT is set, we use the pre-calculated enddate. */
-		r->enddate = cal_recur_get_rule_end_date (prop);
-	} 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;
-
-			r->enddate = icaltime_as_timet_with_zone (ir.until,
-								  zone);
-		} 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]));
-
-	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,
-			      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);
-
-		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);
-
-		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;
-
-		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);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year & month, as we may have gone past
-			   the end. */
-			occ->year = year;
-			occ->month = month;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint 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) != -1)
-			return FALSE;
-	}
-
-	/* Calculate the end date. */
-	cb_data.count = rule.count;
-	cb_data.instances = 0;
-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-					      cal_recur_ensure_rule_end_date_cb,
-					      &cb_data, tz_cb, tz_cb_data);
-
-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the
-	   rule. */
-	cal_recur_set_rule_end_date (prop, cb_data.end_date);
-		
-	return TRUE;
-}
-
-
-static gboolean
-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data)
-{
-	CalRecurEnsureEndDateData *cb_data;
-
-	cb_data = (CalRecurEnsureEndDateData*) data;
-
-	cb_data->instances++;
-
-	if (cb_data->instances == cb_data->count) {
-		cb_data->end_date = instance_start;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static time_t
-cal_recur_get_rule_end_date	(icalproperty	*prop)
-{
-	icalparameter *param;
-	const char *xname, *xvalue;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-	icaltimezone *utc_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);
-
-				utc_zone = icaltimezone_get_utc_timezone ();
-				return icaltime_as_timet_with_zone (icaltime,
-								    utc_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 921a230de4..0000000000
--- a/calendar/cal-util/cal-recur.h
+++ /dev/null
@@ -1,66 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.
- */
-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);
-
-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 bb1b8a2f51..0000000000
--- a/calendar/cal-util/cal-util.c
+++ /dev/null
@@ -1,100 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-util.h"
-
-
-
-/**
- * cal_obj_instance_list_free:
- * @list: List of #CalObjInstance structures.
- * 
- * Frees a list of #CalObjInstance structures.
- **/
-void
-cal_obj_instance_list_free (GList *list)
-{
-	CalObjInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_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;
-}
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
deleted file mode 100644
index 1333bc3334..0000000000
--- a/calendar/cal-util/cal-util.h
+++ /dev/null
@@ -1,61 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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>
-
-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;
-
-void cal_obj_uid_list_free (GList *list);
-
-icalcomponent *cal_util_new_top_level (void);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
deleted file mode 100644
index 4ffd180c15..0000000000
--- a/calendar/cal-util/calobj.c
+++ /dev/null
@@ -1,2008 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Calendar objects implementations.
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Federico Mena (quartic@gimp.org)
- */
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <time.h>
-#include "calobj.h"
-#include "timeutil.h"
-#include "libversit/vcc.h"
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-
-/* VCalendar product ID */
-#define PRODID "-//Ximian//NONSGML Evolution Calendar//EN"
-
-static gint compare_exdates (gconstpointer a, gconstpointer b);
-static void ical_object_normalize_summary (iCalObject *ico);
-static void list_free (GList *list);
-
-
-
-char *
-ical_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname){
-		char buffer [128];
-
-		if ((gethostname (buffer, sizeof (buffer)-1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = g_strdup (buffer);
-		else
-			hostname = g_strdup ("localhost");
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-iCalObject *
-ical_object_new (void)
-{
-	iCalObject *ico;
-
-	ico = g_new0 (iCalObject, 1);
-
-	ico->seq = -1;
-	ico->dtstamp = time (NULL);
-	ico->uid = ical_gen_uid ();
-
-	ico->pilot_id = 0;
-	ico->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	ico->ref_count = 1;
-
-	return ico;
-}
-
-iCalObject *
-ical_new (char *comment, char *organizer, char *summary)
-{
-	iCalObject *ico;
-
-	ico = ical_object_new ();
-
-	ico->comment   = g_strdup (comment);
-	ico->organizer = g_new0 (iCalPerson, 1);
-	ico->organizer->addr = g_strdup (organizer);
-	ico->summary   = g_strdup (summary);
-	ico->class     = g_strdup ("PUBLIC");
-	ico->status    = g_strdup ("NEEDS ACTION");
-
-	ico->dalarm.type = ALARM_DISPLAY;
-	ico->palarm.type = ALARM_PROGRAM;
-	ico->malarm.type = ALARM_MAIL;
-	ico->aalarm.type = ALARM_AUDIO;
-
-	ical_object_normalize_summary (ico);
-
-	return ico;
-}
-
-
-void
-ical_object_ref (iCalObject *ico)
-{
-	ico->ref_count++;
-}
-
-
-#define free_if_defined(x) if (x){ g_free (x); x = 0; }
-#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }
-static void
-ical_object_destroy (iCalObject *ico)
-{
-	/* Regular strings */
-	free_if_defined  (ico->comment);
-	free_if_defined  (ico->organizer);
-	free_if_defined  (ico->summary);
-	free_if_defined  (ico->uid);
-	free_if_defined  (ico->status);
-	free_if_defined  (ico->class);
-	free_if_defined  (ico->url);
-	free_if_defined  (ico->recur);
-
-	/* Lists */
-	lfree_if_defined (ico->exdate);
-	lfree_if_defined (ico->categories);
-	lfree_if_defined (ico->resources);
-	lfree_if_defined (ico->related);
-	lfree_if_defined (ico->attach);
-
-	/* Alarms */
-	g_free (ico->dalarm.data);
-	g_free (ico->palarm.data);
-	g_free (ico->malarm.data);
-	g_free (ico->aalarm.data);
-
-	g_free (ico);
-}
-
-void
-ical_object_unref (iCalObject *ico)
-{
-	ico->ref_count--;
-	if (ico->ref_count == 0)
-		ical_object_destroy (ico);
-}
-
-
-static void
-my_free (gpointer data, gpointer user_dat_ignored)
-{
-	g_free (data);
-}
-
-static void
-list_free (GList *list)
-{
-	g_list_foreach (list, my_free, 0);
-	g_list_free (list);
-}
-
-/* This resets any recurrence rules of the iCalObject. */
-void
-ical_object_reset_recurrence (iCalObject *ico)
-{
-	free_if_defined  (ico->recur);
-	lfree_if_defined (ico->exdate);
-}
-
-static GList *
-set_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";"); s; s = strtok (NULL, ";"))
-		list = g_list_prepend (list, g_strdup (s));
-
-	return list;
-}
-
-static GList *
-set_date_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";,"); s; s = strtok (NULL, ";,")){
-		time_t *t = g_new (time_t, 1);
-
-		while (*s && isspace (*s))
-			s++;
-		*t = time_from_isodate (s);
-		list = g_list_prepend (list, t);
-	}
-	return list;
-}
-
-void
-ical_object_add_exdate (iCalObject *o, time_t t)
-{
-	time_t *pt = g_new (time_t, 1);
-
-	*pt = t;
-	o->exdate = g_list_prepend (o->exdate, pt);
-}
-
-static void
-ignore_space(char **str)
-{
-	while (**str && isspace (**str))
-		(*str)++;
-}
-
-static void
-skip_numbers (char **str)
-{
-	while (**str){
-		ignore_space (str);
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str))
-			(*str)++;
-	}
-}
-
-static void
-weekdaylist (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday |= 1 << i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-
-	if (o->recur->weekday == 0){
-		struct tm tm = *localtime (&o->dtstart);
-
-		o->recur->weekday = 1 << tm.tm_wday;
-	}
-}
-
-static void
-weekdaynum (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday = i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-}
-
-static void
-ocurrencelist (iCalObject *o, char **str)
-{
-	char *p;
-
-	ignore_space (str);
-	p = *str;
-	if (!isdigit (*p))
-		return;
-
-	if (!(*p >= '1' && *p <= '5'))
-		return;
-
-	if (!(*(p+1) == '+' || *(p+1) == '-'))
-		return;
-
-	o->recur->u.month_pos = (*p-'0') * (*(p+1) == '+' ? 1 : -1);
-	*str += 2;
-}
-
-#if 0
-
-static void
-daynumber (iCalObject *o, char **str)
-{
-	int val = 0;
-	char *p = *str;
-
-	ignore_space (str);
-	if (strcmp (p, "LD")){
-		o->recur->u.month_day = DAY_LASTDAY;
-		*str += 2;
-		return;
-	}
-
-	if (!(isdigit (*p)))
-		return;
-
-	while (**str && isdigit (**str)){
-		val = val * 10 + (**str - '0');
-		(*str)++;
-	}
-
-	if (**str == '+')
-		(*str)++;
-
-	if (**str == '-')
-		val *= -1;
-	o->recur->u.month_day = val;
-}
-
-#endif
-
-static void
-daynumberlist (iCalObject *o, char **str)
-{
-	int first = 0;
-	int val = 0;
-
-	ignore_space (str);
-
-	while (**str){
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str)){
-			val = 10 * val + (**str - '0');
-			(*str)++;
-		}
-		if (!first){
-			/*
-			 * Some broken applications set this to zero
-			 */
-			if (val == 0){
-				struct tm day = *localtime (&o->dtstart);
-
-				val = day.tm_mday;
-			}
-			o->recur->u.month_day = val;
-			first = 1;
-			val = 0;
-		}
-	}
-}
-
-static void
-load_recur_weekly (iCalObject *o, char **str)
-{
-	weekdaylist (o, str);
-}
-
-static void
-load_recur_monthly_pos (iCalObject *o, char **str)
-{
-	ocurrencelist (o, str);
-	weekdaynum (o, str);
-}
-
-static void
-load_recur_monthly_day (iCalObject *o, char **str)
-{
-	daynumberlist (o, str);
-}
-
-static void
-load_recur_yearly_month (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple months and we do expect
-	 * the dtstart to agree with the value on this field
-	 */
-	skip_numbers (str);
-}
-
-static void
-load_recur_yearly_day (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple days and we do expect
-	 * the dtstart to agree with the value on this field
-	 *
-	 * FIXME: we should support every-n-years
-	 */
-	skip_numbers (str);
-}
-
-static void
-duration (iCalObject *o, char **str)
-{
-	unsigned int duration = 0;
-
-	ignore_space (str);
-	if (**str != '#')
-		return;
-	(*str)++;
-	while (**str && isdigit (**str)){
-		duration = duration * 10 + (**str - '0');
-		(*str)++;
-	}
-	o->recur->duration = duration;
-}
-
-static void
-enddate (iCalObject *o, char **str)
-{
-	ignore_space (str);
-	if (isdigit (**str)){
-		o->recur->_enddate = time_from_isodate (*str);
-		*str += 16;
-	}
-}
-
-static int
-load_recurrence (iCalObject *o, char *str)
-{
-	enum RecurType type;
-	int  interval = 0;
-
-	type = -1;
-	switch (*str++){
-	case 'D':
-		type = RECUR_DAILY;
-		break;
-
-	case 'W':
-		type = RECUR_WEEKLY;
-		break;
-
-	case 'M':
-		if (*str == 'P')
-			type = RECUR_MONTHLY_BY_POS;
-	        else if (*str == 'D')
-			type = RECUR_MONTHLY_BY_DAY;
-		str++;
-		break;
-
-	case 'Y':
-		if (*str == 'M')
-			type = RECUR_YEARLY_BY_MONTH;
-		else if (*str == 'D')
-			type = RECUR_YEARLY_BY_DAY;
-		str++;
-		break;
-	}
-	if (type == -1)
-		return 0;
-
-	o->recur = g_new0 (Recurrence, 1);
-	o->recur->type = type;
-	ignore_space (&str);
-
-	/* Get the interval */
-	for (;*str && isdigit (*str);str++)
-		interval = interval * 10 + (*str-'0');
-
-	if (interval == 0)
-		interval = 1;
-
-	o->recur->interval = interval;
-
-	/* this is the default per the spec */
-	o->recur->duration = 2;
-
-	ignore_space (&str);
-
-	switch (type){
-	case RECUR_DAILY:
-		break;
-	case RECUR_WEEKLY:
-		load_recur_weekly (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_POS:
-		load_recur_monthly_pos (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		load_recur_monthly_day (o, &str);
-		break;
-	case RECUR_YEARLY_BY_MONTH:
-		load_recur_yearly_month (o, &str);
-		break;
-	case RECUR_YEARLY_BY_DAY:
-		load_recur_yearly_day (o, &str);
-		break;
-	default:
-		g_warning ("Unimplemented recurrence type %d", (int) type);
-		break;
-	}
-	duration (o, &str);
-	enddate (o, &str);
-
-	/* Compute the enddate */
-	if (o->recur->_enddate == 0){
-		if (o->recur->duration != 0){
-			ical_object_compute_end (o);
-		} else
-			o->recur->enddate = 0;
-	} else {
-		o->recur->enddate = o->recur->_enddate;
-	}
-	return 1;
-}
-
-#define is_a_prop_of(obj,prop) isAPropertyOf (obj,prop)
-#define str_val(obj) the_str = fakeCString (vObjectUStringZValue (obj))
-#define has(obj,prop) (vo = isAPropertyOf (obj, prop))
-
-/*
- * FIXME: This is loosing precission.  Enhanec the thresholds
- */
-#define HOURS(n) (n*(60*60))
-
-static void
-setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *vo)
-{
-	time_t alarm_time = time_from_isodate (iso_time);
-	time_t base = ico->dtstart;
-	int d = difftime (base, alarm_time);
-	VObject *a;
-	char *the_str;
-
-	alarm->enabled = 1;
-	if (d > HOURS (2)){
-		if (d > HOURS (48)){
-			alarm->count = d / HOURS (24);
-			alarm->units = ALARM_DAYS;
-		} else {
-			alarm->count = d / (60*60);
-			alarm->units = ALARM_HOURS;
-		}
-	} else {
-		alarm->count = d / 60;
-		alarm->units = ALARM_MINUTES;
-	}
-
-	if ((a = is_a_prop_of (vo, VCSnoozeTimeProp))){
-		alarm->snooze_secs = isodiff_to_secs (str_val (a));
-		free (the_str);
-	}
-
-	if ((a = is_a_prop_of (vo, VCRepeatCountProp))){
-		alarm->snooze_repeat = atoi (str_val (a));
-		free (the_str);
-	}
-}
-
-/*
- * Duplicates an iCalObject.  Implementation is a grand hack.
- * If you need the new ICalObject to have a new uid, free the current one,
- * and call ical_gen_uid() to generate a new one.
- */
-iCalObject *
-ical_object_duplicate (iCalObject *o)
-{
-	VObject *vo;
-	iCalObject *new;
-
-	vo = ical_object_to_vobject (o);
-	switch (o->type){
-	case ICAL_EVENT:
-		new = ical_object_create_from_vobject (vo, VCEventProp);
-		break;
-	case ICAL_TODO:
-		new = ical_object_create_from_vobject (vo, VCTodoProp);
-		break;
-	default:
-		new = NULL;
-	}
-
-	cleanVObject (vo);
-	return new;
-}
-
-/* FIXME: we need to load the recurrence properties */
-iCalObject *
-ical_object_create_from_vobject (VObject *o, const char *object_name)
-{
-	time_t  now = time (NULL);
-	iCalObject *ical;
-	VObject *vo, *a;
-	VObjectIterator i;
-	char *the_str;
-
-	ical = g_new0 (iCalObject, 1);
-
-	if (strcmp (object_name, VCEventProp) == 0)
-		ical->type = ICAL_EVENT;
-	else if (strcmp (object_name, VCTodoProp) == 0)
-		ical->type = ICAL_TODO;
-	else {
-		g_free (ical);
-		return 0;
-	}
-
-	ical->ref_count = 1;
-
-	/* uid */
-	if (has (o, VCUniqueStringProp)){
-		ical->uid = g_strdup (str_val (vo));
-		free (the_str);
-	} else {
-		ical->uid = ical_gen_uid ();
-	}
-
-	/* seq */
-	if (has (o, VCSequenceProp)){
-		ical->seq = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->seq = 0;
-
-	/* dtstart */
-	if (has (o, VCDTstartProp)){
-		ical->dtstart = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->dtstart = 0;
-
-	/* dtend */
-	ical->dtend = 0;	/* default value */
-	if (ical->type == ICAL_EVENT){
-		if (has (o, VCDTendProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	} else if (ical->type == ICAL_TODO){
-		if (has (o, VCDueProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	}
-
-	/* dcreated */
-	if (has (o, VCDCreatedProp)){
-		ical->created = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* completed */
-	if (has (o, VCCompletedProp)){
-		ical->completed = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* last_mod */
-	if (has (o, VCLastModifiedProp)){
-		ical->last_mod = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->last_mod = now;
-
-	/* exdate */
-	if (has (o, VCExpDateProp)){
-		ical->exdate = set_date_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* description/comment */
-	if (has (o, VCDescriptionProp)){
-		ical->comment = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* summary */
-	if (has (o, VCSummaryProp)){
-		ical->summary = g_strdup (str_val (vo));
-		free (the_str);
-
-		/* Convert any CR/LF/CRLF sequences in the summary field to
-		   spaces so we just have a one-line field. */
-		ical_object_normalize_summary (ical);
-	} else 
-		ical->summary = g_strdup ("");
-
-	/* status */
-	if (has (o, VCStatusProp)){
-		ical->status = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->status = g_strdup ("NEEDS ACTION");
-
-	if (has (o, VCClassProp)){
-		ical->class = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->class = g_strdup ("PUBLIC");
-
-	/* categories */
-	if (has (o, VCCategoriesProp)){
-		ical->categories = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* resources */
-	if (has (o, VCResourcesProp)){
-		ical->resources = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* priority */
-	if (has (o, VCPriorityProp)){
-		ical->priority = atoi (str_val (vo));
-		free (the_str);
-	}
-
-	/* tranparency */
-	if (has (o, VCTranspProp)){
-		ical->transp = atoi (str_val (vo)) ? ICAL_TRANSPARENT : ICAL_OPAQUE;
-		free (the_str);
-	}
-
-	/* Organizer */
-	if (has (o, VCOrgNameProp)){
-		ical->organizer = g_new0 (iCalPerson, 1);
-		ical->organizer->addr = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* related */
-	if (has (o, VCRelatedToProp)){
-		char *str;
-		char *s;
-		iCalRelation *rel;
-		str = str_val (vo);
-		for (s = strtok (str, ";"); s; s = strtok (NULL, ";")) {
-			rel = g_new0 (iCalRelation, 1);
-			rel->uid = g_strdup (s);
-			rel->reltype = g_strdup ("PARENT");
-			ical->related = g_list_prepend (ical->related, rel);
-		}
-		free (the_str);
-	}
-
-	/* attach */
-	initPropIterator (&i, o);
-	while (moreIteration (&i)){
-		vo = nextVObject (&i);
-		if (strcmp (vObjectName (vo), VCAttachProp) == 0){
-			ical->attach = g_list_prepend (ical->attach, g_strdup (str_val (vo)));
-			free (the_str);
-		}
-	}
-
-	/* url */
-	if (has (o, VCURLProp)){
-		/* There seems to be a problem with the URL property. For some
-		   reason an empty property gets saved, vObjectUStringZValue
-		   returns NULL and fakeCString crashes. So we check for NULL.
-		*/
-		const wchar_t *zval;
-
-		zval = vObjectUStringZValue (o);
-		if (zval) {
-			the_str = fakeCString (zval);
-			ical->url = g_strdup (the_str);
-			free (the_str);
-		}
-	}
-
-	/* dalarm */
-	ical->dalarm.type = ALARM_DISPLAY;
-	ical->dalarm.enabled = 0;
-	if (has (o, VCDAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->dalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* aalarm */
-	ical->aalarm.type = ALARM_AUDIO;
-	ical->aalarm.enabled = 0;
-	if (has (o, VCAAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->aalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* palarm */
-	ical->palarm.type = ALARM_PROGRAM;
-	ical->palarm.enabled = 0;
-	if (has (o, VCPAlarmProp)){
-		ical->palarm.type = ALARM_PROGRAM;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->palarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCProcedureNameProp))){
-				ical->palarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->palarm.data = g_strdup ("");
-		}
-	}
-
-	/* malarm */
-	ical->malarm.type = ALARM_MAIL;
-	ical->malarm.enabled = 0;
-	if (has (o, VCMAlarmProp)){
-		ical->malarm.type = ALARM_MAIL;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->malarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCEmailAddressProp))){
-				ical->malarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->malarm.data = g_strdup ("");
-		}
-	}
-
-	/* rrule */
-	if (has (o, VCRRuleProp)){
-		if (!load_recurrence (ical, str_val (vo))) {
-			ical_object_unref (ical);
-			return NULL;
-		}
-		free (the_str);
-	}
-
-	/*
-	 * Pilot
-	 */
-	if (has (o, XPilotIdProp)){
-		ical->pilot_id = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_id = 0;
-
-	if (has (o, XPilotStatusProp)){
-		ical->pilot_status = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	return ical;
-}
-
-static char *
-to_str (int num)
-{
-	static char buf [40];
-
-	sprintf (buf, "%d", num);
-	return buf;
-}
-
-/*
- * stores a GList in the property.
- */
-static void
-store_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (l->data) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (l->data);
-
-		strcpy (p, l->data);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_rel_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-	
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (((iCalRelation*)(l->data))->uid) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (((iCalRelation*)(l->data))->uid);
-		
-		strcpy (p, ((iCalRelation*)(l->data))->uid);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_date_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int   size, len;
-	char  *s, *p;
-
-	size = g_list_length (values);
-	s = p = g_malloc ((size * 17 + 1) * sizeof (char));
-
-	for (l = values; l; l = l->next){
-		strcpy (s, isodate_from_time_t (*(time_t *)l->data));
-		len = strlen (s);
-		s [len] = ',';
-		s += len + 1;
-	}
-	s--;
-	*s = 0;
-	addPropValue (o, prop, p);
-	g_free (p);
-}
-
-static char *recur_type_name [] = { "D", "W", "MP", "MD", "YM", "YD" };
-static char *recur_day_list  [] = { "SU", "MO", "TU","WE", "TH", "FR", "SA" };
-static char *alarm_names [] = { VCMAlarmProp, VCPAlarmProp, VCDAlarmProp, VCAAlarmProp };
-
-static VObject *
-save_alarm (VObject *o, CalendarAlarm *alarm, iCalObject *ical)
-{
-	VObject *alarm_object;
-	struct tm tm;
-	time_t alarm_time;
-
-	if (!alarm->enabled)
-		return NULL;
-	tm = *localtime (&ical->dtstart);
-	switch (alarm->units){
-	case ALARM_MINUTES:
-		tm.tm_min -= alarm->count;
-		break;
-
-	case ALARM_HOURS:
-		tm.tm_hour -= alarm->count;
-		break;
-
-	case ALARM_DAYS:
-		tm.tm_mday -= alarm->count;
-		break;
-	}
-
-	alarm_time = mktime (&tm);
-	alarm_object = addProp (o, alarm_names [alarm->type]);
-	addPropValue (alarm_object, VCRunTimeProp, isodate_from_time_t (alarm_time));
-
-	if (alarm->snooze_secs)
-		addPropValue (alarm_object, VCSnoozeTimeProp, isodiff_from_secs (alarm->snooze_secs));
-	else
-		addPropValue (alarm_object, VCSnoozeTimeProp, "");
-
-	if (alarm->snooze_repeat){
-		char buf [20];
-
-		sprintf (buf, "%d", alarm->snooze_repeat);
-		addPropValue (alarm_object, VCRepeatCountProp, buf);
-	} else
-		addPropValue (alarm_object, VCRepeatCountProp, "");
-	return alarm_object;
-}
-
-VObject *
-ical_object_to_vobject (iCalObject *ical)
-{
-	VObject *o, *alarm, *s;
-	GList *l;
-
-	if (ical->type == ICAL_EVENT)
-		o = newVObject (VCEventProp);
-	else
-		o = newVObject (VCTodoProp);
-
-	/* uid */
-	if (ical->uid)
-		addPropValue (o, VCUniqueStringProp, ical->uid);
-
-	/* seq */
-	addPropValue (o, VCSequenceProp, to_str (ical->seq));
-
-	/* dtstart */
-	addPropValue (o, VCDTstartProp, isodate_from_time_t (ical->dtstart));
-
-	/* dtend */
-	if (ical->type == ICAL_EVENT){
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->dtend));
-	} else if (ical->type == ICAL_TODO){
-		addPropValue (o, VCDueProp, isodate_from_time_t (ical->dtend));
-	}
-
-	/* dcreated */
-	addPropValue (o, VCDCreatedProp, isodate_from_time_t (ical->created));
-
-	/* completed */
-	if (ical->completed)
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->completed));
-
-	/* last_mod */
-	addPropValue (o, VCLastModifiedProp, isodate_from_time_t (ical->last_mod));
-
-	/* exdate */
-	if (ical->exdate)
-		store_date_list (o, VCExpDateProp, ical->exdate);
-
-	/* description/comment */
-	if (ical->comment && strlen (ical->comment)){
-		s = addPropValue (o, VCDescriptionProp, ical->comment);
-		if (strchr (ical->comment, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-
-	/* summary */
-	if (ical->summary && strlen (ical->summary)) {
-		s = addPropValue (o, VCSummaryProp, ical->summary);
-		if (strchr (ical->summary, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-		
-	/* status */
-	addPropValue (o, VCStatusProp, ical->status);
-
-	/* class */
-	addPropValue (o, VCClassProp, ical->class);
-
-	/* categories */
-	if (ical->categories)
-		store_list (o, VCCategoriesProp, ical->categories);
-
-	/* resources */
-	if (ical->resources)
-		store_list (o, VCCategoriesProp, ical->resources);
-
-	/* priority */
-	addPropValue (o, VCPriorityProp, to_str (ical->priority));
-
-	/* transparency */
-	addPropValue (o, VCTranspProp, to_str (ical->transp));
-
-	/* Owner/organizer */
-	if (ical->organizer && ical->organizer->addr)
-		addPropValue (o, VCOrgNameProp, ical->organizer->addr);
-
-	/* related */
-	if (ical->related)
-		store_rel_list (o, VCRelatedToProp, ical->related);
-
-	/* attach */
-	for (l = ical->attach; l; l = l->next)
-		addPropValue (o, VCAttachProp, l->data);
-
-	/* url */
-	if (ical->url)
-		addPropValue (o, VCURLProp, ical->url);
-
-	if (ical->recur){
-		char result [256];
-		char buffer [80];
-		int i;
-
-		sprintf (result, "%s%d ", recur_type_name [ical->recur->type], ical->recur->interval);
-		switch (ical->recur->type){
-		case RECUR_DAILY:
-			break;
-
-		case RECUR_WEEKLY:
-			for (i = 0; i < 7; i++){
-				if (ical->recur->weekday & (1 << i)){
-					sprintf (buffer, "%s ", recur_day_list [i]);
-					strcat (result, buffer);
-				}
-			}
-			break;
-
-		case RECUR_MONTHLY_BY_POS: {
-			int nega = ical->recur->u.month_pos < 0;
-
-			sprintf (buffer, "%d%s ", nega ? -ical->recur->u.month_pos : ical->recur->u.month_pos,
-				 nega ? "-" : "+");
-			strcat (result, buffer);
-			/* the gui is set up for a single day, not a set here in this case */
-			sprintf (buffer, "%s ", recur_day_list [ical->recur->weekday]);
-			strcat (result, buffer);
-		}
-		break;
-
-		case RECUR_MONTHLY_BY_DAY:
-			sprintf (buffer, "%d ", ical->recur->u.month_pos);
-			strcat (result, buffer);
-			break;
-
-		case RECUR_YEARLY_BY_MONTH:
-			break;
-
-		case RECUR_YEARLY_BY_DAY:
-			break;
-		}
-		if (ical->recur->_enddate == 0)
-			sprintf (buffer, "#%d ",ical->recur->duration);
-		else
-			sprintf (buffer, "%s ", isodate_from_time_t (ical->recur->_enddate));
-		strcat (result, buffer);
-		addPropValue (o, VCRRuleProp, result);
-	}
-
-	save_alarm (o, &ical->aalarm, ical);
-	save_alarm (o, &ical->dalarm, ical);
-
-	if ((alarm = save_alarm (o, &ical->palarm, ical)))
-		addPropValue (alarm, VCProcedureNameProp, ical->palarm.data);
-	if ((alarm = save_alarm (o, &ical->malarm, ical)))
-		addPropValue (alarm, VCEmailAddressProp, ical->malarm.data);
-
-	/* Pilot */
-	{
-		char buffer [20];
-
-		sprintf (buffer, "%d", ical->pilot_id);
-		addPropValue (o, XPilotIdProp, buffer);
-		sprintf (buffer, "%d", ical->pilot_status);
-		addPropValue (o, XPilotStatusProp, buffer);
-	}
-
-	return o;
-}
-
-void
-ical_foreach (GList *events, calendarfn fn, void *closure)
-{
-	for (; events; events = events->next){
-		iCalObject *ical = events->data;
-
-		(*fn) (ical, ical->dtstart, ical->dtend, closure);
-	}
-}
-
-static int
-is_date_in_list (GList *list, struct tm *date)
-{
-	struct tm tm;
-
-	for (; list; list = list->next){
-		time_t *timep = list->data;
-
-		tm = *localtime (timep);
-		if (date->tm_mday == tm.tm_mday &&
-		    date->tm_mon  == tm.tm_mon &&
-		    date->tm_year == tm.tm_year){
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Generates an event instance based on the reference time */
-static gboolean
-generate (iCalObject *ico, time_t reference, calendarfn cb, void *closure)
-{
-	time_t offset;
-	struct tm tm_start, ref;
-	time_t start, end;
-
-	offset = ico->dtend - ico->dtstart;
-
-	tm_start = *localtime (&ico->dtstart);
-	ref      = *localtime (&reference);
-
-	tm_start.tm_mday = ref.tm_mday;
-	tm_start.tm_mon  = ref.tm_mon;
-	tm_start.tm_year = ref.tm_year;
-
-	start = mktime (&tm_start);
-	if (start == -1) {
-		g_message ("generate(): Produced invalid start date!");
-		return FALSE;
-	}
-
-	end = start + offset;
-
-#if 0
-	/* FIXME: I think this is not needed, since we are offsetting by full day values,
-	 * and the times should remain the same --- if you have a daily appointment
-	 * at 18:00, it is always at 18:00 even during daylight savings.
-	 *
-	 * However, what should happen on the exact change-of-savings day with
-	 * appointments in the early morning hours?
-	 */
-
-	if (ref.tm_isdst > tm_start.tm_isdst) {
-		tm_start.tm_hour--;
-		tm_end.tm_hour--;
-	} else if (ref.tm_isdst < tm_start.tm_isdst) {
-		tm_start.tm_hour++;
-		tm_end.tm_hour++;
-	}
-#endif
-
-	if (ico->exdate && is_date_in_list (ico->exdate, &tm_start))
-		return TRUE;
-
-	return (*cb) (ico, start, end, closure);
-}
-
-int
-ical_object_get_first_weekday (int weekday_mask)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		if (weekday_mask & (1 << i))
-			return i;
-
-	return -1;
-}
-
-#define time_in_range(t, a, b) ((t >= a) && (b ? (t < b) : 1))
-#define recur_in_range(t, r) (r->enddate ? (t < r->enddate) : 1)
-
-/*
- * Generate every possible event.  Invokes the callback routine for
- * every occurrence of the event in the [START, END] time interval.
- *
- * If END is zero, the event is generated forever.
- * The callback routine is expected to return 0 when no further event
- * generation is requested.
- */
-void
-ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure)
-{
-	time_t current;
-	int first_week_day;
-
-	/* If there is no recurrence, just check ranges */
-
-	if (!ico->recur) {
-		if ((end && (ico->dtstart < end) && (ico->dtend > start))
-		    || ((end == 0) && (ico->dtend > start))) {
-			/* The new calendar views expect the times to not be
-			   clipped, so they can show that it continues past
-			   the end of the viewable area. */
-#if 0
-			time_t ev_s, ev_e;
-
-			/* Clip range */
-
-			ev_s = MAX (ico->dtstart, start);
-			ev_e = MIN (ico->dtend, end);
-
-			(* cb) (ico, ev_s, ev_e, closure);
-#else
-			(* cb) (ico, ico->dtstart, ico->dtend, closure);
-#endif
-		}
-		return;
-	}
-
-	/* The event has a recurrence rule -- check that we will generate at least one instance */
-
-	if (end != 0) {
-		if (ico->dtstart > end)
-			return;
-
-		if (!IS_INFINITE (ico->recur) && (ico->recur->enddate < start))
-			return;
-	}
-
-	/* Generate the instances */
-
-	current = ico->dtstart;
-
-	switch (ico->recur->type) {
-	case RECUR_DAILY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_day (current, ico->recur->interval);
-
-			if (current == -1) {
-				g_warning ("RECUR_DAILY: time_add_day() returned invalid time");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_WEEKLY:
-		do {
-			struct tm tm;
-
-			tm = *localtime (&current);
-
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur)) {
-				/* Weekdays to recur on are specified as a bitmask */
-			  if (ico->recur->weekday & (1 << tm.tm_wday)) {
-					if (!generate (ico, current, cb, closure))
-						return;
-			  }
-			}
-
-			/* Advance by day for scanning the week or by interval at week end */
-
-			if (tm.tm_wday == 6)
-				current = time_add_day (current, (ico->recur->interval - 1) * 7 + 1);
-			else
-				current = time_add_day (current, 1);
-
-			if (current == -1) {
-				g_warning ("RECUR_WEEKLY: time_add_day() returned invalid time\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_POS:
-		/* FIXME: We only deal with positives now */
-		if (ico->recur->u.month_pos < 0) {
-			g_warning ("RECUR_MONTHLY_BY_POS does not support negative positions yet");
-			return;
-		}
-
-		if (ico->recur->u.month_pos == 0)
-			return;
-
-		first_week_day = /* ical_object_get_first_weekday (ico->recur->weekday);  */
-			ico->recur->weekday; /* the i/f only lets you choose a single day of the week! */
-
-		/* This should not happen, but take it into account */
-		if (first_week_day == -1) {
-			g_warning ("ical_object_get_first_weekday() returned -1");
-			return;
-		}
-
-		do {
-			struct tm tm;
-			time_t t;
-			int    week_day_start;
-
-			tm = *localtime (&current);
-			tm.tm_mday = 1;
-			t = mktime (&tm);
-			tm = *localtime (&t);
-			week_day_start = tm.tm_wday;
-
-			tm.tm_mday = (7 * (ico->recur->u.month_pos - ((week_day_start <= first_week_day ) ? 1 : 0))
-				      - (week_day_start - first_week_day) + 1);
-			if( tm.tm_mday > 31 )
-			{
-				tm.tm_mday = 1;
-				tm.tm_mon += ico->recur->interval;
-				current = mktime (&tm);
-				continue;
-			}
-
-			switch( tm.tm_mon )
-			{
-			case 3:
-			case 5:
-			case 8:
-			case 10:
-				if( tm.tm_mday > 30 )
-				{
-					tm.tm_mday = 1;
-					tm.tm_mon += ico->recur->interval;
-					current = mktime (&tm);
-					continue;
-				}
-				break;
-			case 1:
-				if( ((tm.tm_year+1900)%4) == 0
-					&& ((tm.tm_year+1900)%400) != 100
-					&& ((tm.tm_year+1900)%400) != 200
-					&& ((tm.tm_year+1900)%400) != 300 )
-				{
-
-					if( tm.tm_mday > 29 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				else
-				{
-					if( tm.tm_mday > 28 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				break;
-			}
-
-			t = mktime (&tm);
-
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			current = mktime (&tm);
-
-			tm.tm_mday = 1;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_DAY:
-		do {
-			struct tm tm;
-			time_t t;
-			int    p;
-
-			tm = *localtime (&current);
-
-			p = tm.tm_mday;
-			tm.tm_mday = ico->recur->u.month_day;
-			t = mktime (&tm);
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			tm.tm_mday = p;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_YEARLY_BY_MONTH:
-	case RECUR_YEARLY_BY_DAY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_year (current, ico->recur->interval);
-		} while (current < end || (end == 0));
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static int
-duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
-{
-	int *count = closure;
-	struct tm tm;
-
-	tm = *localtime (&start);
-
-	(*count)++;
-	if (ico->recur->duration == *count) {
-		ico->recur->enddate = time_day_end (end);
-		return 0;
-	}
-	return 1;
-}
-
-/* Computes ico->recur->enddate from ico->recur->duration */
-void
-ical_object_compute_end (iCalObject *ico)
-{
-	int count = 0;
-
-	g_return_if_fail (ico->recur != NULL);
-
-	ico->recur->_enddate = 0;
-	ico->recur->enddate = 0;
-	ical_object_generate_events (ico, ico->dtstart, 0, duration_callback, &count);
-}
-
-int
-alarm_compute_offset (CalendarAlarm *a)
-{
-	if (!a->enabled)
-		return -1;
-	switch (a->units){
-	case ALARM_MINUTES:
-		a->offset = a->count * 60;
-		break;
-	case ALARM_HOURS:
-		a->offset = a->count * 3600;
-		break;
-	case ALARM_DAYS:
-		a->offset = a->count * 24 * 3600;
-	}
-	return a->offset;
-}
-
-
-/**
- * ical_object_find_in_string:
- * @uid: Unique identifier of the sought object.
- * @vcalobj: String representation of a complete calendar object.
- * @ico: The resulting #iCalObject is stored here.
- *
- * Parses a complete vCalendar object string and tries to find the calendar
- * object that matches the specified @uid.  If found, it stores the resulting
- * #iCalObject in the @ico parameter.
- *
- * Return value: A result code depending on whether the parse and search were
- * successful.
- **/
-CalObjFindStatus
-ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico)
-{
-#if 0
-	icalcomponent* comp = NULL;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_NOT_FOUND);
-
-	comp = icalparser_parse_string (vcalobj);
-
-	if (!comp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #1\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	if (!subcomp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #2\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			if (strcasecmp (ical->uid, uid) == 0) {
-				(*ico) = ical;
-				(*ico)->ref_count = 1;
-				printf ("CAL_OBJ_FIND_SUCCESS\n");
-
-	printf ("ical_object_find_in_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (*ico);
-	printf ("-----------------------------------------------------\n");
-
-
-				return CAL_OBJ_FIND_SUCCESS;
-			}
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	printf ("CAL_OBJ_FIND_NOT_FOUND\n");
-	return CAL_OBJ_FIND_NOT_FOUND;
-
-#else /* 1 */
-	VObject *vcal;
-	VObjectIterator i;
-	CalObjFindStatus status;
-
-	g_return_val_if_fail (uid != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (ico != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-
-	*ico = NULL;
-	status = CAL_OBJ_FIND_NOT_FOUND;
-
-	vcal = Parse_MIME (vcalobj, strlen (vcalobj));
-
-	if (!vcal)
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-
-	initPropIterator (&i, vcal);
-
-	while (moreIteration (&i)) {
-		VObject *vobj;
-		VObject *uid_prop;
-		char *the_str;
-
-		vobj = nextVObject (&i);
-
-		uid_prop = isAPropertyOf (vobj, VCUniqueStringProp);
-		if (!uid_prop)
-			continue;
-
-		/* str_val() sets the_str to the string representation of the
-		 * property.
-		 */
-		str_val (uid_prop);
-
-		if (strcmp (the_str, uid) == 0) {
-			const char *object_name;
-
-			object_name = vObjectName (vobj);
-			*ico = ical_object_create_from_vobject (vobj, object_name);
-
-			if (*ico)
-				status = CAL_OBJ_FIND_SUCCESS;
-		}
-
-		free (the_str);
-
-		if (status == CAL_OBJ_FIND_SUCCESS)
-			break;
-	}
-
-	cleanVObject (vcal);
-	cleanStrTbl ();
-
-	return status;
-#endif /* 1 */
-}
-
-
-#if 1
-/* Creates a VObject with the base information of a calendar */
-static VObject *
-get_calendar_base_vobject (void)
-{
-	VObject *vobj;
-	time_t now;
-	struct tm tm;
-
-	/* We call localtime for the side effect of setting tzname */
-
-	now = time (NULL);
-	tm = *localtime (&now);
-
-	vobj = newVObject (VCCalProp);
-
-	addPropValue (vobj, VCProdIdProp, PRODID);
-
-#if defined (HAVE_TM_ZONE)
-	addPropValue (vobj, VCTimeZoneProp, tm.tm_zone);
-#elif defined (HAVE_TZNAME)
-	addPropValue (vobj, VCTimeZoneProp, tzname[0]);
-#endif
-
-	/* Per the vCalendar spec, this must be "1.0" */
-	addPropValue (vobj, VCVersionProp, "1.0");
-
-	return vobj;
-}
-#endif /* 0 */
-
-/**
- * ical_object_to_string:
- * @ico: A calendar object.
- * 
- * Converts a vCalendar object to its string representation.  It is wrapped
- * inside a complete VCALENDAR object because other auxiliary information such
- * as timezones may appear there.
- * 
- * Return value: String representation of the object.
- **/
-char *
-ical_object_to_string (iCalObject *ico)
-{
-#if 0
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-	icalcomponent *comp;
-
-	printf ("ical_object_to_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (ico);
-	printf ("-----------------------------------------------------\n");
-
-	comp = icalcomponent_create_from_ical_object (ico);
-	icalcomponent_add_component (top, comp);
-	out_cal_string = icalcomponent_as_ical_string (top);
-	return g_strdup (out_cal_string);
-
-#else /* 1 */
-	VObject *vcalobj, *vobj;
-	char *buf, *gbuf;
-
-	vcalobj = get_calendar_base_vobject ();
-	vobj = ical_object_to_vobject (ico);
-	addVObjectProp (vcalobj, vobj);
-
-	buf = writeMemVObject (NULL, NULL, vcalobj);
-
-	cleanVObject (vcalobj);
-	cleanStrTbl ();
-
-	/* We have to g_strdup() it because libversit uses malloc()/realloc(),
-	 * and we want clients to be able to use g_free().  Sigh.
-	 */
-	gbuf = g_strdup (buf);
-	free (buf);
-
-	return gbuf;
-#endif /* 1 */
-}
-
-
-/**
- * ical_object_compare_dates:
- * @ico1: A calendar event.
- * @ico2: A calendar event to compare with @ico1.
- * 
- * Returns TRUE if the dates of both objects match, including any recurrence
- * rules. Both calendar objects must have a type of ICAL_EVENT.
- * 
- * Return value: TRUE if both calendar objects have the same dates.
- **/
-gboolean
-ical_object_compare_dates (iCalObject *ico1,
-			   iCalObject *ico2)
-{
-	Recurrence *recur1, *recur2;
-	gint num_exdates;
-	GList *elem1, *elem2;
-	time_t *time1, *time2;
-
-	g_return_val_if_fail (ico1 != NULL, FALSE);
-	g_return_val_if_fail (ico2 != NULL, FALSE);
-	g_return_val_if_fail (ico1->type == ICAL_EVENT, FALSE);
-	g_return_val_if_fail (ico2->type == ICAL_EVENT, FALSE);
-
-	/* First check the base dates. */
-	if (ico1->dtstart != ico2->dtstart
-	    || ico1->dtend != ico2->dtend)
-		return FALSE;
-
-	recur1 = ico1->recur;
-	recur2 = ico2->recur;
-
-	/* If the event doesn't recur, we already know it matches. */
-	if (!recur1 && !recur2)
-		return TRUE;
-
-	/* Check that both recur. */
-	if (!(recur1 && recur2))
-		return FALSE;
-
-	/* Now we need to see if the recurrence rules are the same. */
-	if (recur1->type != recur2->type
-	    || recur1->interval != recur2->interval
-	    || recur1->enddate != recur2->enddate
-	    || recur1->weekday != recur2->weekday
-	    || recur1->duration != recur2->duration
-	    || recur1->_enddate != recur2->_enddate
-	    || recur1->__count != recur2->__count)
-		return FALSE;
-
-	switch (recur1->type) {
-	case RECUR_MONTHLY_BY_POS:
-		if (recur1->u.month_pos != recur2->u.month_pos)
-			return FALSE;
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		if (recur1->u.month_day != recur2->u.month_day)
-			return FALSE;
-		break;
-	default:
-		break;
-	}
-
-	/* Now check if the excluded dates match. */
-	num_exdates = g_list_length (ico1->exdate);
-	if (g_list_length (ico2->exdate) != num_exdates)
-		return FALSE;
-	if (num_exdates == 0)
-		return TRUE;
-
-	ico1->exdate = g_list_sort (ico1->exdate, compare_exdates);
-	ico2->exdate = g_list_sort (ico2->exdate, compare_exdates);
-
-	elem1 = ico1->exdate;
-	elem2 = ico2->exdate;
-	while (elem1) {
-		time1 = (time_t*) elem1->data;
-		time2 = (time_t*) elem2->data;
-
-		if (*time1 != *time2)
-			return FALSE;
-
-		elem1 = elem1->next;
-		elem2 = elem2->next;
-	}
-
-	return TRUE;
-}
-
-
-static gint
-compare_exdates (gconstpointer a, gconstpointer b)
-{
-	const time_t *ca = a, *cb = b;
-	time_t diff = *ca - *cb;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-
-/* Converts any CR/LF sequences in the summary field to spaces so we just
-   have a one-line field. The iCalObjects summary field is changed. */
-static void
-ical_object_normalize_summary (iCalObject *ico)
-{
-	gchar *src, *dest, ch;
-	gboolean just_output_space = FALSE;
-
-	src = dest = ico->summary;
-	while ((ch = *src++)) {
-		if (ch == '\n' || ch == '\r') {
-			/* We only output 1 space for each sequence of CR & LF
-			   characters. */
-			if (!just_output_space) {
-				*dest++ = ' ';
-				just_output_space = TRUE;
-			}
-		} else {
-			*dest++ = ch;
-			just_output_space = FALSE;
-		}
-	}
-	*dest = '\0';
-}
-
-
-void dump_icalobject (iCalObject *ico)
-{
-	if (!ico) {
-		printf ("<<NULL>>\n");
-		return;
-	}
-
-	printf ("type ");
-	switch (ico->type) {
-	case ICAL_EVENT: printf ("event"); break;
-	case ICAL_TODO: printf ("todo"); break;
-	case ICAL_JOURNAL: printf ("journal"); break;
-	case ICAL_FBREQUEST: printf ("fbrequest"); break;
-	case ICAL_FBREPLY: printf ("fbreply"); break;
-	case ICAL_BUSYTIME: printf ("busytime"); break;
-	case ICAL_TIMEZONE: printf ("timezone"); break;
-	}
-	printf ("\n");
-
-	printf ("attach-length %d\n", g_list_length (ico->attach));
-
-	printf ("attendee-length %d\n", g_list_length (ico->attendee));
-
-	printf ("catagories-length %d\n", g_list_length (ico->categories));
-
-	printf ("class '%s'\n", ico->class ? ico->class : "NULL");
-
-	printf ("comment '%s'\n", ico->comment ? ico->comment : "NULL");
-
-	printf ("completed %ld=%s",
-		ico->completed, ctime (&ico->completed));
-
-	printf ("created %ld=%s", ico->created, ctime (&ico->created));
-
-	printf ("contact-length %d\n", g_list_length (ico->contact));
-
-	printf ("desc '%s'\n", ico->desc ? ico->desc : "NULL");
-
-	printf ("dtstamp %ld=%s", ico->dtstamp, ctime (&ico->dtstamp));
-
-	printf ("dtstart %ld=%s", ico->dtstart, ctime (&ico->dtstart));
-
-	printf ("dtend %ld=%s", ico->dtend, ctime (&ico->dtend));
-
-	printf ("date_only %d\n", ico->date_only);
-
-	printf ("exdate-length %d\n", g_list_length (ico->exdate));
-
-	printf ("exrule-length %d\n", g_list_length (ico->exrule));
-
-	printf ("iCalGeo %d %f %f\n",
-		ico->geo.valid, ico->geo.latitude, ico->geo.longitude);
-
-	printf ("last_mod %ld=%s", ico->last_mod, ctime (&ico->last_mod));
-
-	printf ("location '%s'\n", ico->location ? ico->location : "NULL");
-
-	printf ("organizer %p\n", ico->organizer);
-
-	printf ("percent %d\n", ico->percent);
-
-	printf ("priority %d\n", ico->priority);
-
-	printf ("rstatus '%s'\n", ico->rstatus ? ico->rstatus : "NULL");
-
-	printf ("related-length %d\n", g_list_length (ico->related));
-
-	printf ("resources-length %d\n", g_list_length (ico->resources));
-
-	printf ("rdate-length %d\n", g_list_length (ico->rdate));
-
-	printf ("rrule-length %d\n", g_list_length (ico->rrule));
-
-	printf ("seq %d\n", ico->seq);
-
-	printf ("status '%s'\n", ico->status ? ico->status : "NULL");
-
-	printf ("summary '%s'\n", ico->summary ? ico->summary : "NULL");
-
-	printf ("transp ");
-	switch (ico->transp) {
-	case ICAL_OPAQUE: printf ("opaque"); break;
-	case ICAL_TRANSPARENT: printf ("transparent"); break;
-	}
-	printf ("\n");
-
-	printf ("uid '%s'\n", ico->uid ? ico->uid : "NULL");
-
-	printf ("url '%s'\n", ico->url ? ico->url : "NULL");
-
-	printf ("recurid %ld=%s", ico->recurid, ctime (&ico->recurid));
-
-	printf ("dalarm %d\n", ico->dalarm.enabled);
-
-	printf ("aalarm %d\n", ico->aalarm.enabled);
-
-	printf ("palarm %d\n", ico->palarm.enabled);
-
-	printf ("malarm %d\n", ico->malarm.enabled);
-
-	printf ("alarms-length %d\n", g_list_length (ico->alarms));
-
-	printf ("recur %p\n", ico->recur);
-
-	printf ("new %d\n", ico->new);
-
-	printf ("user_data %p\n", ico->user_data);
-
-	printf ("ref_count %d\n", ico->ref_count);
-}
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
deleted file mode 100644
index 3caef945e2..0000000000
--- a/calendar/cal-util/calobj.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Internal representation of a Calendar object.  This is modeled after the
- * iCalendar/vCalendar specificiation
- *
- * Authors: Miguel de Icaza (miguel@gnu.org)
- *          Federico Mena (quartic@gimp.org).
- */
-#ifndef CALOBJ_H
-#define CALOBJ_H
-
-#include <libgnome/libgnome.h>
-#include "libversit/vcc.h"
-
-BEGIN_GNOME_DECLS
-
-/* Alarm types */
-enum AlarmType {
-	ALARM_MAIL,
-	ALARM_PROGRAM,
-	ALARM_DISPLAY,
-	ALARM_AUDIO
-};
-
-/* Whether the alarm should trigger N mins/hours/days before its due time */
-enum AlarmUnit {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS
-};
-
-/* Field identifiers for the iCalObject structure. These are also used to
-   identify columns in ECalendarTable, so be careful when reordering them. */
-typedef enum {
-	ICAL_OBJECT_FIELD_COMMENT,
-	ICAL_OBJECT_FIELD_COMPLETED,
-	ICAL_OBJECT_FIELD_CREATED,
-	ICAL_OBJECT_FIELD_DESCRIPTION,
-	ICAL_OBJECT_FIELD_DTSTAMP,
-	ICAL_OBJECT_FIELD_DTSTART,
-	ICAL_OBJECT_FIELD_DTEND,
-	ICAL_OBJECT_FIELD_GEO,
-	ICAL_OBJECT_FIELD_LAST_MOD,
-	ICAL_OBJECT_FIELD_LOCATION,
-	ICAL_OBJECT_FIELD_ORGANIZER,
-	ICAL_OBJECT_FIELD_PERCENT,
-	ICAL_OBJECT_FIELD_PRIORITY,
-	ICAL_OBJECT_FIELD_SUMMARY,
-	ICAL_OBJECT_FIELD_URL,
-	ICAL_OBJECT_FIELD_HAS_ALARMS, /* not a real field */
-	ICAL_OBJECT_FIELD_ICON,	      /* not a real field */
-	ICAL_OBJECT_FIELD_COMPLETE,   /* not a real field */
-	ICAL_OBJECT_FIELD_RECURRING,  /* not a real field */
-	ICAL_OBJECT_FIELD_OVERDUE,    /* not a real field */
-	ICAL_OBJECT_FIELD_COLOR,      /* not a real field */
-	ICAL_OBJECT_FIELD_NUM_FIELDS
-} iCalObjectField;
-
-typedef struct {
-	enum AlarmType type;
-	int            enabled;
-	int            count;
-	enum AlarmUnit units;
-	char           *data;	/* not used for iCalendar alarms */
-
-	/* the following pointers are used for iCalendar alarms */
-
-	char           *attach;	           /* AUDIO, EMAIL, PROC */
-	char           *desc;	           /* DISPLAY, EMAIL, PROC */
-	char           *summary;           /* EMAIL */
-	char           *attendee;          /* EMAIL */
-
-	/* Does not get saved, internally used */
-	time_t         offset;
-	time_t         trigger;
-
-	int            snooze_secs;
-	int	       snooze_repeat;
-	
-	/* Widgets */
-	void           *w_count;      /* A GtkEntry */
-	void           *w_enabled;    /* A GtkChecButton */
-	void           *w_timesel;    /* A GtkMenu */
-	void           *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
-	void           *w_label;
-} CalendarAlarm;
-
-/* Calendar object type */
-typedef enum {
-	ICAL_EVENT,
-	ICAL_TODO,
-	ICAL_JOURNAL,
-	ICAL_FBREQUEST,
-	ICAL_FBREPLY,
-	ICAL_BUSYTIME,
-	ICAL_TIMEZONE
-} iCalType;
-
-/* For keys that might contain binary or text/binary */
-typedef struct {
-	char *data;
-	int  len;
-} iCalValue;
-
-typedef enum {
-	ICAL_PILOT_SYNC_NONE = 0,
-	ICAL_PILOT_SYNC_MOD  = 1,
-	ICAL_PILOT_SYNC_DEL  = 3
-} iCalPilotState;
-
-typedef struct {
-	int     valid;		/* true if the Geography was specified */
-	double  latitude;
-	double  longitude;
-} iCalGeo;
-
-typedef enum {
-	ICAL_OPAQUE,
-	ICAL_TRANSPARENT
-} iCalTransp;
-
-typedef struct {
-	char   *uid;
-	char   *reltype;
-} iCalRelation;
-
-typedef char NotYet;
-
-enum RecurType {
-	RECUR_DAILY,
-	RECUR_WEEKLY,
-	RECUR_MONTHLY_BY_POS,
-	RECUR_MONTHLY_BY_DAY,
-	RECUR_YEARLY_BY_MONTH,
-	RECUR_YEARLY_BY_DAY,
-};
-
-#define DAY_LASTDAY 10000
-
-typedef struct {
-	enum RecurType type;
-
-	int            interval;
-
-	/* Used for recur computation */
-	time_t         enddate;	/* If the value is zero, it is an infinite event
-				 * otherwise, it is either the _enddate value (if
-				 * this is what got specified)  or it is our computed
-				 * ending date (computed from the duration item).
-				 */
-
-	int            weekday;
-
-	union {
-		int    month_pos;
-		int    month_day;
-	} u;
-
-	int            duration;
-	time_t         _enddate; /* As found on the vCalendar file */
-	int            __count;
-} Recurrence;
-
-/* 
-   NOTE: iCalPerson is used for various property values which specify
-   people (e.g. ATTENDEE, ORGANIZER, etc.  Not all fields are valid
-   under RFC 2445 for all property values, but iCalPerson can store
-   them anyway.  Enforcing the RFC is a job for the parser.
-*/
-
-typedef struct {
-	char          *addr;
-	char          *name;
-	char          *role;
-	char          *partstat;
-	gboolean      rsvp;
-	char          *cutype;	/* calendar user type */
-	GList         *member;	/* group memberships */
-	GList         *deleg_to;
-	GList         *deleg_from;
-	char          *sent_by;
-	char          *directory;
-	GList         *altrep;	/* list of char* URI's */
-} iCalPerson;
-
-#define IS_INFINITE(r) (r->duration == 0)
-
-/* Flags to indicate what has changed in an object */
-typedef enum {
-	CHANGE_NEW     = 1 << 0,	/* new object */
-	CHANGE_SUMMARY = 1 << 1,	/* summary */
-	CHANGE_DATES   = 1 << 2,	/* dtstart / dtend */
-	CHANGE_ALL     = CHANGE_SUMMARY | CHANGE_DATES
-} CalObjectChange;
-
-/*
- * This describes an iCalendar object, note that we never store durations, instead we
- * always compute the end time computed from the start + duration.
- */
-typedef struct {
-	iCalType      type;
-
-	GList         *attach;		/* type: one or more URIs or binary data */
-        GList         *attendee; 	/* type: CAL-ADDRESS (list of iCalPerson) */
-	GList         *categories; 	/* type: one or more TEXT */
-	char          *class;
-
-	char          *comment;		/* we collapse one or more TEXTs into one */
-	time_t        completed;
-	time_t        created;
-	GList         *contact;		/* type: one or more TEXT */
-	char          *desc;
-	time_t        dtstamp;
-	time_t        dtstart;
-	time_t        dtend;            /* also duedate for todo's */
-        gboolean      date_only;        /* set if the start/end times were
-   specified using dates, not times (internal use, not stored to disk) */
-	GList         *exdate;		/* type: one or more time_t's */
-	GList         *exrule;		/* type: one or more RECUR */
-	iCalGeo       geo;
-	time_t        last_mod;
-	char          *location;
-	iCalPerson    *organizer;
-	int           percent;
-	int           priority;
-	char          *rstatus;	        /* request status for freebusy */
-	GList         *related;		/* type: one or more TEXT */
-	GList         *resources;	/* type: one or more TEXT */
-	GList         *rdate;		/* type: one or more recurrence date */
-	GList         *rrule;		/* type: one or more recurrence rules */
-	int           seq;
-	char          *status;
-	char          *summary;
-	iCalTransp    transp;
-	char          *uid;
-	char          *url;
-	time_t        recurid;
-
-	CalendarAlarm dalarm;
-	CalendarAlarm aalarm;
-	CalendarAlarm palarm;
-	CalendarAlarm malarm;
-
-	GList         *alarms;
-
-	Recurrence    *recur;
-	
-	int new;
-	void *user_data;		/* Generic data pointer */
-
-	/* Pilot */
-	iCalPilotState pilot_status;    /* Status information */
-	guint32            pilot_id;        /* Pilot ID */
-
-	guint	       ref_count;
-} iCalObject;
-
-/* The callback for the recurrence generator */
-typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *);
-
-iCalObject *ical_new                        (char *comment, char *organizer, char *summary);
-iCalObject *ical_object_new                 (void);
-
-void        ical_object_ref                 (iCalObject *ico);
-void        ical_object_unref               (iCalObject *ico);
-
-iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);
-VObject    *ical_object_to_vobject          (iCalObject *ical);
-iCalObject *ical_object_duplicate           (iCalObject *o);
-void        ical_foreach                    (GList *events, calendarfn fn, void *closure);
-void        ical_object_generate_events     (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure);
-void        ical_object_add_exdate          (iCalObject *o, time_t t);
-
-/* Computes the enddate field of the recurrence based on the duration */
-void        ical_object_compute_end         (iCalObject *ico);
-
-typedef enum {
-	CAL_OBJ_FIND_SUCCESS,
-	CAL_OBJ_FIND_SYNTAX_ERROR,
-	CAL_OBJ_FIND_NOT_FOUND
-} CalObjFindStatus;
-
-CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);
-
-char       *ical_object_to_string (iCalObject *ico);
-
-
-/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple
- * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.
- */
-int	    ical_object_get_first_weekday (int weekday_mask);
-
-/* Returns the number of seconds configured to trigger the alarm in advance to an event */
-int         alarm_compute_offset (CalendarAlarm *a);
-
-
-/* Returns TRUE if the dates of both objects match, including any recurrence
-   rules. */
-gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
-
-/* Generates a new uid for a calendar object. Should be g_free'd eventually. */
-char	   *ical_gen_uid (void);
-
-/* This resets any recurrence rules of the iCalObject. */
-void	    ical_object_reset_recurrence (iCalObject *ico);
-
-
-void dump_icalobject (iCalObject *ico);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
deleted file mode 100644
index 213017ea0e..0000000000
--- a/calendar/cal-util/test-recur.c
+++ /dev/null
@@ -1,198 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-}
-
-
-static void
-generate_occurrences	(icalcomponent	*icalcomp)
-{
-	icalcompiter iter;
-
-	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,
-					      NULL, NULL);
-#else
-		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, &occurrences,
-					      NULL, NULL);
-#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 f66d851399..0000000000
--- a/calendar/cal-util/timeutil.c
+++ /dev/null
@@ -1,585 +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);
-}
-
-time_t
-time_add_month (time_t time, int months)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	int mday;
-
-	mday = tm->tm_mday;
-	
-	tm->tm_mon += months;
-	tm->tm_isdst = -1;
-	if ((new_time = mktime (tm)) == -1) {
-		g_message ("time_add_month(): mktime() could not handling adding %d months with\n",
-			   months);
-		print_time_t (time);
-		printf ("\n");
-		return time;
-	}
-	tm = localtime (&new_time);
-	if (tm->tm_mday < mday) {
-		tm->tm_mon--;
-		tm->tm_mday = time_days_in_month (tm->tm_year+1900, tm->tm_mon);
-		return new_time = mktime (tm);
-	}
-	else
-		return new_time;
-}
-
-time_t
-time_year_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the start of the week. week_start_day should use the same values
-   as mktime(), i.e. 0 (Sun) to 6 (Sat). */
-time_t
-time_week_begin (time_t t, int week_start_day)
-{
-	struct tm tm;
-	int offset;
-
-	tm = *localtime (&t);
-
-	/* Calculate the current offset from the week start day. */
-	offset = (tm.tm_wday + 7 - week_start_day) % 7;
-
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday -= offset;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the start of the day, according to the local time. */
-time_t
-time_day_begin (time_t t)
-{
-	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.
-   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;
-
-	/* Convert to an icaltimetype. */
-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
-
-	/* Add on the number of months. */
-	tt.month += months;
-
-	/* Normalize it, fixing 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 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);
-}
-
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
deleted file mode 100644
index 0e2795b287..0000000000
--- a/calendar/cal-util/timeutil.h
+++ /dev/null
@@ -1,121 +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);
-time_t	time_add_month		(time_t time, int months);
-
-/* Returns the beginning of the year or month. */
-time_t	time_year_begin		(time_t t);
-time_t	time_month_begin	(time_t t);
-
-/* Returns the beginning of the week. week_start_day should use the same values
-   as mktime(), i.e. 0 (Sun) to 6 (Sat). */
-time_t	time_week_begin		(time_t t, int week_start_day);
-
-/* 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);
-
-#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 0a71acb974..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,48 +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		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# Calendar Conduit
-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c		\
-	calendar-conduit.h		\
-	calendar-conduit-config.h
-
-libecalendar_conduit_la_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.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/libwombat/libwombat-static.la		 	\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_GNOME_LIBS)						\
-	$(PISOCK_LIBS) 							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_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-config.h b/calendar/conduits/calendar/calendar-conduit-config.h
deleted file mode 100644
index 533654de83..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAL_CONDUIT_CONFIG_H__
-#define __CAL_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _ECalConduitCfg ECalConduitCfg;
-struct _ECalConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef CAL_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (ECalConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef CAL_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef CAL_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef CAL_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-calconduit_destroy_configuration (ECalConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __CAL_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index 5d93e77bce..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1194 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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-file.h>
-#include <pi-dlp.h>
-#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-util.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_DESTROY
-
-#include <calendar-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.5"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "ecalconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* Debug 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 : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static ECalConduitContext *
-e_calendar_context_new (guint32 pilot_id) 
-{
-	ECalConduitContext *ctxt = g_new0 (ECalConduitContext, 1);
-
-	calconduit_load_configuration (&ctxt->cfg, pilot_id);
-
-	return ctxt;
-}
-
-static void
-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext *ctxt)
-{
-	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->calendar_file)
-		g_free (ctxt->calendar_file);
-
-	if (ctxt->uids)
-		cal_obj_uid_list_free (ctxt->uids);
-
-	if (ctxt->changed_hash)
-		g_hash_table_foreach (ctxt->changed_hash, e_calendar_context_foreach_change, NULL);
-
-	if (ctxt->changed)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->map)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	ECalConduitContext *ctxt;
-
-	ctxt = data;
-
-	LOG ("  entering start_calendar_server_cb\n");
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		ctxt->calendar_open_success = TRUE;
-		LOG ("    success\n");
-	} else
-		LOG ("    open of calendar failed\n");
-
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_open_calendar\n");
-	if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_open_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-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 short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-
-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;
-	
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char, 0xffff);
-	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime dt;
-	time_t dt_time;
-	CalComponentClassification classif;
-	int i;
-	
-	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);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment, 1);
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = 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;
-	}
-
-	cal_component_get_dtstart (comp, &dt);	
-	if (dt.value) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->begin = *localtime (&dt_time);
-	}
-
-	cal_component_get_dtend (comp, &dt);	
-	if (dt.value && time_add_day (dt_time, 1) != icaltime_as_timet (*dt.value)) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->end = *localtime (&dt_time);
-		local->appt->event = 0;
-	} else {
-		local->appt->event = 1;
-	}
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-	
-	if (cal_component_has_rrules (comp)) {
-		GSList *list;
-		struct icalrecurrencetype *recur;
-		
-		cal_component_get_rrule_list (comp, &list);
-		recur = list->data;
-		
-		switch (recur->freq) {
-		case ICAL_DAILY_RECURRENCE:
-			local->appt->repeatType = repeatDaily;
-			break;
-		case ICAL_WEEKLY_RECURRENCE:
-			local->appt->repeatType = repeatWeekly;
-			for (i = 0; i <= 7 && recur->by_day[i] != 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;
-			dt_time = icaltime_as_timet (recur->until);
-			local->appt->repeatEnd = *localtime (&dt_time);
-		}
-		
-		cal_component_free_recur_list (list);
-	}
-
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;  
-}
-
-static void 
-local_record_from_uid (ECalLocalRecord *local,
-		       const char *uid,
-		       ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE), it;
-	struct icalrecurrencetype recur;
-	int pos, i;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	char *txt;
-	
-	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_comment_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 = icaltime_from_timet (mktime (&appt.begin), FALSE);
-		dt.value = &it;
-		cal_component_set_dtstart (comp, &dt);
-	}
-
-	if (appt.event) {
-		time_t t = mktime (&appt.begin);
-		
-		t = time_day_end (t);
-		it = icaltime_from_timet (t, FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	} else if (!is_empty_time (appt.end)) {
-		it = icaltime_from_timet (mktime (&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;
-		recur.by_day[0] = nth_weekday (appt.repeatDay / 5, get_ical_day (appt.repeatDay % 5 - 1));
-		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) {
-			time_t t = mktime (&appt.repeatEnd);
-			t = time_add_day (t, 1);
-			recur.until = icaltime_from_timet (t, FALSE);
-		}
-
-		list = g_slist_append (list, &recur);
-		cal_component_set_rrule_list (comp, list);
-		g_slist_free (list);
-	} else {
-		cal_component_set_rrule_list (comp, NULL);		
-	}
-
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     ECalConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *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);
-	g_message ("Calendar Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* 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);
-
-	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;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	/* 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);
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    ECalLocalRecord *local,
-		    ECalConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("set_status_cleared: clearing status\n");
-	
-	cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  ECalLocalRecord **local,
-	  ECalConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} 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);
-		} 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);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       ECalLocalRecord *local,
-	       ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	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);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (ECalLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    ECalLocalRecord *local,
-	    ECalConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG ("in calendar's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	ctxt = e_calendar_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	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/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
deleted file mode 100644
index a236eacae6..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ /dev/null
@@ -1,79 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CALENDAR_CONDUIT_H__
-#define __CALENDAR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution Calendar conduit. */
-typedef struct _ECalLocalRecord ECalLocalRecord;
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct Appointment *appt;
-};
-
-/* This is the context for all the Evolution Calendar conduit methods. */
-typedef struct _ECalConduitContext ECalConduitContext;
-struct _ECalConduitContext {
-	ECalConduitCfg *cfg;
-
-	struct AppointmentAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_open_success;
-
-	time_t since;
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __CALENDAR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
deleted file mode 100644
index 5988e6cb08..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Calendar Conduit
-_Comment=Configure the Evolution Calendar conduit
-Exec=e-calendar-conduit-control-applet --cap-id=1
-TryExec=e-calendar-conduit-control-applet
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 336901f581..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 merge_from_pilot merge_to_pilot"/>
-     	<conduit-attribute name="settings" value="FALSE"/>
-	<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 90cc75b3bd..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,48 +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		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# ToDo Conduit
-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = 	\
-	todo-conduit.c 		\
-	todo-conduit.h		\
-	todo-conduit-config.h 
-
-libetodo_conduit_la_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.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/libwombat/libwombat-static.la	 		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_GNOME_LIBS)						\
-	$(PISOCK_LIBS) 							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_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-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
deleted file mode 100644
index ec5856fcad..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution ToDo Conduit
-_Comment=Configure the Evolution ToDo conduit
-Exec=e-todo-conduit-control-applet --cap-id=1
-TryExec=e-todo-conduit-control-applet
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 733c2105db..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 merge_from_pilot merge_to_pilot"/>
-     	<conduit-attribute name="settings" value="FALSE"/>
-	<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-config.h b/calendar/conduits/todo/todo-conduit-config.h
deleted file mode 100644
index be521682a5..0000000000
--- a/calendar/conduits/todo/todo-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_CONFIG_H__
-#define __TODO_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-struct _EToDoConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef TODO_CONFIG_LOAD
-/* Load the configuration data */
-static void 
-todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EToDoConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef TODO_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef TODO_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef TODO_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __TODO_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index b531492b4f..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1009 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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-file.h>
-#include <pi-dlp.h>
-#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-util.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_DESTROY
-
-#include <todo-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.4"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "etodoconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* Debug 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 : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static EToDoConduitContext *
-e_todo_context_new (guint32 pilot_id) 
-{
-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);
-
-	todoconduit_load_configuration (&ctxt->cfg, pilot_id);
-
-	return ctxt;
-}
-
-static void
-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext *ctxt)
-{
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		todoconduit_destroy_configuration (&ctxt->cfg);
-
-	if (ctxt->client != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->client));
-
-	if (ctxt->calendar_file)
-		g_free (ctxt->calendar_file);
-
-	if (ctxt->uids)
-		cal_obj_uid_list_free (ctxt->uids);
-
-	if (ctxt->changed_hash)
-		g_hash_table_foreach (ctxt->changed_hash, e_todo_context_foreach_change, NULL);
-
-	if (ctxt->changed)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->map)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	EToDoConduitContext *ctxt;
-
-	ctxt = data;
-
-	LOG ("  entering start_calendar_server_cb\n");
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		ctxt->calendar_open_success = TRUE;
-		LOG ("    success\n");
-	} else
-		LOG ("    open of calendar failed\n");
-
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Tasks/tasks.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_open_calendar\n");
-	if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_open_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-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;
-	
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char, 0xffff);
-	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	struct icaltimetype *completed;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime due;
-	time_t due_time;
-	CalComponentClassification classif;
-
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = 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) {
-		due_time = icaltime_as_timet (*due.value);
-		
-		local->todo->due = *localtime (&due_time);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-
-	cal_component_get_completed (comp, &completed);
-	if (completed) {
-		local->todo->complete = 1;
-		cal_component_free_icaltimetype (completed);
-	}	
-
-	cal_component_get_priority (comp, &priority);
-	if (priority) {
-		local->todo->priority = *priority;
-		cal_component_free_priority (priority);
-	}
-	
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EToDoLocalRecord *local,
-		       const char *uid,
-		       EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct ToDo todo;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE);
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	struct icaltimetype due;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
-	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);
-	}
-
-	if (!is_empty_time (todo.due)) {
-		due = icaltime_from_timet (mktime (&todo.due), FALSE);
-		dt.value = &due;
-		cal_component_set_due (comp, &dt);
-	}
-	
-	cal_component_set_priority (comp, &todo.priority);
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     EToDoConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-	} 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->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;
-	}
-
-	/* 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);
-
-	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;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	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);
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EToDoLocalRecord *local,
-		    EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("set_status_cleared: clearing status\n");
-	
-	cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EToDoLocalRecord **local,
-	  EToDoConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EToDoLocalRecord **local,
-		   EToDoConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} 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);
-		} 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);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EToDoLocalRecord *local,
-	       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->comp != NULL, -1);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	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);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EToDoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EToDoLocalRecord *local,
-	    EToDoConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG ("in todo's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-
-	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);
-
-	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/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
deleted file mode 100644
index 2415e189c0..0000000000
--- a/calendar/conduits/todo/todo-conduit.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_H__
-#define __TODO_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-todo.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct ToDo *todo;
-};
-
-/* This is the context for all the Evolution ToDo  conduit methods. */
-typedef struct _EToDoConduitContext EToDoConduitContext;
-struct _EToDoConduitContext {
-	EToDoConduitCfg *cfg;
-
-	struct ToDoAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_open_success;
-
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __TODO_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index 0c53690409..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,20 +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-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/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
deleted file mode 100644
index bd61419d04..0000000000
--- a/calendar/gui/Evolution-Composer.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * This file was generated by orbit-idl - DO NOT EDIT!
- */
-
-#include <glib.h>
-#define ORBIT_IDL_SERIAL 9
-#include <orb/orbit.h>
-
-#ifndef Evolution_Composer_H
-#define Evolution_Composer_H 1
-#ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
-
-/** typedefs **/
-#include <bonobo/Bonobo.h>
-#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
-#define ORBIT_DECL_GNOME_Evolution_Composer 1
-#define _GNOME_Evolution_Composer_defined 1
-#define GNOME_Evolution_Composer__free CORBA_Object__free
-   typedef CORBA_Object GNOME_Evolution_Composer;
-   extern CORBA_unsigned_long GNOME_Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_struct;
-#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct)
-#endif
-#endif
-#if !defined(_GNOME_Evolution_Composer_Recipient_defined)
-#define _GNOME_Evolution_Composer_Recipient_defined 1
-   typedef struct
-   {
-      CORBA_char *name;
-      CORBA_char *address;
-   }
-   GNOME_Evolution_Composer_Recipient;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern GNOME_Evolution_Composer_Recipient
-      *GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							    gpointer dat,
-							    CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   typedef struct
-   {
-      CORBA_unsigned_long _maximum,
-       _length;
-      GNOME_Evolution_Composer_Recipient *_buffer;
-      CORBA_boolean _release;
-   }
-   CORBA_sequence_GNOME_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer
-      CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							      gpointer dat,
-							      CORBA_boolean free_strings);	/* ORBit internal use */
-   GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf
-      (CORBA_unsigned_long len);
-#endif
-#if !defined(_GNOME_Evolution_Composer_RecipientList_defined)
-#define _GNOME_Evolution_Composer_RecipientList_defined 1
-   typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      GNOME_Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_RecipientList_struct;
-#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct)
-#endif
-   extern GNOME_Evolution_Composer_RecipientList
-      *GNOME_Evolution_Composer_RecipientList__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_RecipientList__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0"
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer
-								*
-								_ORBIT_recv_buffer,
-								CORBA_Environment
-								* ev);
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
-							      _ORBIT_send_buffer,
-							      CORBA_Environment
-							      * ev);
-#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined)
-#define _GNOME_Evolution_Composer_CouldNotParse_defined 1
-   typedef struct
-   {
-      int dummy;
-   }
-   GNOME_Evolution_Composer_CouldNotParse;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_CouldNotParse_struct;
-#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct)
-#endif
-#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL
-   extern gpointer GNOME_Evolution_Composer_CouldNotParse__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-
-/** POA structures **/
-   typedef struct
-   {
-      void *_private;
-      void (*setHeaders) (PortableServer_Servant _servant,
-			  const GNOME_Evolution_Composer_RecipientList * to,
-			  const GNOME_Evolution_Composer_RecipientList * cc,
-			  const GNOME_Evolution_Composer_RecipientList * bcc,
-			  const CORBA_char * subject, CORBA_Environment * ev);
-      void (*setBodyText) (PortableServer_Servant _servant,
-			   const CORBA_char * body, CORBA_Environment * ev);
-      void (*attachMIME) (PortableServer_Servant _servant,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*attachData) (PortableServer_Servant _servant,
-			  const CORBA_char * content_type,
-			  const CORBA_char * filename,
-			  const CORBA_char * description,
-			  const CORBA_boolean show_inline,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
-   }
-   POA_GNOME_Evolution_Composer__epv;
-   typedef struct
-   {
-      PortableServer_ServantBase__epv *_base_epv;
-      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
-      POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv;
-   }
-   POA_GNOME_Evolution_Composer__vepv;
-   typedef struct
-   {
-      void *_private;
-      POA_GNOME_Evolution_Composer__vepv *vepv;
-   }
-   POA_GNOME_Evolution_Composer;
-   extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-   extern void POA_GNOME_Evolution_Composer__fini(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-
-/** prototypes **/
-#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref
-#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref
-#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
-   void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * to,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * cc,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * bcc, const CORBA_char * subject,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj,
-					     const CORBA_char * body,
-					     CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachData(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * content_type,
-					    const CORBA_char * filename,
-					    const CORBA_char * description,
-					    const CORBA_boolean show_inline,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_show(GNOME_Evolution_Composer _obj,
-				      CORBA_Environment * ev);
-
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setHeaders
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setHeaders) (PortableServer_Servant _servant,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * to,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * cc,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * bcc, const CORBA_char * subject,
-				 CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setBodyText
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setBodyText) (PortableServer_Servant _servant,
-				  const CORBA_char * body,
-				  CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachMIME
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachMIME) (PortableServer_Servant _servant,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachData
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachData) (PortableServer_Servant _servant,
-				 const CORBA_char * content_type,
-				 const CORBA_char * filename,
-				 const CORBA_char * description,
-				 const CORBA_boolean show_inline,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void _ORBIT_skel_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer
-						  * _ORBIT_servant,
-						  GIOPRecvBuffer *
-						  _ORBIT_recv_buffer,
-						  CORBA_Environment * ev,
-						  void (*_impl_show)
-						  (PortableServer_Servant
-						   _servant,
-						   CORBA_Environment * ev));
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif
-#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index 70924677f7..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,120 +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_ShellComponentFactory"
-            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 calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory">
-
-	<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:GenericFactory: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/PersistFile: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_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index 0aa57aeda8..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,185 +0,0 @@
-## CORBA stuff
-
-IDLS =												   \
-	$(top_srcdir)/composer/Evolution-Composer.idl						   \
-	$(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-IDL_GENERATED =                 			\
-        Evolution-Composer.h              		\
-        Evolution-Composer-common.c       		\
-        Evolution-Composer-skels.c        		\
-        Evolution-Composer-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
-
-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)/widgets				\
-	-I$(includedir)					\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	$(GNOME_VFS_CFLAGS)				\
-	$(GAL_CFLAGS)					\
-	$(BONOBO_CONF_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-        -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"        \
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 					\
-	e-itip-control.glade			\
-	goto-dialog.glade
-
-etspecdir = $(datadir)/evolution/etspec/
-etspec_DATA = e-calendar-table.etspec
-
-evolution_calendar_SOURCES =			\
-	$(IDL_GENERATED)			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-model.c			\
-	calendar-model.h			\
-	calendar-view.c				\
-	calendar-view.h				\
-	calendar-view-factory.c			\
-	calendar-view-factory.h			\
-	comp-util.c				\
-	comp-util.h				\
-	control-factory.c			\
-	control-factory.h			\
-	component-factory.c			\
-	component-factory.h			\
-	e-calendar-table.h			\
-	e-calendar-table.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-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					\
-	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)/libversit/libversit.la						\
-	$(top_builddir)/libical/src/libical/libical.la					\
-	$(top_builddir)/libwombat/libwombat.la						\
-	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a			\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
-	$(top_builddir)/libversit/libversit.la						\
-	$(top_builddir)/e-util/ename/libename.la					\
-	dialogs/libcal-dialogs.a							\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
-	$(EXTRA_GNOME_LIBS)								\
-	$(BONOBO_HTML_GNOME_LIBS)							\
-	$(GNOME_VFS_LIBS)								\
-	$(BONOBO_CONF_LIBS)								\
-	$(GAL_LIBS)									\
-	$(INTLLIBS)
-
-#evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-
-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 1f2b546c7c..0000000000
--- a/calendar/gui/alarm-notify/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-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 4176a71685..0000000000
--- a/calendar/gui/alarm-notify/Makefile.am
+++ /dev/null
@@ -1,85 +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 # evolution-alarm-client
-
-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)					\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-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			\
-	notify-main.c
-
-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.la		\
-	$(top_builddir)/libwombat/libwombat.la			\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(INTLLIBS)
-
-# evolution_alarm_client_SOURCES =	\
-# 	client-main.c			\
-# 	$(CORBA_GENERATED)
-# 
-# evolution_alarm_client_LDADD =		\
-# 	 $(BONOBO_VFS_GNOME_LIBS)	\
-# 	 $(EXTRA_GNOME_LIBS)		\
-# 	 $(INTLLIBS)
-
-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 2a11026f23..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/* Evolution calendar - alarm notification 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/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 <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *message;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Creates a heading for the alarm notification dialog */
-static char *
-make_heading (CalComponentVType vtype, time_t occur_start, time_t occur_end)
-{
-	char *buf;
-	char s[128], e[128];
-
-	if (occur_start != -1) {
-		struct tm tm;
-
-		tm = *localtime (&occur_start);
-		strftime (s, sizeof (s), "%A %b %d %Y %H:%M", &tm);
-	}
-
-	if (occur_end != -1) {
-		struct tm tm;
-
-		tm = *localtime (&occur_end);
-		strftime (e, sizeof (e), "%A %b %d %Y %H:%M", &tm);
-	}
-
-	/* I love combinatorial explosion */
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		if (occur_start != -1) {
-			if (occur_end != -1)
-				buf = g_strdup_printf (_("Notification about your appointment "
-							 "starting on %s and ending on %s"),
-						       s, e);
-			else
-				buf = g_strdup_printf (_("Notification about your appointment "
-							"starting on %s"),
-						      s);
-		} else {
-			if (occur_end != -1)
-				buf = g_strdup_printf (_("Notification about your appointment "
-							 "ending on %s"),
-						       e);
-			else
-				buf = g_strdup_printf (_("Notification about your appointment"));
-		}
-		break;
-
-	case CAL_COMPONENT_TODO:
-		if (occur_start != -1) {
-			if (occur_end != -1)
-				buf = g_strdup_printf (_("Notification about your task "
-							 "starting on %s and ending on %s"),
-						       s, e);
-			else
-				buf = g_strdup_printf (_("Notification about your task "
-							"starting on %s"),
-						      s);
-		} else {
-			if (occur_end != -1)
-				buf = g_strdup_printf (_("Notification about your task "
-							 "ending on %s"),
-						       e);
-			else
-				buf = g_strdup_printf (_("Notification about your task"));
-		}
-		break;
-
-	default:
-		/* Only VEVENTs and VTODOs can have alarms */
-		g_assert_not_reached ();
-		buf = NULL;
-		break;
-	}
-
-	return buf;
-}
-
-/**
- * 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;
-	char buf[256];
-	char *heading;
-	char *msg;
-	struct tm tm_trigger;
-
-	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");
-
-	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 */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	heading = make_heading (vtype, occur_start, occur_end);
-	gtk_label_set_text (GTK_LABEL (an->heading), heading);
-	g_free (heading);
-
-	/* Message */
-
-	msg = e_utf8_to_gtk_string (an->message, message);
-	if (msg) {
-		gtk_label_set_text (GTK_LABEL (an->message), msg);
-		g_free (msg);
-	} else
-		g_message ("Could not convert the alarm message from UTF8");
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
deleted file mode 100644
index 2eebbf1796..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,45 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 88d25dafbc..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ /dev/null
@@ -1,285 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnomevfs/gnome-vfs.h>
-#include <cal-client/cal-client.h>
-#include "alarm-notify.h"
-#include "alarm-queue.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.
-	 */
-	GnomeVFSURI *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 GnomeVFSURIs 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 void AlarmNotify_die (PortableServer_Servant servant,
-			     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;
-	class->epv.die = AlarmNotify_die;
-
-	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 (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-}
-
-/* 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;
-
-	lc = value;
-
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	gnome_vfs_uri_unref (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 */
-
-/* AlarmNotify::addCalendar method */
-static void
-AlarmNotify_addCalendar (PortableServer_Servant servant,
-			 const CORBA_char *str_uri,
-			 CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	GnomeVFSURI *uri;
-	CalClient *client;
-	LoadedClient *lc;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	uri = gnome_vfs_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	lc = g_hash_table_lookup (priv->uri_client_hash, uri);
-
-	if (lc) {
-		gnome_vfs_uri_unref (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, uri, lc);
-
-			alarm_queue_add_client (client);
-		} else {
-			gtk_object_unref (GTK_OBJECT (client));
-			client = NULL;
-		}
-	}
-
-	if (!client) {
-		gnome_vfs_uri_unref (uri);
-
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError,
-				     NULL);
-		return;
-	}
-}
-
-/* AlarmNotify::removeCalendar method */
-static void
-AlarmNotify_removeCalendar (PortableServer_Servant servant,
-			    const CORBA_char *str_uri,
-			    CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	LoadedClient *lc;
-	GnomeVFSURI *uri;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	uri = gnome_vfs_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	lc = g_hash_table_lookup (priv->uri_client_hash, uri);
-	gnome_vfs_uri_unref (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, lc->uri);
-
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	gnome_vfs_uri_unref (lc->uri);
-	g_free (lc);
-}
-
-static void
-AlarmNotify_die (PortableServer_Servant servant,
-		 CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	/* FIXME */
-}
-
-
-
-/**
- * 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;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 19af18f010..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,206 +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>
-
-      <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 4122b269fa..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ /dev/null
@@ -1,63 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
deleted file mode 100644
index 7f829e1bf5..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ /dev/null
@@ -1,1078 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gtk/gtksignal.h>
-#include <cal-util/timeutil.h>
-#include "alarm.h"
-#include "alarm-notify-dialog.h"
-#include "alarm-queue.h"
-
-
-
-/* Whether the queueing system has been initialized */
-static gboolean alarm_queue_inited;
-
-/* 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;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-static void display_notification (time_t trigger, CalAlarmInstance *instance,
-				  CalComponent *comp, CalComponentAlarm *alarm);
-
-
-
-/* Alarm queue engine */
-
-static void load_alarms (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;
-
-	g_assert (midnight_refresh_id == NULL);
-
-	midnight = time_day_end (time (NULL));
-
-	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 (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);
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	CalComponent *comp;
-	GSList *l;
-	QueuedAlarm *qa;
-	CalComponentAlarm *alarm;
-	CalAlarmAction action;
-
-	cqa = data;
-	comp = cqa->alarms->comp;
-
-	/* Look for the queued alarm so that we can identify its occurrence */
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (qa != NULL);
-
-	/* 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);
-
-	switch (action) {
-	case CAL_ALARM_AUDIO:
-		/* FIXME: audio_notification (); */
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		display_notification (trigger, qa->instance, comp, alarm);
-		break;
-
-	case CAL_ALARM_EMAIL:
-		/* FIXME: mail_notification (); */
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		/* FIXME: procedure_notification (); */
-		break;
-
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-
-	cal_component_alarm_free (alarm);
-}
-
-/* Callback used when an alarm must be destroyed */
-static void
-alarm_destroy_cb (gpointer alarm_id, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-	QueuedAlarm *qa;
-	const char *uid;
-
-	cqa = data;
-
-	qa = NULL; /* Keep GCC happy */
-
-	/* Find the alarm in the queued alarms */
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Remove it and free it */
-
-	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);
-}
-
-/* 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, alarm_destroy_cb);
-		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;
-
-		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 today's remaining alarms for a client */
-static void
-load_alarms (ClientAlarms *ca)
-{
-	time_t now, day_end;
-	GSList *comp_alarms;
-	GSList *l;
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	comp_alarms = cal_client_get_alarms_in_range (ca->client, now, day_end);
-
-	/* All of the last day's alarms should have already triggered and should
-	 * have been removed, so we should have no pending components.
-	 */
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		add_component_alarms (ca, alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/* 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 (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.  Also, we do not free the qa here because it will be
-		 * freed by the destroy notification function.
-		 */
-		l = l->next;
-
-		alarm_remove (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;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	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 */
-
-/* Callback used from the alarm notify dialog */
-static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	switch (result) {
-	case ALARM_NOTIFY_SNOOZE:
-		/* FIXME */
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		/* FIXME */
-		break;
-
-	case ALARM_NOTIFY_CLOSE:
-	default:
-		break;
-	}
-}
-
-/* Performs notification of a display alarm */
-static void
-display_notification (time_t trigger, CalAlarmInstance *instance,
-		      CalComponent *comp, CalComponentAlarm *alarm)
-{
-	CalComponentVType vtype;
-	CalComponentText text;
-	const char *message;
-
-	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.
-	 */
-
-	cal_component_alarm_get_description (alarm, &text);
-	if (text.value)
-		message = text.value;
-	else {
-		cal_component_get_summary (comp, &text);
-		if (text.value)
-			message = text.value;
-		else
-			message = _("No description available.");
-	}
-
-	if (!alarm_notify_dialog (trigger,
-				  instance->occur_start, instance->occur_end,
-				  vtype, message,
-				  notify_dialog_cb, comp))
-		g_message ("display_notification(): Could not create the alarm notify dialog");
-}
-
-
-
-/**
- * alarm_queue_init:
- *
- * Initializes the alarm queueing system.  This should be called near the
- * beginning of the program, after calling alarm_init().
- **/
-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 ();
-
-	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 (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);
-}
-
-
-
-#if 0
-
-/* Sends a mail notification of an alarm trigger */
-static void
-mail_notification (char *mail_address, char *text, time_t app_time)
-{
-	pid_t pid;
-	int   p [2];
-	char *command;
-
-	pipe (p);
-	pid = fork ();
-	if (pid == 0){
-		int dev_null;
-
-		dev_null = open ("/dev/null", O_RDWR);
-		dup2 (p [0], 0);
-		dup2 (dev_null, 1);
-		dup2 (dev_null, 2);
-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",
-		       mail_address, NULL);
-		_exit (127);
-	}
-	command = g_strconcat ("To: ", mail_address, "\n",
-			       "Subject: ", _("Reminder of your appointment at "),
-			       ctime (&app_time), "\n\n", text, "\n", NULL);
-	write (p [1], command, strlen (command));
- 	close (p [1]);
-	close (p [0]);
-	g_free (command);
-}
-
-static int
-max_open_files (void)
-{
-        static int files;
-
-        if (files)
-                return files;
-
-        files = sysconf (_SC_OPEN_MAX);
-        if (files != -1)
-                return files;
-#ifdef OPEN_MAX
-        return files = OPEN_MAX;
-#else
-        return files = 256;
-#endif
-}
-
-/* Executes a program as a notification of an alarm trigger */
-static void
-program_notification (char *command, int close_standard)
-{
-	struct sigaction ignore, save_intr, save_quit;
-	int status = 0, i;
-	pid_t pid;
-
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-
-	sigaction (SIGINT, &ignore, &save_intr);
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	if ((pid = fork ()) < 0){
-		fprintf (stderr, "\n\nfork () = -1\n");
-		return;
-	}
-	if (pid == 0){
-		pid = fork ();
-		if (pid == 0){
-			const int top = max_open_files ();
-			sigaction (SIGINT,  &save_intr, NULL);
-			sigaction (SIGQUIT, &save_quit, NULL);
-
-			for (i = (close_standard ? 0 : 3); i < top; i++)
-				close (i);
-
-			/* FIXME: As an excercise to the reader, copy the
-			 * code from mc to setup shell properly instead of
-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.
-			 */
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-
-			_exit (127);
-		} else {
-			_exit (127);
-		}
-	}
-	wait (&status);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-}
-
-/* Queues a snooze alarm */
-static void
-snooze (GnomeCalendar *gcal, CalComponent *comp, time_t occur, int snooze_mins, gboolean audio)
-{
-	time_t now, trigger;
-	struct tm tm;
-	CalAlarmInstance ai;
-
-	now = time (NULL);
-	tm = *localtime (&now);
-	tm.tm_min += snooze_mins;
-
-	trigger = mktime (&tm);
-	if (trigger == -1) {
-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");
-		return;
-	}
-
-#if 0
-	cal_component_get_uid (comp, &ai.uid);
-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;
-#endif
-	ai.trigger = trigger;
-	ai.occur = occur;
-
-	setup_alarm (gcal, &ai);
-}
-
-struct alarm_notify_closure {
-	GnomeCalendar *gcal;
-	CalComponent *comp;
-	time_t occur;
-};
-
-/* Callback used for the result of the alarm notification dialog */
-static void
-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct alarm_notify_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_CLOSE:
-		break;
-
-	case ALARM_NOTIFY_SNOOZE:
-		snooze (c->gcal, c->comp, c->occur, snooze_mins, FALSE);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		gnome_calendar_edit_object (c->gcal, c->comp);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-}
-
-/* Present a display notification of an alarm trigger */
-static void
-display_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	gboolean result;
-	struct alarm_notify_closure *c;
-
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	c = g_new (struct alarm_notify_closure, 1);
-	c->gcal = gcal;
-	c->comp = comp;
-	c->occur = occur;
-
-	result = alarm_notify_dialog (trigger, occur, comp, display_notification_cb, c);
-	if (!result) {
-		g_message ("display_notification(): could not display the alarm notification dialog");
-		g_free (c);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
-
-/* Present an audible notification of an alarm trigger */
-static void
-audio_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	g_message ("AUDIO NOTIFICATION!");
-	/* FIXME */
-}
-
-/* Callback function used when an alarm is triggered */
-static void
-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	struct trigger_alarm_closure *c;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *uid;
-	ObjectAlarms *oa;
-   	GList *l;
-
-	c = data;
-	priv = c->gcal->priv;
-
-	/* Fetch the object */
-
-	status = cal_client_get_object (priv->client, c->uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Go on */
-		break;
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-	case CAL_CLIENT_GET_NOT_FOUND:
-		g_message ("trigger_alarm_cb(): syntax error in fetched object");
-		return;
-	}
-
-	g_assert (comp != NULL);
-
-	/* Present notification */
-
-	switch (c->type) {
-	case CAL_COMPONENT_ALARM_EMAIL:
-#if 0
-		g_assert (ico->malarm.enabled);
-		mail_notification (ico->malarm.data, ico->summary, c->occur);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-#if 0
-		g_assert (ico->palarm.enabled);
-		program_notification (ico->palarm.data, FALSE);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-#if 0
-		g_assert (ico->dalarm.enabled);
-#endif
-		display_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	case CAL_COMPONENT_ALARM_AUDIO:
-#if 0
-		g_assert (ico->aalarm.enabled);
-#endif
-		audio_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Remove the alarm from the hash table */
-	cal_component_get_uid (comp, &uid);
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	g_assert (oa != NULL);
-
-	l = g_list_find (oa->alarm_ids, alarm_id);
-	g_assert (l != NULL);
-
-	oa->alarm_ids = g_list_remove_link (oa->alarm_ids, l);
-	g_list_free_1 (l);
-
-	if (!oa->alarm_ids) {
-		g_hash_table_remove (priv->alarms, uid);
-		g_free (oa->uid);
-		g_free (oa);
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-#endif
-
-#if 0
-
-static void
-stop_beeping (GtkObject* object, gpointer data)
-{
-	guint timer_tag, beep_tag;
-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));
-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));
-
-	if (beep_tag > 0) {
-		gtk_timeout_remove (beep_tag);
-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));
-	}
-	if (timer_tag > 0) {
-		gtk_timeout_remove (timer_tag);
-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));
-	}
-}
-
-static gint
-start_beeping (gpointer data)
-{
-	gdk_beep ();
-
-	return TRUE;
-}
-
-static gint
-timeout_beep (gpointer data)
-{
-	stop_beeping (data, NULL);
-	return FALSE;
-}
-
-void
-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)
-{
-	iCalObject *ico = data;
-	guint beep_tag, timer_tag;
-	int ret;
-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);
-	time_t now, diff;
-
-	if (&ico->aalarm == which){
-		time_t app = ico->aalarm.trigger + ico->aalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-
-		/* Idea: we need Snooze option :-) */
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);
-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);
-		if (enable_aalarm_timeout)
-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000,
-						     timeout_beep, w);
-		else
-			timer_tag = 0;
-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",
-				     GINT_TO_POINTER (timer_tag));
-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",
-				     GINT_TO_POINTER (beep_tag));
-		gtk_widget_ref (w);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			break;
-		}
-
-		gtk_widget_unref (w);
-		return;
-	}
-
-        if (&ico->palarm == which){
-		execute (ico->palarm.data, 0);
-		return;
-	}
-
-	if (&ico->malarm == which){
-		time_t app = ico->malarm.trigger + ico->malarm.offset;
-
-		mail_notify (ico->malarm.data, ico->summary, app);
-		return;
-	}
-
-	if (&ico->dalarm == which){
-		time_t app = ico->dalarm.trigger + ico->dalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		if (beep_on_display)
-			gdk_beep ();
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO,
-					   _("Ok"), snooze_button, NULL);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			break;
-		}
-
-		return;
-	}
-}
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
deleted file mode 100644
index cd2e9444b1..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 8f6ba013a4..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,357 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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"
-
-
-
-/* Whether the timer system has been initialized */
-static gboolean alarm_inited;
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Clears the itimer we have pending */
-static gboolean
-clear_itimer (void)
-{
-	return setup_itimer (0);
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else
-		if (!clear_itimer ())
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar, ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	g_return_val_if_fail (alarm_inited, NULL);
-	g_return_val_if_fail (trigger != -1, NULL);
-	g_return_val_if_fail (alarm_fn != NULL, NULL);
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	g_return_if_fail (alarm_inited);
-	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;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar, ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- *
- * Initializes the alarm timer mechanism.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	g_return_if_fail (alarm_inited == FALSE);
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-
-	alarm_inited = TRUE;
-}
-
-/**
- * alarm_done:
- * 
- * Terminates the alarm timer mechanism.  This should be called at the end of
- * the program.
- **/
-void
-alarm_done (void)
-{
-	GList *l;
-
-	g_return_if_fail (alarm_inited);
-
-	if (!clear_itimer ())
-		g_message ("alarm_done(): Could not clear the timer!  "
-			   "Weird things may happen.");
-
-	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;
-
-	if (close (alarm_pipes[0]) != 0)
-		g_message ("alarm_done(): Could not close the input pipe for notification");
-
-	alarm_pipes[0] = -1;
-
-	if (close (alarm_pipes[1]) != 0)
-		g_message ("alarm_done(): Could not close the output pipe for notification");
-
-	alarm_pipes[1] = -1;
-
-	alarm_inited = FALSE;
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index b5d57cbe49..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,44 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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_init (void);
-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/client-main.c b/calendar/gui/alarm-notify/client-main.c
deleted file mode 100644
index 5b0fb669d2..0000000000
--- a/calendar/gui/alarm-notify/client-main.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Evolution calendar - Command-line client for the alarm notification service
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <liboaf/liboaf.h>
-#include "evolution-calendar.h"
-
-
-
-/* Requests that a calendar be added to the alarm notification service */
-static void
-add_calendar (GNOME_Evolution_Calendar_AlarmNotify an, const char *uri)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_AlarmNotify_addCalendar (an, uri, &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 ("add_calendar(): Invalid URI reported from the "
-				   "alarm notification service");
-			goto out;
-		} else if (strcmp (ex_id,
-				   ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError)
-			   == 0) {
-			g_message ("add_calendar(): The alarm notification service could "
-				   "not contact the backend");
-			goto out;
-		}
-	}
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("add_calendar(): Could not issue the addCalendar request");
-
- out:
-	CORBA_exception_free (&ev);
-}
-
-/* Loads the calendars that the user has configured to be loaded */
-static void
-load_calendars (void)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-	char *base_uri;
-	char *uri;
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("load_calendars(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		exit (EXIT_FAILURE);
-	}
-	CORBA_exception_free (&ev);
-
-	/* FIXME: this should be obtained from the configuration in the Wombat */
-
-	base_uri = g_concat_dir_and_file (g_get_home_dir (), "evolution");
-
-	uri = g_concat_dir_and_file (base_uri, "local/Calendar/calendar.ics");
-	add_calendar (an, uri);
-	g_free (uri);
-
-	uri = g_concat_dir_and_file (base_uri, "local/Tasks/tasks.ics");
-	add_calendar (an, uri);
-	g_free (uri);
-
-	g_free (base_uri);
-
-	CORBA_exception_init (&ev);
-	Bonobo_Unknown_unref (an, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_calendars(): Could not unref the alarm notification service");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (an, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_calendars(): Could not release the alarm notification service");
-
-	CORBA_exception_free (&ev);
-}
-
-/* FIXME: handle the --die option */
-
-int
-main (int argc, char **argv)
-{
-	GnomeClient *client;
-	int flags;
-	gboolean launch_service;
-
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	if (gnome_init_with_popt_table ("evolution-alarm-client", VERSION,
-					argc, argv, oaf_popt_options, 0, NULL) != 0) {
-		g_message ("main(): Could not initialize GNOME");
-		exit (EXIT_FAILURE);
-	}
-
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): Could not initialize Bonobo");
-		exit (EXIT_FAILURE);
-	}
-
-	/* Ask the session manager to restart us */
-
-	client = gnome_master_client ();
-	flags = gnome_client_get_flags (client);
-
-	if (flags & GNOME_CLIENT_IS_CONNECTED) {
-		char *client_id;
-
-		client_id = gnome_client_get_id (client);
-		g_assert (client_id != NULL);
-
-		launch_service = gnome_startup_acquire_token ("EVOLUTION_ALARM_NOTIFY",
-							      client_id);
-
-		if (launch_service) {
-			char *args[3];
-
-			args[0] = argv[0];
-			args[2] = NULL;
-
-			gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY);
-			gnome_client_set_restart_command (client, 2, args);
-
-			args[0] = argv[0];
-			args[1] = "--die";
-			args[2] = NULL;
-
-			gnome_client_set_shutdown_command (client, 2, args);
-		} else
-			gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
-
-		gnome_client_flush (client);
-	} else
-		launch_service = TRUE;
-
-	if (!launch_service)
-		return EXIT_SUCCESS;
-
-	load_calendars ();
-
-	return EXIT_SUCCESS;
-}
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
deleted file mode 100644
index b8b409632d..0000000000
--- a/calendar/gui/alarm-notify/notify-main.c
+++ /dev/null
@@ -1,128 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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"
-
-
-
-static BonoboGenericFactory *factory;
-
-static AlarmNotify *alarm_notify_service;
-
-
-/* La de da */
-static void
-funny_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	char *msg;
-	char str[256];
-	struct tm *tm;
-
-	tm = localtime (&trigger);
-	strftime (str, sizeof (str), "%Y/%m/%d %H:%M:%S", tm);
-
-	msg = g_strdup_printf (_("It is %s.  The Unix time is %ld right now.  We just thought "
-				 "you may like to know."), str, (long) trigger);
-	gnome_ok_dialog (msg);
-	g_free (msg);
-}
-
-/* Dum de dum */
-static void
-funny_times_init (void)
-{
-	alarm_add ((time_t) 999999999L, funny_trigger_cb, NULL, NULL); /* Sep  9 01:46:39 2001 UTC */
-}
-
-/* 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)
-{
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		if (!alarm_notify_service)
-			return NULL;
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (alarm_notify_service));
-	return BONOBO_OBJECT (alarm_notify_service);
-}
-
-int
-main (int argc, char **argv)
-{
-	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_init ();
-	alarm_queue_init ();
-
-	funny_times_init ();
-
-	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"));
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (factory));
-	factory = NULL;
-
-	alarm_queue_done ();
-	alarm_done ();
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index 0216c15f48..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,608 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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;
-
-/* We have one global preferences dialog. */
-static CalPrefsDialog *preferences_dialog = NULL;
-
-/* Callback for the new appointment command */
-static void
-new_appointment_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	gnome_calendar_new_appointment (gcal);
-}
-
-static void
-new_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-	time_t dtstart, dtend;
-
-	gcal = GNOME_CALENDAR (data);
-	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, TRUE);
-}
-
-/* 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
-new_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	new_calendar ();
-}
-
-static void
-open_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GtkWidget *error_dialog;
-	int ret;
-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {
-		error_dialog = gnome_message_box_new (
-			_("File not found"),
-			GNOME_MESSAGE_BOX_ERROR,
-			GNOME_STOCK_BUTTON_OK,
-			NULL);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog), GTK_WINDOW (fs));
-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));
-	} else {
-		/* FIXME: find out who owns this calendar and use that name */
-#ifndef NO_WARNINGS
-#warning "FIXME: find out who owns this calendar and use that name"
-#endif
-		/*
-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs));
-		*/
-		gtk_widget_destroy (GTK_WIDGET (fs));
-	}
-}
-
-static void
-open_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open calendar")));
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) open_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) gtk_widget_destroy,
-				   GTK_OBJECT (fs));
-
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me */
-}
-
-static void
-save_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GnomeCalendar *gcal;
-	gchar *fname;
-
-	gcal = GNOME_CALENDAR (gtk_object_get_user_data (GTK_OBJECT (fs)));
-	gtk_window_set_wmclass (GTK_WINDOW (gcal), "gnomecal", "gnomecal");
-
-	fname = g_strdup (gtk_file_selection_get_filename (fs));
-	g_free(fname);
-	gtk_main_quit ();
-}
-
-static gint
-close_save (GtkWidget *w)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-save_as_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-	GtkFileSelection *fs;
-
-	gcal = GNOME_CALENDAR (data);
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar")));
-	gtk_object_set_user_data (GTK_OBJECT (fs), gcal);
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) save_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) close_save,
-				   GTK_OBJECT (fs));
-	gtk_signal_connect_object (GTK_OBJECT (fs), "delete_event",
-				   GTK_SIGNAL_FUNC (close_save),
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me even more */
-	gtk_main ();
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-preferences_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	if (!preferences_dialog)
-		preferences_dialog = cal_prefs_dialog_new ();
-	else
-		cal_prefs_dialog_show (preferences_dialog);
-}
-
-static void
-cut_event_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_event_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_event_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
-publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-	CalClient *client;
-	CalClientGetStatus status;
-	CalComponent *comp;
-	time_t start, end;
-	
-	gcal = GNOME_CALENDAR (data);
-	gnome_calendar_get_current_time_range (gcal, &start, &end);
-
-	client = gnome_calendar_get_cal_client (gcal);
-	status = cal_client_get_free_busy (client, start, end, &comp);
-	if (status == CAL_CLIENT_GET_SUCCESS)
-		itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp);
-}
-
-/* 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 (ev._major != CORBA_NO_EXCEPTION) {
-		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;
-}
-
-/* Clears the folder bar label on the shell view */
-static void
-clear_folder_bar_label (BonoboControl *control)
-{
-	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, "", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("clear_folder_bar_label(): Could not set the folder bar label");
-
-	CORBA_exception_free (&ev);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("CalendarNew", new_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarOpen", open_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarSaveAs", save_as_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
-	BONOBO_UI_VERB ("EditNewAppointment", new_appointment_cb),
-	BONOBO_UI_VERB ("EditNewEvent", new_event_cb),
-	BONOBO_UI_VERB ("CalendarPreferences", preferences_cmd),
-
-	BONOBO_UI_VERB ("CutEvent", cut_event_cmd),
-	BONOBO_UI_VERB ("CopyEvent", copy_event_cmd),
-	BONOBO_UI_VERB ("PasteEvent", paste_event_cmd),
-
-	BONOBO_UI_VERB ("PublishFreeBusy", publish_freebusy_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_END
-};
-
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/menu/File/New/NewFirstItem/CalendarNew",	"new_appointment.xpm"),
-	E_PIXMAP ("/menu/File/Print/Print",			"print.xpm"),
-	E_PIXMAP ("/menu/File/Print/Print Preview",		"print-preview.xpm"),
-	E_PIXMAP ("/menu/Actions/Component/CalendarNew",	"new_appointment.xpm"),
-	E_PIXMAP ("/menu/Tools/Component/CalendarPreferences",	"configure_16_calendar.xpm"),
-
-	E_PIXMAP ("/Toolbar/New",				"buttons/new_appointment.png"),
-	E_PIXMAP ("/Toolbar/Print",				"buttons/print.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;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-#if 0
-	/* FIXME: Need to update this to use new Bonobo ui stuff somehow.
-	   Also need radio buttons really. */
-
-	/* Note that these indices should correspond with the button indices
-	   in the gnome_toolbar_view_buttons UIINFO struct. */
-	gnome_calendar_set_view_buttons (cal,
-					 gnome_toolbar_view_buttons[0].widget,
-					 gnome_toolbar_view_buttons[1].widget,
-					 gnome_toolbar_view_buttons[2].widget,
-					 gnome_toolbar_view_buttons[3].widget);
-
-	/* This makes the appropriate radio button in the toolbar active. */
-	gnome_calendar_update_view_buttons (cal);
-#endif
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, 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);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. */
-	calendar_config_check_timezone_set ();
-
-	clear_folder_bar_label (control);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	gnome_calendar_discard_view_menus (gcal);
-
-	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 93962e1fb7..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,42 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 <bonobo/bonobo-control.h>
-#include "gnome-cal.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);
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index 4b47fe697d..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,400 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include "evolution-shell-component.h"
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png", TRUE, NULL, NULL },
-	{ "tasks", "evolution-tasks.png", TRUE, NULL, NULL },
-	{ NULL, NULL }
-};
-
-
-/* Utility functions.  */
-
-static const char *
-get_local_file_name_for_folder_type (const char *type)
-{
-	if (strcmp (type, "calendar") == 0)
-		return "calendar.ics";
-	else if (strcmp (type, "tasks") == 0)
-		return "tasks.ics";
-	else
-		return NULL;
-}
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		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);
-
-	*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;
-
-	CORBA_exception_init(&ev);
-	/* FIXME: I don't think we have to do anything to create a calendar
-	   or tasks folder - the '.ics' files are created automatically when
-	   needed. But I'm not sure - Damon. */
-	if (!strcmp(type, "calendar") || !strcmp(type, "tasks")) {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_OK, &ev);
-	} else {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &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;
-	const char *file_name;
-	gchar *path;
-	int rv;
-
-	CORBA_exception_init(&ev);
-
-	/* check URI */
-	if (strncmp (physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* FIXME: check if there are subfolders? */
-
-	file_name = get_local_file_name_for_folder_type (type);
-	if (file_name == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* remove the .ics file */
-	path = g_concat_dir_and_file (physical_uri + 7, file_name);
-	rv = unlink (path);
-	g_free (path);
-	if (rv == 0) {
-		/* everything OK; notify the listener */
-		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);
-}
-
-/* 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);
-}
-
-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;
-	gchar *source_path;
-	FILE *fin;
-	icalparser *parser;
-	icalcomponent *icalcomp;
-	GnomeVFSHandle *handle;
-	GnomeVFSURI *uri;
-	GnomeVFSFileSize out;
-	char *buf;
-	const char *file_name;
-
-	CORBA_exception_init (&ev);
-
-	/* check URI */
-	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;
-	}
-
-	file_name = get_local_file_name_for_folder_type (type);
-	if (file_name == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* open source and destination files */
-	source_path = g_concat_dir_and_file (source_physical_uri + 7, "calendar.ics");
-
-	fin = fopen (source_path, "r");
-	if (!fin) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-		g_free (source_path);
-		CORBA_exception_free (&ev);
-		return;
-	}
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fin);
-	icalcomp = icalparser_parse (parser, get_line_fn);
-	icalparser_free (parser);
-	if (!icalcomp
-	    || icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-		fclose (fin);
-		g_free (source_path);
-		if (icalcomp)
-			icalcomponent_free (icalcomp);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* now, write the new file out */
-	uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (gnome_vfs_create_uri (&handle, uri, GNOME_VFS_OPEN_WRITE, FALSE, 0666)
-	    != GNOME_VFS_OK) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		fclose (fin);
-		g_free (source_path);
-		icalcomponent_free (icalcomp);
-		CORBA_exception_free (&ev);
-		return;
-	}
-	buf = icalcomponent_as_ical_string (icalcomp);
-	if (gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out)
-	    != GNOME_VFS_OK) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-	}
-	else {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK,
-			&ev);
-	}
-
-	gnome_vfs_close (handle);
-	gnome_vfs_uri_unref (uri);
-	
-	/* free resources */
-	fclose (fin);
-
-	if (remove_source)
-		unlink (source_path);
-
-	g_free (source_path);
-	icalcomponent_free (icalcomp);
-	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);
-
-	calendar_config_init ();
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-
-	shells = g_list_append (shells, shell_component);
-}
-
-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 ();
-}
-
-#if 0
-static void
-destroy_cb (EvolutionShellComponent *shell_component,
-	    gpointer user_data)
-{
-	shells = g_list_remove (shells, shell_component);
-	
-	if (g_list_length (shells) == 0)
-		gtk_main_quit ();
-}
-#endif
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-	
-	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 */);
-
-	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);
-#if 0
-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_cb), NULL);
-
-	shells = g_list_append (shells, shell_component);
-#endif
-	
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-
-	if (factory == NULL)
-		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 b0d295bc16..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,32 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 7b133075f4..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,774 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnome/gnome-defs.h>
-#include <libgnome/gnome-config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include "dialogs/e-timezone-dialog.h"
-#include "component-factory.h"
-#include "calendar-commands.h"
-#include "e-tasks.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;
-} 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 ();
-}
-
-
-static void
-config_read				(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;
- 	}
-
-	CORBA_exception_free (&ev);
-
-	config->timezone =  bonobo_config_get_string (db, 
-                "/Calendar/Display/Timezone", NULL);
-
- 	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);
- 
-	config->use_24_hour_format = bonobo_config_get_boolean_with_default (
-		db, "/Calendar/Display/Use24HourFormat", FALSE, NULL);
-
-	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);
-
-	bonobo_object_release_unref (db, 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_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_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. You shouldn't really set it to the empty string or NULL,
-   as this means that Evolution will show the timezone-setting dialog to ask
-   the user for the timezone. */
-void
-calendar_config_set_timezone		(gchar	     *timezone)
-{
-	if (timezone && timezone[0])
-		config->timezone = timezone;
-	else
-		config->timezone = NULL;
-}
-
-
-/* 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;
-}
-
-
-/* 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, whether we
-   use 24 hour format, and the hours of the working day to use in the time
-   popup. */
-void
-calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
-{
-	gboolean dnav_show_week_no, use_24_hour;
-	gint week_start_day, start_hour, end_hour;
-
-	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 ();
-
-	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 = end_hour + 1 % 24;
-
-	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);
-	e_date_edit_set_time_popup_range (dedit, start_hour, end_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;
-
-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
-
-	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 = end_hour + 1 % 24;
-
-	e_cell_date_edit_freeze (ecde);
-	gtk_object_set (GTK_OBJECT (ecde),
-			"use_24_hour_format", use_24_hour,
-			"lower_hour", start_hour,
-			"upper_hour", end_hour,
-			NULL);
-	e_cell_date_edit_thaw (ecde);
-}
-
-
-/* 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);
-
-	/* This is for changing the colors of the text; they will be re-fetched
-	 * by ECellText when the table is redrawn.
-	 */
-	e_table_model_changed (E_TABLE_MODEL (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;
-
-	e_timezone_dialog_get_timezone (etd, &display_name);
-
-	if (display_name && display_name[0]) {
-		calendar_config_set_timezone (display_name);
-
-		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);
-}
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index 2979d07d91..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,145 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-
-
-
-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);
-
-
-/* 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);
-
-/* 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);
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
deleted file mode 100644
index 2e48ecf00c..0000000000
--- a/calendar/gui/calendar-model.c
+++ /dev/null
@@ -1,2386 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "calendar-model.h"
-
-
-/* Private part of the ECalendarModel structure */
-struct _CalendarModelPrivate {
-	/* Calendar client we are using */
-	CalClient *client;
-
-	/* Types of objects we are dealing with */
-	CalObjType type;
-
-	/* Array of pointers to calendar objects */
-	GArray *objects;
-
-	/* UID -> array index hash */
-	GHashTable *uid_index_hash;
-
-	/* 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;
-
-	/* A balanced tree of the categories used by all the tasks/events. */
-	GTree *categories;
-
-	/* The current timezone. */
-	icaltimezone *zone;
-};
-
-enum {
-	CATEGORIES_CHANGED,
-	LAST_SIGNAL
-};
-
-static gint calendar_model_signals [LAST_SIGNAL] = { 0 };
-
-
-
-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 void load_objects (CalendarModel *model);
-static int remove_object (CalendarModel *model, const char *uid);
-static void ensure_task_complete (CalComponent *comp,
-				  time_t completed_date);
-static void ensure_task_not_complete (CalComponent *comp);
-static void calendar_model_collect_all_categories (CalendarModel *model);
-static gboolean calendar_model_collect_categories	(CalendarModel	*model,
-							 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);
-
-	calendar_model_signals [CATEGORIES_CHANGED] =
-		gtk_signal_new ("categories-changed",
-				GTK_RUN_LAST, object_class->type,
-				GTK_SIGNAL_OFFSET (CalendarModelClass,
-						   categories_changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, calendar_model_signals,
-				      LAST_SIGNAL);
-
-	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;
-
-	class->categories_changed = NULL;
-}
-
-/* Object initialization function for the calendar table model */
-static void
-calendar_model_init (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	priv = g_new0 (CalendarModelPrivate, 1);
-	model->priv = priv;
-
-	priv->objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));
-	priv->uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->new_comp_vtype = CAL_COMPONENT_EVENT;
-	priv->use_24_hour_format = TRUE;
-
-	priv->categories = g_tree_new ((GCompareFunc)strcmp);
-
-	priv->zone = NULL;
-}
-
-/* Called from g_hash_table_foreach_remove(), frees a stored UID->index
- * mapping.
- */
-static gboolean
-free_uid_index (gpointer key, gpointer value, gpointer data)
-{
-	int *idx;
-
-	idx = value;
-	g_free (idx);
-
-	return TRUE;
-}
-
-/* Frees the objects stored in the calendar model */
-static void
-free_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	int i;
-
-	priv = model->priv;
-
-	g_hash_table_foreach_remove (priv->uid_index_hash, free_uid_index, NULL);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		CalComponent *comp;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	g_array_set_size (priv->objects, 0);
-}
-
-/* Destroy handler for the calendar table model */
-static void
-calendar_model_destroy (GtkObject *object)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (object));
-
-	model = CALENDAR_MODEL (object);
-	priv = model->priv;
-
-	/* Free the calendar client interface object */
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	/* Free the uid->index hash data and the array of UIDs */
-
-	free_objects (model);
-
-	g_hash_table_destroy (priv->uid_index_hash);
-	priv->uid_index_hash = NULL;
-
-	g_array_free (priv->objects, TRUE);
-	priv->objects = NULL;
-
-	g_free (priv->default_category);
-
-	/* We only need to free the first argument, the key, so g_free will do.
-	 */
-	g_tree_traverse (priv->categories, (GTraverseFunc) g_free,
-			 G_PRE_ORDER, NULL);
-	g_tree_destroy (priv->categories);
-
-	/* Free the private structure */
-
-	g_free (priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* ETableModel methods */
-
-/* column_count handler for the calendar table model */
-static int
-calendar_model_column_count (ETableModel *etm)
-{
-	return CAL_COMPONENT_FIELD_NUM_FIELDS;
-}
-
-/* row_count handler for the calendar table model */
-static int
-calendar_model_row_count (ETableModel *etm)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	return priv->objects->len;
-}
-
-/* Creates a nice string representation of a time value. If show_midnight is
-   FALSE, and the time is midnight, then we just show the date. */
-static char*
-get_time_t (CalendarModel *model, time_t *t, gboolean show_midnight)
-{
-	static char buffer[64];
-	struct tm tmp_tm;
-	struct icaltimetype tt;
-
-	if (*t <= 0) {
-		buffer[0] = '\0';
-	} else {
-		/* 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_datetime. */
-		tt = icaltime_from_timet_with_zone (*t, FALSE,
-						    model->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,
-					     model->priv->use_24_hour_format,
-					     show_midnight, FALSE,
-					     buffer, sizeof (buffer));
-	}
-
-	return buffer;
-}
-
-/* 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_NONE:
-		return "";
-
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		return _("Public");
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		return _("Private");
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-
-	case CAL_COMPONENT_CLASS_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return "";
-	}
-}
-
-/* Builds a string for the COMPLETED property of a calendar component */
-static char *
-get_completed	(CalendarModel *model,
-		 CalComponent  *comp)
-{
-	struct icaltimetype *completed;
-	time_t t;
-
-	cal_component_get_completed (comp, &completed);
-
-	if (!completed)
-		t = 0;
-	else {
-		/* Note that COMPLETED is stored in UTC, though we show it in
-		   the current timezone. */
-		t = icaltime_as_timet_with_zone (*completed, icaltimezone_get_utc_timezone ());
-		cal_component_free_icaltimetype (completed);
-	}
-
-	return get_time_t (model, &t, TRUE);
-}
-
-/* Builds a string for and frees a date/time value */
-static char *
-get_and_free_datetime (CalendarModel *model, CalComponentDateTime dt)
-{
-	time_t t;
-
-	if (!dt.value)
-		t = 0;
-	else {
-		CalClientGetStatus status;
-		icaltimezone *zone;
-
-		/* FIXME: TIMEZONES: Handle error. */
-		status = cal_client_get_timezone (model->priv->client, dt.tzid,
-						  &zone);
-		t = icaltime_as_timet_with_zone (*dt.value, zone);
-	}
-
-	cal_component_free_datetime (&dt);
-
-	return get_time_t (model, &t, TRUE);
-}
-
-/* Builds a string for the DTEND property of a calendar component */
-static char *
-get_dtend (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtend (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DTSTART property of a calendar component */
-static char *
-get_dtstart (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtstart (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DUE property of a calendar component */
-static char *
-get_due (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_due (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the GEO property of a calendar component */
-static char*
-get_geo (CalComponent *comp)
-{
-	struct icalgeotype *geo;
-	static gchar buf[32];
-
-	cal_component_get_geo (comp, &geo);
-
-	if (!geo)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",
-			    fabs (geo->lat),
-			    geo->lat >= 0.0 ? _("N") : _("S"),
-			    fabs (geo->lon),
-			    geo->lon >= 0.0 ? _("E") : _("W"));
-		cal_component_free_geo (geo);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PERCENT property of a calendar component */
-static char *
-get_percent (CalComponent *comp)
-{
-	int *percent;
-	static char buf[32];
-
-	cal_component_get_percent (comp, &percent);
-
-	if (!percent)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d%%", *percent);
-		cal_component_free_percent (percent);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PRIORITY property of a calendar component */
-static char *
-get_priority (CalComponent *comp)
-{
-	int *priority;
-	char *retval;
-
-	cal_component_get_priority (comp, &priority);
-
-	if (!priority || *priority == 0)
-		retval = "";
-	else if (*priority <= 4)
-		retval = _("High");
-	else if (*priority == 5)
-		retval = _("Normal");
-	else
-		retval = _("Low");
-
-	if (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);
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_NONE:
-	case CAL_COMPONENT_TRANSP_UNKNOWN:
-		return "";
-
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		return _("Transparent");
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		return _("Opaque");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the URL property of a calendar component */
-static char *
-get_url (CalComponent *comp)
-{
-	const char *url;
-
-	cal_component_get_url (comp, &url);
-
-	if (url)
-		return (char *) url;
-	else
-		return "";
-}
-
-/* Returns whether the completion date has been set on a component */
-static gboolean
-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;
-	}
-}
-
-/* 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);
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		return get_dtend (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		return get_dtstart (model, comp);
-
-	case CAL_COMPONENT_FIELD_DUE:
-		return get_due (model, comp);
-
-	case CAL_COMPONENT_FIELD_GEO:
-		return get_geo (comp);
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return get_percent (comp);
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		return get_priority (comp);
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return get_summary (comp);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return get_transparency (comp);
-
-	case CAL_COMPONENT_FIELD_URL:
-		return get_url (comp);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-		return GINT_TO_POINTER (cal_component_has_alarms (comp));
-
-	case CAL_COMPONENT_FIELD_ICON:
-		/* FIXME: Also support 'Assigned to me' & 'Assigned to someone
-		   else'. */
-		if (cal_component_has_recurrences (comp))
-			return GINT_TO_POINTER (1);
-		else {
-			icalcomponent *ical_comp;
-
-			ical_comp = cal_component_get_icalcomponent (comp);
-			if (icalcomponent_get_first_property (ical_comp,
-							      ICAL_ATTENDEE_PROPERTY) != NULL)
-			{
-				return GINT_TO_POINTER (2); /* Task-assigned */
-			}
-			else {
-				return GINT_TO_POINTER (0);
-			}
-		}
-	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;
-
-	default:
-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Returns whether a string is NULL, empty, or full of whitespace */
-static gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace (*p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but
-   the model doesn't know anything about the windows. */
-static void
-show_date_warning (CalendarModel *model)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	/* We are only using this as an example, so the timezone doesn't
-	   matter. */
-	tmp_tm = localtime (&t);
-
-	if (model->priv->use_24_hour_format)
-		/* strftime format of a weekday, a date and a time, 24-hour. */
-		format = _("%a %m/%d/%Y %H:%M:%S");
-	else
-		/* strftime format of a weekday, a date and a time, 12-hour. */
-		format = _("%a %m/%d/%Y %I:%M:%S %p");
-
-	strftime (buffer, sizeof (buffer), format, tmp_tm);
-
-	g_snprintf (message, 256,
-		    _("The date must be entered in the format: \n\n%s"),
-		    buffer);
-
-	dialog = gnome_message_box_new (message,
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Builds a list of categories from a comma-delimited string */
-static GSList *
-categories_from_string (const char *value)
-{
-	GSList *list;
-	const char *categ_start;
-	const char *categ_end;
-	const char *p;
-
-	if (!value)
-		return NULL;
-
-	list = NULL;
-
-	categ_start = categ_end = NULL;
-
-	for (p = value; *p; p++) {
-		if (categ_start) {
-			if (*p == ',') {
-				char *c;
-
-				c = g_strndup (categ_start, categ_end - categ_start + 1);
-				list = g_slist_prepend (list, c);
-
-				categ_start = categ_end = NULL;
-			} else if (!isspace (*p))
-				categ_end = p;
-		} else if (!isspace (*p) && *p != ',')
-			categ_start = categ_end = p;
-	}
-
-	if (categ_start) {
-		char *c;
-
-		c = g_strndup (categ_start, categ_end - categ_start + 1);
-		list = g_slist_prepend (list, c);
-	}
-
-	return g_slist_reverse (list);
-}
-
-/* Sets the list of categories from a comma-delimited string */
-static void
-set_categories (CalComponent *comp, const char *value)
-{
-	GSList *list;
-	GSList *l;
-
-	list = categories_from_string (value);
-
-	cal_component_set_categories_list (comp, list);
-
-	for (l = list; l; l = l->next) {
-		char *s;
-
-		s = l->data;
-		g_free (s);
-	}
-
-	g_slist_free (list);
-}
-
-
-/* FIXME: We won't need this eventually, since the user won't be allowed to
- * edit the field.
- */
-static void
-show_classification_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The classification must be 'Public', 'Private', 'Confidential' or 'None'"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-
-static void
-set_classification (CalComponent *comp,
-		    const char *value)
-{
-	CalComponentClassification classif;
-
-	/* An empty string is the same as 'None'. */
-	if (!value[0] || !g_strcasecmp (value, _("None")))
-		classif = CAL_COMPONENT_CLASS_NONE;
-	else if (!g_strcasecmp (value, _("Public")))
-		classif = CAL_COMPONENT_CLASS_PUBLIC;
-	else if (!g_strcasecmp (value, _("Private")))
-		classif = CAL_COMPONENT_CLASS_PRIVATE;
-	else if (!g_strcasecmp (value, _("Confidential")))
-		classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;
-	else {
-		show_classification_warning ();
-		return;
-	}
-
-	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 char *value)
-{
-	ETimeParseStatus status;
-	struct tm tmp_tm;
-	time_t t;
-
-	status = e_time_parse_date_and_time (value, &tmp_tm);
-
-	if (status == E_TIME_PARSE_INVALID) {
-		show_date_warning (model);
-	} else if (status == E_TIME_PARSE_NONE) {
-		ensure_task_not_complete (comp);
-	} else {
-		struct icaltimetype itt = icaltime_null_time ();
-
-		itt.year = tmp_tm.tm_year + 1900;
-		itt.month = tmp_tm.tm_mon + 1;
-		itt.day = tmp_tm.tm_mday;
-		itt.hour = tmp_tm.tm_hour;
-		itt.minute = tmp_tm.tm_min;
-		itt.second = tmp_tm.tm_sec;
-
-		/* We assume that COMPLETED is entered in the current timezone,
-		   even though it gets stored in UTC. */
-		t = icaltime_as_timet_with_zone (itt, model->priv->zone);
-
-		ensure_task_complete (comp, t);
-	}
-}
-
-/* Sets a CalComponentDateTime value */
-static void
-set_datetime (CalendarModel *model, CalComponent *comp, const char *value,
-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt))
-{
-	ETimeParseStatus status;
-	struct tm tmp_tm;
-
-	status = e_time_parse_date_and_time (value, &tmp_tm);
-
-	if (status == E_TIME_PARSE_INVALID) {
-		show_date_warning (model);
-	} else if (status == E_TIME_PARSE_NONE) {
-		(* set_func) (comp, NULL);
-	} else {
-		CalComponentDateTime dt;
-		struct icaltimetype itt = icaltime_null_time ();
-
-		itt.year = tmp_tm.tm_year + 1900;
-		itt.month = tmp_tm.tm_mon + 1;
-		itt.day = tmp_tm.tm_mday;
-		itt.hour = tmp_tm.tm_hour;
-		itt.minute = tmp_tm.tm_min;
-		itt.second = tmp_tm.tm_sec;
-
-		dt.value = &itt;
-		/* We assume it is being set to the current timezone. */
-		dt.tzid = icaltimezone_get_tzid (model->priv->zone);
-
-		(* set_func) (comp, &dt);
-	}
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_geo_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The geographical position must be entered "
-					  "in the format: \n\n45.436845,125.862501"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the geographical position value of a component */
-static void
-set_geo (CalComponent *comp, const char *value)
-{
-	double latitude, longitude;
-	int matched;
-	struct icalgeotype geo;
-
-	if (string_is_empty (value)) {
-		cal_component_set_geo (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%lg , %lg", &latitude, &longitude);
-
-	if (matched != 2) {
-		show_geo_warning ();
-		return;
-	}
-
-	geo.lat = latitude;
-	geo.lon = longitude;
-	cal_component_set_geo (comp, &geo);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_percent_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The percent value must be between 0 and 100, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the percent value of a calendar component */
-static void
-set_percent (CalComponent *comp, const char *value)
-{
-	int matched, percent;
-
-	if (string_is_empty (value)) {
-		cal_component_set_percent (comp, NULL);
-		ensure_task_not_complete (comp);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &percent);
-
-	if (matched != 1 || percent < 0 || percent > 100) {
-		show_percent_warning ();
-		return;
-	}
-
-	cal_component_set_percent (comp, &percent);
-
-	if (percent == 100)
-		ensure_task_complete (comp, -1);
-	else
-		ensure_task_not_complete (comp);
-}
-
-/* FIXME: We won't need this eventually, since the user won't be allowed to
- * edit the field.
- */
-static void
-show_priority_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The priority must be 'High', 'Normal', 'Low' or 'Undefined'."),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the priority of a calendar component */
-static void
-set_priority (CalComponent *comp, const char *value)
-{
-	int priority;
-
-	/* An empty string is the same as 'None'. */
-	if (!value[0] || !g_strcasecmp (value, _("Undefined")))
-		priority = 0;
-	else if (!g_strcasecmp (value, _("High")))
-		priority = 3;
-	else if (!g_strcasecmp (value, _("Normal")))
-		priority = 5;
-	else if (!g_strcasecmp (value, _("Low")))
-		priority = 7;
-	else {
-		show_priority_warning ();
-		return;
-	}
-
-	cal_component_set_priority (comp, &priority);
-}
-
-/* Sets the summary of a calendar component */
-static void
-set_summary (CalComponent *comp, const char *value)
-{
-	CalComponentText text;
-
-	if (string_is_empty (value)) {
-		cal_component_set_summary (comp, NULL);
-		return;
-	}
-
-	text.value = value;
-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */
-
-	cal_component_set_summary (comp, &text);
-}
-
-/* FIXME: We won't need this eventually, since the user won't be allowed to
- * edit the field.
- */
-static void
-show_transparency_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The transparency must be 'Transparent', 'Opaque', or 'None'."),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the URI of a calendar component */
-static void
-set_transparency (CalComponent *comp, const char *value)
-{
-	CalComponentTransparency transp;
-
-	g_print ("In calendar model set_transparency: %s\n", value);
-
-	/* An empty string is the same as 'None'. */
-	if (!value[0] || !g_strcasecmp (value, _("None")))
-		transp = CAL_COMPONENT_TRANSP_NONE;
-	else if (!g_strcasecmp (value, _("Transparent")))
-		transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else if (!g_strcasecmp (value, _("Opaque"))) {
-		transp = CAL_COMPONENT_TRANSP_OPAQUE;
-	} else {
-		show_transparency_warning ();
-		return;
-	}
-
-	g_print ("  transp: %i\n", transp);
-
-	cal_component_set_transparency (comp, transp);
-}
-
-/* Sets the URI of a calendar component */
-static void
-set_url (CalComponent *comp, const char *value)
-{
-	g_print ("In calendar model set_url\n");
-
-	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;
-
-	g_print ("In calendar model set_status: %s\n", value);
-
-	/* 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);
-	}
-}
-
-/* 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 1
-	g_print ("In calendar_model_set_value_at: %i\n", col);
-#endif
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		set_categories (comp, value);
-		if (calendar_model_collect_categories (model, comp)) {
-			gtk_signal_emit (GTK_OBJECT (model),
-					 calendar_model_signals [CATEGORIES_CHANGED]);
-		}
-		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);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		/* FIXME: Need to reset dtend if dtstart happens after it */
-		set_datetime (model, comp, value, cal_component_set_dtstart);
-		break;
-
-	case CAL_COMPONENT_FIELD_DUE:
-		set_datetime (model, comp, value, cal_component_set_due);
-		break;
-
-	case CAL_COMPONENT_FIELD_GEO:
-		set_geo (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		set_percent (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		set_priority (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		set_summary (comp, value);
-		break;
-
-	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;
-
-	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.
-	 */
-	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);
-	/* 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);
-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DUE, row), cal_component_set_due);
-	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);
-}
-
-/* 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_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_STATUS:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) value;
-
-	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:
-		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_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_STATUS:
-		g_free (value);
-		break;
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		break;
-
-	case CAL_COMPONENT_FIELD_URL:
-		g_free (value);
-		break;
-
-	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:
-		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_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_STATUS:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return NULL;
-
-	default:
-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* value_is_empty handler for the calendar model. This should return TRUE
-   unless a significant value has been set. The 'click-to-add' feature
-   checks all fields to see if any are not empty and if so it adds a new
-   row, so we only want to return FALSE if we have a useful object. */
-static gboolean
-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_STATUS:
-		return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-	case CAL_COMPONENT_FIELD_COMPONENT:
-		return TRUE;
-
-	default:
-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);
-		return TRUE;
-	}
-}
-
-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_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_STATUS:
-		return e_utf8_from_locale_string (value);
-
-	case CAL_COMPONENT_FIELD_ICON:
-		if ((int)value == 0)
-			return e_utf8_from_locale_string (_("Normal"));
-		else if ((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;
-
-	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 calendar is opened into the server */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	CalendarModel *model;
-
-	model = CALENDAR_MODEL (data);
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		load_objects (model);
-		calendar_model_collect_all_categories (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-/* Removes an object from the model and updates all the indices that follow.
- * Returns the index of the object that was removed, or -1 if no object with
- * such UID was found.
- */
-static int
-remove_object (CalendarModel *model, const char *uid)
-{
-	CalendarModelPrivate *priv;
-	int *idx;
-	CalComponent *orig_comp;
-	int i;
-	int n;
-
-	priv = model->priv;
-
-	/* Find the index of the object to be removed */
-
-	idx = g_hash_table_lookup (priv->uid_index_hash, uid);
-	if (!idx)
-		return -1;
-
-	orig_comp = g_array_index (priv->objects, CalComponent *, *idx);
-	g_assert (orig_comp != NULL);
-
-	/* Decrease the indices of all the objects that follow in the array */
-
-	for (i = *idx + 1; i < priv->objects->len; i++) {
-		CalComponent *comp;
-		int *comp_idx;
-		const char *comp_uid;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-
-		cal_component_get_uid (comp, &comp_uid);
-
-		comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-		g_assert (comp_idx != NULL);
-
-		(*comp_idx)--;
-		g_assert (*comp_idx >= 0);
-	}
-
-	/* Remove this object from the array and hash */
-
-	g_hash_table_remove (priv->uid_index_hash, uid);
-	g_array_remove_index (priv->objects, *idx);
-
-	gtk_object_unref (GTK_OBJECT (orig_comp));
-
-	n = *idx;
-	g_free (idx);
-
-	return n;
-}
-
-/* Returns whether a component's type matches the types we support */
-static gboolean
-matches_type (CalObjType type, CalComponentVType vtype)
-{
-	return ((vtype == CAL_COMPONENT_EVENT && (type & CALOBJ_TYPE_EVENT))
-		|| (vtype == CAL_COMPONENT_TODO && (type & CALOBJ_TYPE_TODO))
-		|| (vtype == CAL_COMPONENT_JOURNAL && (type & CALOBJ_TYPE_JOURNAL)));
-}
-
-/* Callback used when an object is updated in the server */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	int orig_idx;
-	CalComponent *new_comp;
-	CalComponentVType new_comp_vtype;
-	const char *new_comp_uid;
-	int *new_idx;
-	CalClientGetStatus status;
-
-	g_print ("In calendar model obj_updated_cb\n");
-
-	model = CALENDAR_MODEL (data);
-	priv = model->priv;
-
-	orig_idx = remove_object (model, uid);
-
-	status = cal_client_get_object (priv->client, uid, &new_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Check if we are interested in this type of object */
-
-		new_comp_vtype = cal_component_get_vtype (new_comp);
-		if (!matches_type (priv->type, new_comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (new_comp));
-			break;
-		}
-
-		/* Insert the object into the model */
-
-		cal_component_get_uid (new_comp, &new_comp_uid);
-
-		if (orig_idx == -1) {
-			/* The object not in the model originally, so we just append it */
-
-			g_array_append_val (priv->objects, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = priv->objects->len - 1;
-
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-			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);
-
-			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);
-		}
-
-		/* See if we need to add any categories. Note that old
-		   categories won't be removed, but I don't think that matters
-		   too much here. */
-		if (calendar_model_collect_categories (model, new_comp)) {
-			gtk_signal_emit (GTK_OBJECT (model),
-					 calendar_model_signals [CATEGORIES_CHANGED]);
-		}
-
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* Nothing; the object may have been removed from the server.  We just
-		 * notify that the old object was deleted.
-		 */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-
-		/* Same notification as above */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	g_print ("Out calendar model obj_updated_cb\n");
-}
-
-/* Callback used when an object is removed in the server */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	int idx;
-
-	model = CALENDAR_MODEL (data);
-
-	idx = remove_object (model, uid);
-
-	if (idx != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);
-}
-
-/* Loads the required objects from the calendar client */
-static void
-load_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	GList *uids;
-	GList *l;
-
-	priv = model->priv;
-
-	g_assert (cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED);
-
-	uids = cal_client_get_uids (priv->client, priv->type);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		const char *comp_uid;
-		CalClientGetStatus status;
-		CalComponentVType comp_vtype;
-		int *idx;
-
-		uid = l->data;
-		status = cal_client_get_object (priv->client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing; the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("load_objects(): Syntax error when getting object `%s'", uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		/* Check if we are interested in this type of object */
-
-		comp_vtype = cal_component_get_vtype (comp);
-		if (!matches_type (priv->type, comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		/* Insert the object into the model */
-
-		idx = g_new (int, 1);
-
-		g_array_append_val (priv->objects, comp);
-		*idx = priv->objects->len - 1;
-
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (priv->uid_index_hash, (char *) comp_uid, idx);
-	}
-
-	cal_obj_uid_list_free (uids);
-}
-
-/**
- * calendar_model_get_cal_client:
- * @model: A calendar model.
- *
- * Queries the calendar client interface object that a calendar model is using.
- *
- * Return value: A calendar client interface object.
- **/
-CalClient *
-calendar_model_get_cal_client (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	return priv->client;
-}
-
-
-/**
- * calendar_model_set_cal_client:
- * @model: A calendar model.
- * @client: A calendar client interface object.
- * @type: Type of objects to present.
- *
- * Sets the calendar client interface object that a calendar model will monitor.
- * It also sets the types of objects this model will present to an #ETable.
- **/
-void
-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = model->priv;
-
-	if (priv->client == client && priv->type == type)
-		return;
-
-	e_table_model_pre_change (E_TABLE_MODEL(model));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	free_objects (model);
-
-	priv->client = client;
-	priv->type = type;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), model);
-
-		if (cal_client_get_load_state (priv->client) != CAL_CLIENT_LOAD_LOADED)
-			gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), model);
-		else
-			load_objects (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (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 client. */
-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) {
-		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,
-					 gchar		*default_category)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	g_free (model->priv->default_category);
-	model->priv->default_category = g_strdup (default_category);
-}
-
-
-static void
-calendar_model_collect_all_categories	(CalendarModel	*model)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	int i;
-
-	priv = model->priv;
-
-	/* Destroy the current tree and start from scratch. */
-	g_tree_traverse (priv->categories, (GTraverseFunc) g_free,
-			 G_PRE_ORDER, NULL);
-	g_tree_destroy (priv->categories);
-
-	priv->categories = g_tree_new ((GCompareFunc)strcmp);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		calendar_model_collect_categories (model, comp);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 calendar_model_signals [CATEGORIES_CHANGED]);
-}
-
-
-static gboolean
-calendar_model_collect_categories	(CalendarModel	*model,
-					 CalComponent	*comp)
-{
-	CalendarModelPrivate *priv;
-	GSList *categories_list, *elem;
-	gboolean changed = FALSE;
-
-	priv = model->priv;
-
-	cal_component_get_categories_list (comp, &categories_list);
-
-	for (elem = categories_list; elem; elem = elem->next) {
-		if (!g_tree_lookup (priv->categories, elem->data)) {
-			/* We store a '1' as the data, just so we can use
-			   g_tree_lookup() on it. Note that we don't free
-			   the string since it is now part of the tree. */
-			g_tree_insert (priv->categories, elem->data,
-				       GINT_TO_POINTER (1));
-			changed = TRUE;
-		} else {
-			g_free (elem->data);
-		}
-	}
-
-	g_slist_free (categories_list);
-
-	return changed;
-}
-
-
-GTree*
-calendar_model_get_categories		(CalendarModel	*model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	return model->priv->categories;
-}
-
-
-/* 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) {
-		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));
-	}
-}
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
deleted file mode 100644
index 5a47d3752e..0000000000
--- a/calendar/gui/calendar-model.h
+++ /dev/null
@@ -1,98 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-	void (* categories_changed) (CalendarModel *model);
-};
-
-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_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);
-
-GTree*		calendar_model_get_categories	  (CalendarModel   *model);
-
-void		calendar_model_set_default_category (CalendarModel	*model,
-						     gchar		*default_category);
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
deleted file mode 100644
index 447b72f8e0..0000000000
--- a/calendar/gui/calendar-summary.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * 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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <time.h>
-
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-property-control.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <liboaf/liboaf.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-html-view.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <cal-util/cal-component.h>
-#include <cal-util/timeutil.h>
-#include "alarm-notify/alarm.h"
-#include "calendar-model.h"
-#include "calendar-summary.h"
-
-typedef struct {
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryHtmlView *view;
-	BonoboPropertyControl *property_control;
-	CalClient *client;
-
-	GtkWidget *show_appointments;
-	GtkWidget *show_tasks;
-
-	gboolean appointments;
-	gboolean tasks;
-
-	char *title;
-	char *icon;
-	
-	guint32 idle;
-
-	gpointer alarm;
-} CalSummary;
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-extern gchar *evolution_dir;
-
-static int running_views = 0;
-static BonoboGenericFactory *factory;
-#define CALENDAR_SUMMARY_ID "OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory"
-
-/* list_sort_merge, and list_sort are copied from GNOME-VFS.
-   Author: Sven Oliver <sven.over@ob.kamp.net>
-   Modified by Ettore Perazzoli <ettore@comm2000.it> to let the compare
-   functions get an additional gpointer parameter.  
-
-   Included here as using gnome-vfs for 1 20 line function 
-   seems a bit of overkill.
-*/
-
-typedef gint (* CalSummaryListCompareFunc) (gconstpointer a, 
-					    gconstpointer b,
-					    gpointer data);
-static GList *
-cal_list_sort_merge (GList *l1,
-		     GList *l2,
-		     CalSummaryListCompareFunc compare_func,
-		     gpointer data)
-{
-	GList list, *l, *lprev;
-
-	l = &list;
-	lprev = NULL;
-
-	while (l1 && l2) {
-		if (compare_func (l1->data, l2->data, data) < 0) {
-			l->next = l1;
-			l = l->next;
-			l->prev = lprev;
-			lprev = l;
-			l1 = l1->next;
-		} else {
-			l->next = l2;
-			l = l->next;
-			l->prev = lprev;
-			lprev = l;
-			l2 = l2->next;
-		}
-	}
-
-	l->next = l1 ? l1 : l2;
-	l->next->prev = l;
-
-	return list.next;
-}
-
-static GList *
-cal_list_sort (GList *list,
-	       CalSummaryListCompareFunc compare_func,
-	       gpointer data)
-{
-	GList *l1, *l2;
-
-	if (!list)
-		return NULL;
-	if (!list->next)
-		return list;
-
-	l1 = list;
-	l2 = list->next;
-
-	while ((l2 = l2->next) != NULL) {
-		if ((l2 = l2->next) == NULL)
-			break;
-		l1 = l1->next;
-	}
-
-	l2 = l1->next;
-	l1->next = NULL;
-	
-	return cal_list_sort_merge (cal_list_sort (list, compare_func, data),
-				    cal_list_sort (l2, compare_func, data),
-				    compare_func, data);
-}
-	
-static int
-sort_uids (gconstpointer a,
-	   gconstpointer b,
-	   gpointer user_data)
-{
-	CalComponent *comp_a, *comp_b;
-	CalSummary *summary = user_data;
-	CalClientGetStatus status;
-	CalComponentDateTime start_a, start_b;
-
-	/* a after b then return > 0 */
-
-	status = cal_client_get_object (summary->client, a, &comp_a);
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		return -1;
-
-	status = cal_client_get_object (summary->client, b, &comp_b);
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		return 1;
-
-	cal_component_get_dtstart (comp_a, &start_a);
-	cal_component_get_dtstart (comp_b, &start_b);
-
-	return icaltime_compare (*start_a.value, *start_b.value);
-}
-
-static gboolean
-generate_html_summary (gpointer data)
-{
-	CalSummary *summary;	
-	time_t t, day_begin, day_end;
-	struct tm *timeptr;
-	GList *uids, *l;
-	char *ret_html, *datestr;
-	char *tmp, *tmp2;
-
-	summary = data;
-	
-	t = time (NULL);
-	day_begin = time_day_begin (t);
-	day_end = time_day_end (t);
-
-	datestr = g_new (char, 256);
-	timeptr = localtime (&t);
-	strftime (datestr, 255, _("%A, %e %B %Y"),
-		  timeptr);
-	tmp = g_strdup_printf ("<b>%s</b>", datestr);
-	ret_html = e_utf8_from_locale_string (tmp);
-	g_free (tmp);
-	g_free (datestr);
-
-	if (summary->appointments) {
-		tmp = ret_html;
-		tmp2 = e_utf8_from_locale_string (_("Appointments"));
-		ret_html = g_strconcat (tmp, "<p align=\"center\">",
-					tmp2, "</p><hr><ul>", NULL);
-		g_free (tmp);
-		g_free (tmp2);
-		
-		uids = cal_client_get_objects_in_range (summary->client, 
-							CALOBJ_TYPE_EVENT, day_begin,
-							day_end);
-		uids = cal_list_sort (uids, sort_uids, summary);
-
-		for (l = uids; l; l = l->next){
-			CalComponent *comp;
-			CalComponentText text;
-			CalClientGetStatus status;
-			CalComponentDateTime start, end;
-			struct icaltimetype *end_time;
-			time_t start_t, end_t;
-			struct tm *start_tm, *end_tm;
-			char *start_str, *end_str;
-			char *uid;
-			
-			uid = l->data;
-			status = cal_client_get_object (summary->client, uid, &comp);
-			if (status != CAL_CLIENT_GET_SUCCESS)
-				continue;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_get_dtstart (comp, &start);
-			cal_component_get_dtend (comp, &end);
-			
-			g_print ("text.value: %s\n", text.value);
-			end_time = end.value;
-			
-			start_t = icaltime_as_timet (*start.value);
-			
-			start_str = g_new (char, 20);
-			start_tm = localtime (&start_t);
-			strftime (start_str, 19, _("%I:%M%p"), start_tm);
-			
-			if (end_time) {
-				end_str = g_new (char, 20);
-				end_t = icaltime_as_timet (*end_time);
-				end_tm = localtime (&end_t);
-				strftime (end_str, 19, _("%I:%M%p"), end_tm);
-			} else {
-				end_str = g_strdup ("...");
-			}
-			
-			tmp2 = g_strdup_printf ("<li>%s:%s -> %s</li>", text.value, start_str, end_str);
-			g_free (start_str);
-			g_free (end_str);
-			
-			tmp = ret_html;
-			ret_html = g_strconcat (ret_html, tmp2, NULL);
-			g_free (tmp);
-			g_free (tmp2);
-		}
-		
-		cal_obj_uid_list_free (uids);
-	
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, "</ul>", NULL);
-		g_free (tmp);
-	}
-
-	if (summary->tasks) {
-		tmp = ret_html;
-		tmp2 = e_utf8_from_locale_string (_("Tasks"));
-		ret_html = g_strconcat (tmp, "<p align=\"center\">",
-					tmp2, "</p><hr><ul>", NULL);
-		g_free (tmp);
-		g_free (tmp2);
-		
-		/* Generate a list of tasks */
-		uids = cal_client_get_uids (summary->client, CALOBJ_TYPE_TODO);
-		for (l = uids; l; l = l->next){
-			CalComponent *comp;
-			CalComponentText text;
-			CalClientGetStatus status;
-			struct icaltimetype *completed;
-			char *uid;
-			
-			uid = l->data;
-			status = cal_client_get_object (summary->client, uid, &comp);
-			if (status != CAL_CLIENT_GET_SUCCESS)
-				continue;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_get_completed (comp, &completed);
-			
-			if (completed == NULL) {
-				tmp2 = g_strdup_printf ("<li>%s</li>", text.value);
-			} else {
-				tmp2 = g_strdup_printf ("<li><strike>%s</strike></li>",
-							text.value);
-				cal_component_free_icaltimetype (completed);
-			}
-			
-			tmp = ret_html;
-			ret_html = g_strconcat (ret_html, tmp2, NULL);
-			g_free (tmp);
-			g_free (tmp2);
-		}
-		
-		cal_obj_uid_list_free (uids);
-		
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, "</ul>", NULL);
-		g_free (tmp);
-	}
-
-	executive_summary_html_view_set_html (summary->view, ret_html);
-	g_free (ret_html);
-	
-	summary->idle = 0;
-	return FALSE;
-}
-
-static void
-get_property (BonoboPropertyBag *bag,
-	      BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer data)
-{
-	CalSummary *summary = (CalSummary *) data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		g_warning ("Get property: %s", summary->title);
-		BONOBO_ARG_SET_STRING (arg, summary->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, summary->icon);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-set_property (BonoboPropertyBag *bag,
-	      const BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	CalSummary *summary = (CalSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		if (summary->title)
-			g_free (summary->title);
-
-		summary->title = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		bonobo_property_bag_notify_listeners (bag, "window_title",
-						      arg, NULL);
-		break;
-
-	case PROPERTY_ICON:
-		if (summary->icon)
-			g_free (summary->icon);
-
-		summary->icon = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		bonobo_property_bag_notify_listeners (bag, "window_icon",
-						      arg, NULL);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-component_destroyed (GtkObject *object,
-		     gpointer data)
-{
-	CalSummary *summary = (CalSummary *) data;
-
-	g_free (summary->title);
-	g_free (summary->icon);
-	gtk_object_destroy (GTK_OBJECT (summary->client));
-
-	g_free (summary);
-
-	running_views--;
-
-	if (running_views <= 0) {
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-	}
-}
-
-static void
-obj_updated_cb (CalClient *client,
-		const char *uid,
-		CalSummary *summary)
-{
-	/* FIXME: Maybe cache the uid's in the summary and only call this if
-	   uid is in this cache??? */
-
-	if (summary->idle != 0) 
-		return;
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static void
-obj_removed_cb (CalClient *client,
-		const char *uid,
-		CalSummary *summary)
-{
-	/* See FIXME: above */
-	if (summary->idle != 0)
-		return;
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static void
-cal_opened_cb (CalClient *client,
-	       CalClientOpenStatus status,
-	       CalSummary *summary)
-{
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (summary->idle != 0)
-			return;
-
-		summary->idle = g_idle_add (generate_html_summary, summary);
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		executive_summary_html_view_set_html (summary->view,
-						      _("<b>Error loading calendar</b>"));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* We did not use only_if_exists when opening the calendar, so
-		 * this should not happen.
-		 */
-		g_assert_not_reached ();
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		executive_summary_html_view_set_html (summary->view,
-						      _("<b>Error loading calendar:<br>Method not supported"));
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-alarm_fn (gpointer alarm_id,
-	  time_t trigger,
-	  gpointer data)
-{
-	CalSummary *summary;
-	time_t t, day_end;
-
-	summary = data;
-
-	t = time (NULL);
-	day_end = time_day_end (t);
-	summary->alarm = alarm_add (day_end, alarm_fn, summary, NULL);
-
-	/* Now redraw the summary */
-	generate_html_summary (summary);
-}
-
-/* PersistStream callbacks */
-static void
-load_from_stream (BonoboPersistStream *ps,
-		  Bonobo_Stream stream,
-		  Bonobo_Persist_ContentType type,
-		  gpointer data,
-		  CORBA_Environment *ev)
-{
-	CalSummary *summary = (CalSummary *) data;
-	char *str;
-	xmlChar *xml_str;
-	xmlDocPtr doc;
-	xmlNodePtr root, children;
-
-	if (*type && g_strcasecmp (type, "application/x-evolution-calendar-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, 
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	bonobo_stream_client_read_string (stream, &str, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION || str == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	doc = xmlParseDoc ((xmlChar *) str);
-
-	if (doc == NULL) {
-		g_warning ("Bad data: %s!", str);
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		g_free (str);
-		return;
-	}
-
-	g_free (str);
-	root = doc->root;
-	children = root->childs;
-	while (children) {
-		if (strcasecmp (children->name, "showappointments") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			if (strcmp (xml_str, "TRUE") == 0)
-				summary->appointments = TRUE;
-			else 
-				summary->appointments = FALSE;
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		if (strcasecmp (children->name, "showtasks") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			if (strcmp (xml_str, "TRUE") == 0)
-				summary->tasks = TRUE;
-			else
-				summary->tasks = FALSE;
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		g_print ("Unknown name: %s\n", children->name);
-		children = children->next;
-	}
-	xmlFreeDoc (doc);
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static char *
-summary_to_string (CalSummary *summary)
-{
-	xmlChar *out_str;
-	int out_len = 0;
-	xmlDocPtr doc;
-	xmlNsPtr ns;
-
-	doc = xmlNewDoc ("1.0");
-	ns = xmlNewGlobalNs (doc, "www.ximian.com", "calendar-summary");
-	doc->root = xmlNewDocNode (doc, ns, "calendar-summary", NULL);
-
-	xmlNewChild (doc->root, ns, "showappointments", 
-		     summary->appointments ? "TRUE" : "FALSE");
-	xmlNewChild (doc->root, ns, "showtasks", summary->tasks ? "TRUE" : "FALSE");
-	
-	xmlDocDumpMemory (doc, &out_str, &out_len);
-	return out_str;
-}
-
-static void
-save_to_stream (BonoboPersistStream *ps,
-		const Bonobo_Stream stream,
-		Bonobo_Persist_ContentType type,
-		gpointer data,
-		CORBA_Environment *ev)
-{
-	CalSummary *summary = (CalSummary *) data;
-	char *str;
-
-	if (*type && g_strcasecmp (type, "application/x-evolution-calendar-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	str = summary_to_string (summary);
-	if (str)
-		bonobo_stream_client_printf (stream, TRUE, ev, str);
-	xmlFree (str);
-
-	return;
-}
-
-static Bonobo_Persist_ContentTypeList *
-content_types (BonoboPersistStream *ps,
-	       void *closure,
-	       CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (1, "application/x-evolution-calendar-summary");
-}
-
-static void
-property_dialog_changed (GtkWidget *widget,
-			 CalSummary *summary)
-{
-	bonobo_property_control_changed (summary->property_control, NULL);
-}
-
-static BonoboControl *
-property_dialog (BonoboPropertyControl *property_control,
-		 int page_num,
-		 void *user_data)
-{
-	BonoboControl *control;
-	CalSummary *summary = (CalSummary *) user_data;
-	GtkWidget *container, *vbox;
-
-	container = gtk_frame_new (_("Display"));
-	gtk_container_set_border_width (GTK_CONTAINER (container), 2);
-	vbox = gtk_vbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (container), vbox);
-	
-	summary->show_appointments = gtk_check_button_new_with_label (_("Show appointments"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->show_appointments), 
-				      summary->appointments);
-	gtk_signal_connect (GTK_OBJECT (summary->show_appointments), "toggled",
-			    GTK_SIGNAL_FUNC (property_dialog_changed), summary);
-	gtk_box_pack_start (GTK_BOX (vbox), summary->show_appointments, 
-			    TRUE, TRUE, 0);
-	
-	summary->show_tasks = gtk_check_button_new_with_label (_("Show tasks"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->show_tasks),
-				      summary->tasks);
-	gtk_signal_connect (GTK_OBJECT (summary->show_tasks), "toggled",
-			    GTK_SIGNAL_FUNC (property_dialog_changed), summary);
-	gtk_box_pack_start (GTK_BOX (vbox), summary->show_tasks, TRUE, TRUE, 0);
-	gtk_widget_show_all (container);
-
-	control = bonobo_control_new (container);
-	return control;
-}
-
-static void
-property_action (GtkObject *property_control,
-		 int page_num,
-		 Bonobo_PropertyControl_Action action,
-		 CalSummary *summary)
-{
-	switch (action) {
-	case Bonobo_PropertyControl_APPLY:
-		summary->appointments = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary->show_appointments));
-		summary->tasks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary->show_tasks));
-		summary->idle = g_idle_add (generate_html_summary, summary);
-		break;
-
-	case Bonobo_PropertyControl_HELP:
-		g_print ("HELP\n");
-		break;
-
-	default:
-		break;
-	}
-}
-
-BonoboObject *
-create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-		     void *closure)
-{
-	BonoboObject *component, *view;
-	BonoboPersistStream *stream;
-	BonoboPropertyBag *bag;
-	BonoboPropertyControl *property_control;
-	BonoboEventSource *event_source;
-	CalSummary *summary;
-	char *file;
-	time_t t, day_end;
-
-	file = g_concat_dir_and_file (evolution_dir, "local/Calendar/calendar.ics");
-
-	/* Create the component object */
-	component = executive_summary_component_new ();
-
-	summary = g_new (CalSummary, 1);
-	summary->component = EXECUTIVE_SUMMARY_COMPONENT (component);
-	summary->icon = g_strdup ("evolution-calendar.png");
-	summary->title = e_utf8_from_locale_string (_("Things to do"));
-	summary->client = cal_client_new ();
-	summary->idle = 0;
-	summary->appointments = TRUE;
-	summary->tasks = TRUE;
-
-	t = time (NULL);
-	day_end = time_day_end (t);
-	summary->alarm = alarm_add (day_end, alarm_fn, summary, NULL);
-
-	/* Load calendar */
-	cal_client_open_calendar (summary->client, file, FALSE);
-	g_free (file);
-
-	gtk_signal_connect (GTK_OBJECT (summary->client), "cal-opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (summary->client), "obj-updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (summary->client), "obj-removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), summary);
-		
-	gtk_signal_connect (GTK_OBJECT (component), "destroy",
-			    GTK_SIGNAL_FUNC (component_destroyed), summary);
-
-	event_source = bonobo_event_source_new ();
-
-	/* HTML view */
-	view = executive_summary_html_view_new_full (event_source);
-	summary->view = EXECUTIVE_SUMMARY_HTML_VIEW (view);
-
-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (view),
-					      _("Loading Calendar"));
-	bonobo_object_add_interface (component, view);
-
-	/* BonoboPropertyBag */
-	bag = bonobo_property_bag_new_full (get_property, set_property, 
-					    event_source, summary);
-	bonobo_property_bag_add (bag, "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING, NULL, 
-				 "The title of this component's window", 0);
-	bonobo_property_bag_add (bag, "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING, NULL, 
-				 "The icon for this component's window", 0);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (bag));
-
-	property_control = bonobo_property_control_new_full (property_dialog, 
-							     1, event_source,
-							     summary);
-	summary->property_control = property_control;
-	gtk_signal_connect (GTK_OBJECT (property_control), "action",
-			    GTK_SIGNAL_FUNC (property_action), summary);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (property_control));
-			    
-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,
-					    NULL, content_types, summary);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (stream));
-
-	running_views++;
-
-	return component;
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *generic_factory,
-	    void *closure)
-{
-	BonoboObject *_factory;
-
-	_factory = executive_summary_component_factory_new (create_summary_view,
-							    NULL);
-	return _factory;
-}
-
-BonoboGenericFactory *
-calendar_summary_factory_init (void)
-{
-	if (factory != NULL)
-		return factory;
-
-	factory = bonobo_generic_factory_new (CALENDAR_SUMMARY_ID, factory_fn,
-					      NULL);
-
-	if (factory == NULL) {
-		g_warning ("Cannot initialize calendar summary factory");
-		return NULL;
-	}
-
-	return factory;
-}
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
deleted file mode 100644
index b15bbb0bb3..0000000000
--- a/calendar/gui/calendar-summary.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * 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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_SUMMARY_H
-#define CALENDAR_SUMMARY_H
-
-#include <bonobo/bonobo-generic-factory.h>
-#include <evolution-services/executive-summary-component.h>
-
-BonoboGenericFactory *calendar_summary_factory_init (void);
-
-BonoboObject *create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-				   void *closure);
-
-#endif
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
deleted file mode 100644
index 23cad04f9c..0000000000
--- a/calendar/gui/calendar-view-factory.c
+++ /dev/null
@@ -1,253 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 fb87a90dda..0000000000
--- a/calendar/gui/calendar-view-factory.h
+++ /dev/null
@@ -1,66 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 7a3a2b3fd1..0000000000
--- a/calendar/gui/calendar-view.c
+++ /dev/null
@@ -1,317 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 f0bf0bcbfd..0000000000
--- a/calendar/gui/calendar-view.h
+++ /dev/null
@@ -1,68 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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-util.c b/calendar/gui/comp-util.c
deleted file mode 100644
index 944b5dcdce..0000000000
--- a/calendar/gui/comp-util.c
+++ /dev/null
@@ -1,58 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "comp-util.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, TRUE, zone);
-	cdt->tzid = icaltimezone_get_tzid (zone);
-
-	list = g_slist_append (list, cdt);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
deleted file mode 100644
index d0c39259ab..0000000000
--- a/calendar/gui/comp-util.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 <cal-util/cal-component.h>
-
-void cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone);
-
-#endif
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
deleted file mode 100644
index 4b47fe697d..0000000000
--- a/calendar/gui/component-factory.c
+++ /dev/null
@@ -1,400 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include "evolution-shell-component.h"
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png", TRUE, NULL, NULL },
-	{ "tasks", "evolution-tasks.png", TRUE, NULL, NULL },
-	{ NULL, NULL }
-};
-
-
-/* Utility functions.  */
-
-static const char *
-get_local_file_name_for_folder_type (const char *type)
-{
-	if (strcmp (type, "calendar") == 0)
-		return "calendar.ics";
-	else if (strcmp (type, "tasks") == 0)
-		return "tasks.ics";
-	else
-		return NULL;
-}
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		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);
-
-	*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;
-
-	CORBA_exception_init(&ev);
-	/* FIXME: I don't think we have to do anything to create a calendar
-	   or tasks folder - the '.ics' files are created automatically when
-	   needed. But I'm not sure - Damon. */
-	if (!strcmp(type, "calendar") || !strcmp(type, "tasks")) {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_OK, &ev);
-	} else {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &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;
-	const char *file_name;
-	gchar *path;
-	int rv;
-
-	CORBA_exception_init(&ev);
-
-	/* check URI */
-	if (strncmp (physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* FIXME: check if there are subfolders? */
-
-	file_name = get_local_file_name_for_folder_type (type);
-	if (file_name == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* remove the .ics file */
-	path = g_concat_dir_and_file (physical_uri + 7, file_name);
-	rv = unlink (path);
-	g_free (path);
-	if (rv == 0) {
-		/* everything OK; notify the listener */
-		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);
-}
-
-/* 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);
-}
-
-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;
-	gchar *source_path;
-	FILE *fin;
-	icalparser *parser;
-	icalcomponent *icalcomp;
-	GnomeVFSHandle *handle;
-	GnomeVFSURI *uri;
-	GnomeVFSFileSize out;
-	char *buf;
-	const char *file_name;
-
-	CORBA_exception_init (&ev);
-
-	/* check URI */
-	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;
-	}
-
-	file_name = get_local_file_name_for_folder_type (type);
-	if (file_name == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* open source and destination files */
-	source_path = g_concat_dir_and_file (source_physical_uri + 7, "calendar.ics");
-
-	fin = fopen (source_path, "r");
-	if (!fin) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-		g_free (source_path);
-		CORBA_exception_free (&ev);
-		return;
-	}
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fin);
-	icalcomp = icalparser_parse (parser, get_line_fn);
-	icalparser_free (parser);
-	if (!icalcomp
-	    || icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-		fclose (fin);
-		g_free (source_path);
-		if (icalcomp)
-			icalcomponent_free (icalcomp);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* now, write the new file out */
-	uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (gnome_vfs_create_uri (&handle, uri, GNOME_VFS_OPEN_WRITE, FALSE, 0666)
-	    != GNOME_VFS_OK) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		fclose (fin);
-		g_free (source_path);
-		icalcomponent_free (icalcomp);
-		CORBA_exception_free (&ev);
-		return;
-	}
-	buf = icalcomponent_as_ical_string (icalcomp);
-	if (gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out)
-	    != GNOME_VFS_OK) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-			&ev);
-	}
-	else {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_OK,
-			&ev);
-	}
-
-	gnome_vfs_close (handle);
-	gnome_vfs_uri_unref (uri);
-	
-	/* free resources */
-	fclose (fin);
-
-	if (remove_source)
-		unlink (source_path);
-
-	g_free (source_path);
-	icalcomponent_free (icalcomp);
-	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);
-
-	calendar_config_init ();
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-
-	shells = g_list_append (shells, shell_component);
-}
-
-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 ();
-}
-
-#if 0
-static void
-destroy_cb (EvolutionShellComponent *shell_component,
-	    gpointer user_data)
-{
-	shells = g_list_remove (shells, shell_component);
-	
-	if (g_list_length (shells) == 0)
-		gtk_main_quit ();
-}
-#endif
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-	
-	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 */);
-
-	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);
-#if 0
-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_cb), NULL);
-
-	shells = g_list_append (shells, shell_component);
-#endif
-	
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-
-	if (factory == NULL)
-		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 b0d295bc16..0000000000
--- a/calendar/gui/component-factory.h
+++ /dev/null
@@ -1,32 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index 756a4c3a46..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,216 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 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;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-	case PROPERTY_CALENDAR_URI_IDX:
-		filename = g_strdup_printf ("%s/calendar.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		gnome_calendar_open (gcal, filename); /* FIXME: result value -> exception? */
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-	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.");
-}
-
-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));
-}
-
-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;
-	}
-
-	calendar_properties_init (gcal, control);
-	calendar_persist_init (gcal, control);
-					      
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index 947255b0d4..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,31 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 3b97f6881d..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-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 a56cf18d76..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-## CORBA stuff
-
-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)					\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-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	\
-	e-timezone-dialog.c	\
-	e-timezone-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		\
-	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
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA =				\
-	alarm-options.glade		\
-	alarm-page.glade		\
-	cal-prefs-dialog.glade		\
-	e-delegate-dialog.glade		\
-	e-timezone-dialog.glade		\
-	event-page.glade		\
-	meeting-page.glade		\
-	recurrence-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 f94d146377..0000000000
--- a/calendar/gui/dialogs/alarm-options.c
+++ /dev/null
@@ -1,576 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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)
-{
-	struct icalattachtype *attach;
-	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 (icalattachtype_get_base64 (attach))
-		g_message ("alarm_to_aalarm_widgets(): FIXME: we don't support base64 data yet");
-	else if (icalattachtype_get_binary (attach))
-		g_message ("alarm_to_aalarm_widgets(): FIXME: we don't support binary data yet");
-	else
-		url = icalattachtype_get_url (attach);
-
-	e_dialog_editable_set (dialog->aalarm_attach, url);
-
-	icalattachtype_free (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)
-{
-	struct icalattachtype *attach;
-	CalComponentText description;
-	char *url;
-
-	cal_component_alarm_get_attach (alarm, &attach);
-	cal_component_alarm_get_description (alarm, &description);
-
-	url = icalattachtype_get_url (attach);
-
-	e_dialog_editable_set (dialog->palarm_program, url);
-	e_dialog_editable_set (dialog->palarm_args, description.value);
-
-	icalattachtype_free (attach);
-}
-
-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;
-	struct icalattachtype *attach;
-
-	attach = icalattachtype_new ();
-
-	url = e_dialog_editable_get (dialog->aalarm_attach);
-	icalattachtype_set_url (attach, url ? url : "");
-	g_free (url);
-
-	cal_component_alarm_set_attach (alarm, attach);
-	icalattachtype_free (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;
-	struct icalattachtype *attach;
-	char *str;
-	CalComponentText description;
-
-	attach = icalattachtype_new ();
-
-	program = e_dialog_editable_get (dialog->palarm_program);
-	icalattachtype_set_url (attach, program ? program : "");
-	g_free (program);
-
-	cal_component_alarm_set_attach (alarm, attach);
-	icalattachtype_free (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 ();
-	}
-}
-
-
-
-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 ad0c181561..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>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>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>FIXME: mail alarm options</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>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 36f945f684..0000000000
--- a/calendar/gui/dialogs/alarm-options.h
+++ /dev/null
@@ -1,29 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 de33ff2d0d..0000000000
--- a/calendar/gui/dialogs/alarm-page.c
+++ /dev/null
@@ -1,826 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cal-util/cal-util.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;
-};
-
-
-
-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 void 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;
-}
-
-/* Frees all the alarm data and empties the list */
-static void
-free_alarms (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-	int i;
-
-	priv = apage->priv;
-
-	if (priv->list != NULL) {
-		GtkCList *clist = GTK_CLIST (priv->list);
-
-		for (i = 0; i < clist->rows; i++) {
-			CalComponentAlarm *alarm;
-			
-			alarm = gtk_clist_get_row_data (clist, i);
-			g_assert (alarm != NULL);
-			cal_component_alarm_free (alarm);
-			
-			gtk_clist_set_row_data (clist, i, NULL);
-		}
-	
-		gtk_clist_clear (clist);
-	}
-}
-
-/* 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;
-	}
-
-	free_alarms (apage);
-
-	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), "");
-
-	/* List data */
-	free_alarms (apage);
-}
-
-static char *
-get_alarm_duration_string (struct icaldurationtype *duration)
-{
-	GString *string = g_string_new (NULL);
-	char *ret;
-
-	if (duration->days > 1)
-		g_string_sprintf (string, _("%d days"), duration->days);
-	else if (duration->days == 1)
-		g_string_append (string, _("1 day"));
-
-	if (duration->weeks > 1)
-		g_string_sprintf (string, _("%d weeks"), duration->weeks);
-	else if (duration->weeks == 1)
-		g_string_append (string, _("1 week"));
-
-	if (duration->hours > 1)
-		g_string_sprintf (string, _("%d hours"), duration->hours);
-	else if (duration->hours == 1)
-		g_string_append (string, _("1 hour"));
-
-	if (duration->minutes > 1)
-		g_string_sprintf (string, _("%d minutes"), duration->minutes);
-	else if (duration->minutes == 1)
-		g_string_append (string, _("1 minute"));
-
-	if (duration->seconds > 1)
-		g_string_sprintf (string, _("%d seconds"), duration->seconds);
-	else if (duration->seconds == 1)
-		g_string_append (string, _("1 second"));
-
-	ret = string->str;
-	g_string_free (string, FALSE);
-
-	return ret;
-}
-
-static char *
-get_alarm_string (CalComponentAlarm *alarm)
-{
-	CalAlarmAction action;
-	CalAlarmTrigger trigger;
-	char string[256];
-	char *base;
-	char *str;
-	char *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");
-		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 (trigger.u.rel_duration.is_neg)
-			str = g_strdup_printf ("%s %s %s", base, dur,
-					       _("before start of appointment"));
-		else
-			str = g_strdup_printf ("%s %s %s", base, dur,
-					       _("after start of appointment"));
-
-		g_free (dur);
-		break;
-
-	case CAL_ALARM_TRIGGER_RELATIVE_END:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-
-		if (trigger.u.rel_duration.is_neg)
-			str = g_strdup_printf ("%s %s %s", base, dur,
-					       _("before end of appointment"));
-		else
-			str = g_strdup_printf ("%s %s %s", base, dur,
-					       _("after end of appointment"));
-
-		g_free (dur);
-		break;
-	case CAL_ALARM_TRIGGER_NONE:
-	case CAL_ALARM_TRIGGER_ABSOLUTE:
-	default:
-		str = g_strdup_printf ("%s %s", base,
-				       _("Unknown"));
-		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 (clist, i, alarm);
-	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);
-
-	/* List */
-	if (!cal_component_has_alarms (comp))
-		return;
-
-	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);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the alarm page */
-static void
-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);
-		cal_component_alarm_free (alarm_copy);
-	}
-}
-
-/* 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);
-}
-
-
-
-/* "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_EMAIL,
-	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
-};
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = apage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("alarm-page");
-	if (!priv->main)
-		return FALSE;
-
-	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;
-	CalComponentAlarm *alarm;
-	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);
-
-	alarm = gtk_clist_get_row_data (clist, sel);
-	g_assert (alarm != NULL);
-	cal_component_alarm_free (alarm);
-	gtk_clist_set_row_data (clist, sel, NULL);
-
-	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 076d38f76e..0000000000
--- a/calendar/gui/dialogs/alarm-page.glade
+++ /dev/null
@@ -1,383 +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>date-time</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</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>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>
-	  <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>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</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
-Send an email
-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>100</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>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <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>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>_Delete</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	    </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 97c1361f4d..0000000000
--- a/calendar/gui/dialogs/alarm-page.h
+++ /dev/null
@@ -1,62 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 7176354a73..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,545 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#include <config.h>
-#include <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>
-#include "../e-timezone-entry.h"
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "../calendar-commands.h"
-#include "../e-tasks.h"
-
-
-struct _CalPrefsDialogPrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-
-	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;
-};
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-static void cal_prefs_dialog_class_init		(CalPrefsDialogClass *class);
-static void cal_prefs_dialog_init		(CalPrefsDialog	     *prefs);
-static gboolean get_widgets			(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_destroy		(GtkObject	     *object);
-static void cal_prefs_dialog_init_widgets	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_button_clicked	(GtkWidget	     *dialog,
-						 gint		      button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget	     *button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_show_config	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_update_config	(CalPrefsDialog	     *prefs);
-
-GtkWidget*  cal_prefs_dialog_create_time_edit	(void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE (cal_prefs_dialog, "CalPrefsDialog", CalPrefsDialog,
-	     cal_prefs_dialog_class_init, cal_prefs_dialog_init,
-	     GTK_TYPE_OBJECT)
-
-
-static void
-cal_prefs_dialog_class_init (CalPrefsDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_prefs_dialog_destroy;
-}
-
-
-static void
-cal_prefs_dialog_init (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = g_new0 (CalPrefsDialogPrivate, 1);
-	prefs->priv = priv;
-
-}
-
-
-/**
- * cal_prefs_dialog_new:
- * @Returns: a new #CalPrefsDialog.
- *
- * Creates a new #CalPrefsDialog.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_new (void)
-{
-	CalPrefsDialog *prefs;
-
-	prefs = CAL_PREFS_DIALOG (gtk_type_new (cal_prefs_dialog_get_type ()));
-	return cal_prefs_dialog_construct (prefs);
-}
-
-
-/**
- * cal_prefs_dialog_construct:
- * @prefs: A #CalPrefsDialog.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @prefs, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_construct (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_val_if_fail (IS_CAL_PREFS_DIALOG (prefs), NULL);
-
-	priv = prefs->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (prefs)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	cal_prefs_dialog_init_widgets (prefs);
-
-	cal_prefs_dialog_show_config (prefs);
-
-	gtk_widget_show (priv->dialog);
-
-	return prefs;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (prefs));
-	return NULL;
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->dialog = GW ("cal-prefs-dialog");
-
-	/* The indices must be 0 (Sun) to 6 (Sat). */
-	priv->working_days[0] = GW ("sun_button");
-	priv->working_days[1] = GW ("mon_button");
-	priv->working_days[2] = GW ("tue_button");
-	priv->working_days[3] = GW ("wed_button");
-	priv->working_days[4] = GW ("thu_button");
-	priv->working_days[5] = GW ("fri_button");
-	priv->working_days[6] = GW ("sat_button");
-
-	priv->timezone = GW ("timezone");
-	priv->week_start_day = GW ("first_day_of_week");
-	priv->start_of_day = GW ("start_of_day");
-	priv->end_of_day = GW ("end_of_day");
-	priv->use_12_hour = GW ("use_12_hour");
-	priv->use_24_hour = GW ("use_24_hour");
-	priv->time_divisions = GW ("time_divisions");
-	priv->show_end_times = GW ("show_end_times");
-	priv->compress_weekend = GW ("compress_weekend");
-	priv->dnav_show_week_no = GW ("dnav_show_week_no");
-
-	priv->tasks_due_today_color = GW ("tasks_due_today_color");
-	priv->tasks_overdue_color = GW ("tasks_overdue_color");
-
-#undef GW
-
-	return (priv->dialog
-		&& priv->timezone
-		&& priv->working_days[0]
-		&& priv->working_days[1]
-		&& priv->working_days[2]
-		&& priv->working_days[3]
-		&& priv->working_days[4]
-		&& priv->working_days[5]
-		&& priv->working_days[6]
-		&& priv->week_start_day
-		&& priv->start_of_day
-		&& priv->end_of_day
-		&& priv->use_12_hour
-		&& priv->use_24_hour
-		&& priv->time_divisions
-		&& priv->show_end_times
-		&& priv->compress_weekend
-		&& priv->dnav_show_week_no);
-}
-
-
-static void
-cal_prefs_dialog_destroy (GtkObject *object)
-{
-	CalPrefsDialog *prefs;
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (object));
-
-	prefs = CAL_PREFS_DIALOG (object);
-	priv = prefs->priv;
-
-
-	g_free (priv);
-	prefs->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-void
-cal_prefs_dialog_show		(CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* If the dialog is already show just raise it, otherwise refresh the
-	   config settings and show it. */
-	if (GTK_WIDGET_MAPPED (priv->dialog)) {
-		gdk_window_raise (priv->dialog->window);
-	} else {
-		cal_prefs_dialog_show_config (prefs);
-		gtk_widget_show (priv->dialog);
-	}
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-cal_prefs_dialog_init_widgets	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->dialog), "clicked",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_button_clicked),
-			    prefs);
-
-	gtk_signal_connect (GTK_OBJECT (priv->use_24_hour), "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),
-			    prefs);
-}
-
-
-static void
-cal_prefs_dialog_button_clicked	(GtkWidget	*dialog,
-				 gint		 button,
-				 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* OK & Apply buttons update the config settings. */
-	if (button == 0 || button == 1)
-		cal_prefs_dialog_update_config	(prefs);
-
-	/* OK & Close buttons close the dialog. */
-	if (button == 0 || button == 2)
-		gtk_widget_hide (priv->dialog);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled	(GtkWidget	*button,
-					 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	gboolean use_24_hour;
-
-	priv = prefs->priv;
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->start_of_day),
-					    use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->end_of_day),
-					    use_24_hour);
-}
-
-/* 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 (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	set_color_picker (priv->tasks_due_today_color, calendar_config_get_tasks_due_today_color ());
-	set_color_picker (priv->tasks_overdue_color, calendar_config_get_tasks_overdue_color ());
-}
-
-/* Shows the current config settings in the dialog. */
-static void
-cal_prefs_dialog_show_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-	char *zone_name;
-	icaltimezone *zone;
-
-	priv = prefs->priv;
-
-	/* Timezone. */
-	zone_name = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (zone_name);
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->timezone),
-				       zone);
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->working_days[day]), (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (priv->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_24_hour), TRUE);
-	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_12_hour), TRUE);
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (priv->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_end_times),
-				      calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->compress_weekend), calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no), calendar_config_get_dnav_show_week_no ());
-
-	/* Task list */
-
-	show_task_list_config (prefs);
-}
-
-/* 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 (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	calendar_config_set_tasks_due_today_color (spec_from_picker (priv->tasks_due_today_color));
-	calendar_config_set_tasks_overdue_color (spec_from_picker (priv->tasks_overdue_color));
-}
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-cal_prefs_dialog_update_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-	icaltimezone *zone;
-
-	priv = prefs->priv;
-
-	/* Timezone. */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
-	calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->working_days[day])))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	calendar_config_set_working_days (working_days);
-
-	/* Week Start Day. */
-	week_start_day = e_dialog_option_menu_get (priv->week_start_day,
-						   week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     &hour, &minute);
-	calendar_config_set_day_start_hour (hour);
-	calendar_config_set_day_start_minute (minute);
-
-	/* End of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     &hour, &minute);
-	calendar_config_set_day_end_hour (hour);
-	calendar_config_set_day_end_minute (minute);
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour)));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (priv->time_divisions,
-						   time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->show_end_times)));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->compress_weekend)));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no)));
-
-	/* Task list */
-	update_task_list_config (prefs);
-
-	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 038d091a72..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,966 +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>
-  <title>Calendar Preferences</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook1</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox10</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame12</name>
-	  <label>Time</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table5</name>
-	    <border_width>4</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>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>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>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>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>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>12 hour (am/pm)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_24_hour</name>
-		<can_focus>True</can_focus>
-		<label>24 hour</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame9</name>
-	  <label>Work Week</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox8</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>mon_button</name>
-		<can_focus>True</can_focus>
-		<label>Mon</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tue_button</name>
-		<can_focus>True</can_focus>
-		<label>Tue</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>wed_button</name>
-		<can_focus>True</can_focus>
-		<label>Wed</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>thu_button</name>
-		<can_focus>True</can_focus>
-		<label>Thu</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>fri_button</name>
-		<can_focus>True</can_focus>
-		<label>Fri</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sat_button</name>
-		<can_focus>True</can_focus>
-		<label>Sat</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sun_button</name>
-		<can_focus>True</can_focus>
-		<label>Sun</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label16</name>
-		<label>First day of week:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>first_day_of_week</name>
-		<can_focus>True</can_focus>
-		<items>Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-Sunday
-</items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label17</name>
-		<label>Start of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>start_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:12 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label18</name>
-		<label>End of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>end_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <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>GtkFrame</class>
-	  <name>frame10</name>
-	  <label>Display</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table4</name>
-	    <border_width>4</border_width>
-	    <rows>3</rows>
-	    <columns>7</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label19</name>
-	      <label>Time divisions:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>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>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>GtkOptionMenu</class>
-		<name>time_divisions</name>
-		<can_focus>True</can_focus>
-		<items>60 minutes
-30 minutes
-15 minutes
-10 minutes
-05 minutes
-</items>
-		<initial_choice>0</initial_choice>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <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>
-		<left_attach>0</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>False</yfill>
-	      </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>
-		<left_attach>0</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>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame11</name>
-	  <label>Date Navigator</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>dnav_show_week_no</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Show week numbers</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label7</name>
-	<label>Calendar</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame13</name>
-	  <label>Colors for Tasks</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>table6</name>
-	    <border_width>4</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>label23</name>
-	      <label>Tasks due today</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>label24</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>
-	      <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_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>
-	      <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>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>Task List</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox6</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame6</name>
-	  <label>Defaults</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>hbox5</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>checkbutton7</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Remind me of all appointments</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinbutton1</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>minutes before they occur.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>3</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame7</name>
-	  <label>Notification Options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton8</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Beep when alarm windows appear.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<label>Reminders</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index e238d83378..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ /dev/null
@@ -1,72 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _CAL_PREFS_DIALOG_H_
-#define _CAL_PREFS_DIALOG_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define CAL_PREFS_DIALOG(obj)          GTK_CHECK_CAST (obj, cal_prefs_dialog_get_type (), CalPrefsDialog)
-#define CAL_PREFS_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, cal_prefs_dialog_get_type (), CalPrefsDialogClass)
-#define IS_CAL_PREFS_DIALOG(obj)       GTK_CHECK_TYPE (obj, cal_prefs_dialog_get_type ())
-
-
-typedef struct _CalPrefsDialog       CalPrefsDialog;
-typedef struct _CalPrefsDialogClass  CalPrefsDialogClass;
-
-typedef struct _CalPrefsDialogPrivate CalPrefsDialogPrivate;
-
-struct _CalPrefsDialog
-{
-	GtkObject object;
-
-	/*< private >*/
-	CalPrefsDialogPrivate *priv;
-};
-
-struct _CalPrefsDialogClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType		cal_prefs_dialog_get_type	(void);
-CalPrefsDialog* cal_prefs_dialog_construct	(CalPrefsDialog *prefs);
-CalPrefsDialog* cal_prefs_dialog_new		(void);
-
-void		cal_prefs_dialog_show		(CalPrefsDialog *prefs);
-
-END_GNOME_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
deleted file mode 100644
index 4362f9da7f..0000000000
--- a/calendar/gui/dialogs/cancel-comp.c
+++ /dev/null
@@ -1,84 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 04f1768e3d..0000000000
--- a/calendar/gui/dialogs/cancel-comp.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 a9be39c008..0000000000
--- a/calendar/gui/dialogs/changed-comp.c
+++ /dev/null
@@ -1,112 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 7a1cb3e151..0000000000
--- a/calendar/gui/dialogs/changed-comp.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 4e15ebeda9..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ /dev/null
@@ -1,370 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-
-/* Signal IDs */
-
-enum {
-	CHANGED,
-	NEEDS_SEND,
-	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;
-
-	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[NEEDS_SEND] =
-		gtk_signal_new ("needs_send",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   needs_send),
-				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;
-}
-
-
-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;
-	}
-}
-
-
-/**
- * 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.
- **/
-void
-comp_editor_page_fill_component (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);
-
-	if (CLASS (page)->fill_component != NULL)
-		(* CLASS (page)->fill_component) (page, comp);
-}
-
-/**
- * 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_needs_send:
- * @page: 
- * 
- * 
- **/
-void
-comp_editor_page_notify_needs_send (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[NEEDS_SEND]);	
-}
-
-/**
- * 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 6565d9888e..0000000000
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ /dev/null
@@ -1,104 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 {
-	struct icaltimetype *start;
-	struct icaltimetype *end;
-	struct icaltimetype *due;
-	struct icaltimetype *complete;
-} CompEditorPageDates;
-
-typedef struct {
-	GtkObject object;
-
-	/* Some of the pages need the CalClient to access timezone data. */
-	CalClient *client;
-} 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);
-	void (* 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);
-void       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_needs_send      (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 0e4384dca4..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ /dev/null
@@ -1,226 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <ical.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.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. Note that it returns pointers to static
- * structs, so these will be overwritten in the next call.
- **/
-void
-comp_editor_dates (CompEditorPageDates *dates, CalComponent *comp)
-{
-	static struct icaltimetype start;
-	static struct icaltimetype end;
-	static struct icaltimetype due;
-	static struct icaltimetype complete;
-
-	CalComponentDateTime dt;
-	struct icaltimetype *comp_complete;
-
-
-	dates->start = NULL;
-	dates->end = NULL;
-	dates->due = NULL;
-	dates->complete = NULL;
-	
-	cal_component_get_dtstart (comp, &dt);
-	if (dt.value) {
-		start = *dt.value;
-		dates->start = &start;
-	}
-	cal_component_free_datetime (&dt);
-
-	cal_component_get_dtend (comp, &dt);
-	if (dt.value) {
-		end = *dt.value;
-		dates->end = &end;
-	}
-	cal_component_free_datetime (&dt);
-
-	cal_component_get_due (comp, &dt);
-	if (dt.value) {
-		due = *dt.value;
-		dates->due = &due;
-	}
-	cal_component_free_datetime (&dt);
-
-	cal_component_get_completed (comp, &comp_complete);
-	if (comp_complete) {
-		complete = *comp_complete;
-		dates->complete = &complete;
-		cal_component_free_icaltimetype (comp_complete);
-	}
-}
-
-static void
-write_label_piece (struct icaltimetype *tt, char *buffer, int size,
-		   char *stext, char *etext)
-{
-	struct tm tmp_tm = { 0 };
-	int len;
-	
-	/* FIXME: May want to convert the time to an appropriate zone. */
-
-	if (stext != NULL)
-		strcat (buffer, stext);
-
-	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);
-
-	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);
-}
-
-/**
- * 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))
-		start_set = TRUE;
-	if (dates->end && !icaltime_is_null_time (*dates->end))
-		end_set = TRUE;
-	if (dates->complete && !icaltime_is_null_time (*dates->complete))
-		complete_set = TRUE;
-	if (dates->due && !icaltime_is_null_time (*dates->due))
-		due_set = TRUE;
-
-	if (start_set)
-		write_label_piece (dates->start, buffer, 1024, NULL, NULL);
-
-	if (start_set && end_set)
-		write_label_piece (dates->end, buffer, 1024, _(" to "), NULL);
-
-	if (complete_set) {
-		if (start_set)
-			write_label_piece (dates->complete, buffer, 1024, _(" (Completed "), ")");
-		else
-			write_label_piece (dates->complete, buffer, 1024, _("Completed "), NULL);
-	}
-	
-	if (due_set && dates->complete == NULL) {
-		if (start_set)
-			write_label_piece (dates->due, buffer, 1024, _(" (Due "), ")");
-		else
-			write_label_piece (dates->due, buffer, 1024, _("Due "), 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.
- * 
- * 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)
-{
-	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);
-
-	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;
-}
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
deleted file mode 100644
index 4e8e344731..0000000000
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ /dev/null
@@ -1,35 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 "comp-editor-page.h"
-
-void comp_editor_dates (CompEditorPageDates *date, CalComponent *comp);
-void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label);
-
-GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time);
-
-struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
-
-#endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
deleted file mode 100644
index 5f2e315890..0000000000
--- a/calendar/gui/dialogs/comp-editor.c
+++ /dev/null
@@ -1,1059 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gnome.h>
-#include <bonobo/bonobo-win.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.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;
-
-	/* Toplevel window for the dialog */
-	GtkWidget *window;
-	BonoboUIComponent *uic;
-	
-	/* Notebook to hold the pages */
-	GtkNotebook *notebook;
-
-	GtkWidget *filesel;
-	
-	gboolean changed;
-	gboolean needs_send;
-	gboolean updating;
-};
-
-
-
-static void comp_editor_class_init (CompEditorClass *class);
-static void comp_editor_init (CompEditor *editor);
-static void comp_editor_destroy (GtkObject *object);
-
-static void real_edit_comp (CompEditor *editor, CalComponent *comp);
-static void save_comp (CompEditor *editor);
-static void delete_comp (CompEditor *editor);
-static void close_dialog (CompEditor *editor);
-
-static void page_changed_cb (GtkWidget *widget, gpointer data);
-static void page_needs_send_cb (GtkWidget *widget, gpointer data);
-static void page_summary_changed_cb (GtkWidget *widget, const char *summary, gpointer data);
-static void page_dates_changed_cb (GtkWidget *widget, 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_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/FilePrint",			"print.xpm"),
-	E_PIXMAP ("/menu/File/FilePrintPreview",		"print-preview.xpm"),
-
-	E_PIXMAP ("/Toolbar/FilePrint",			        "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/FilePrintPreview",		        "print-preview.xpm"),
-
-	E_PIXMAP_END
-};
-
-static BonoboUIVerb verbs [] = {
-	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
-};
-
-#define CLASS(page) (COMP_EDITOR_CLASS (GTK_OBJECT (page)->klass))
-
-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 (GTK_TYPE_OBJECT,
-						    &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;
-
-	object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	klass->edit_comp = real_edit_comp;
-
-	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 */
-	priv->window = bonobo_window_new ("event-editor", "iCalendar Editor");
-	gtk_signal_connect (GTK_OBJECT (priv->window), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), editor);
-
-	priv->uic = bonobo_ui_component_new ("comp-editor");
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->window));
-	bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container));
-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (priv->window)),
-					  "/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 (priv->window), 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;
-}
-
-/* Destroy handler for the calendar component editor */
-static void
-comp_editor_destroy (GtkObject *object)
-{
-	CompEditor *editor;
-	CompEditorPrivate *priv;
-
-	editor = COMP_EDITOR (object);
-	priv = editor->priv;
-
-	if (priv->window) {
-		gtk_widget_destroy (priv->window);
-		priv->window = NULL;
-	}
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor);
-	
-	g_free (priv);
-	editor->priv = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/**
- * 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), "needs_send",
-			    GTK_SIGNAL_FUNC (page_needs_send_cb), editor);
-	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);
-
-	/* 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);
-	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)
-{
-	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);
-}
-
-/**
- * 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;
-}
-
-/* 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 (priv->window), title);
-	g_free (title);
-}
-
-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_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);
-
-	set_title_from_comp (editor);
-	fill_widgets (editor);	
-}
-
-	
-/**
- * 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);
-	for (l = priv->pages; l != NULL; l = l->next)
-		comp_editor_page_fill_component (l->data, comp);
-
-	return comp;
-}
-
-/**
- * comp_editor_save_comp:
- * @editor: 
- * 
- * 
- **/
-void
-comp_editor_save_comp (CompEditor *editor)
-{
-	save_comp (editor);
-}
-
-/**
- * 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)
-{
-	CalComponent *comp;
-
-	comp = comp_editor_get_current_comp (editor);
-
-	cal_component_commit_sequence (comp);
-	itip_send_comp (method, comp);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/**
- * comp_editor_merge_ui:
- * @editor: 
- * @filename: 
- * @verbs: 
- * 
- * 
- **/
-void
-comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *verbs)
-{
-	CompEditorPrivate *priv;
-	BonoboUIEngine *engine;
-	BonoboUINode *node;
-	
-	g_return_if_fail (editor != NULL);
-	g_return_if_fail (IS_COMP_EDITOR (editor));
-	
-	priv = editor->priv;
-
-	engine = bonobo_window_get_ui_engine (BONOBO_WINDOW (priv->window));
-	node = bonobo_ui_util_new_ui (priv->uic, filename, "",
-				      "evolution-calendar");
-	g_assert (node != NULL);
-
-	bonobo_ui_engine_xml_merge_tree (engine, "/", node, "comp-editor");
-	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 (priv->window);
-	raise_and_focus (priv->window);
-}
-
-static void
-save_comp (CompEditor *editor) 
-{
-	CompEditorPrivate *priv;
-	GList *l;
-	
-	priv = editor->priv;
-	
-	for (l = priv->pages; l != NULL; l = l->next)
-		comp_editor_page_fill_component (l->data, priv->comp);
-
-	if (priv->needs_send && send_component_dialog (priv->comp)) {
-		cal_component_commit_sequence (priv->comp);
-		itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, priv->comp);
-	}
-	
-	priv->updating = TRUE;
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_comp (): Could not update the object!");
-	else
-		priv->changed = FALSE;
-
-	priv->updating = FALSE;
-}
-
-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)
-{
-	CompEditorPrivate *priv;
-	
-	priv = editor->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	switch (save_component_dialog (GTK_WINDOW (priv->window))) {
-	case 0: /* Save */
-		/* FIXME: If an error occurs here, we should popup a dialog
-		   and then return FALSE. */
-		save_comp (editor);
-		return TRUE;
-	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;
-	GList *l;
-	
-	priv = editor->priv;
-
-	g_assert (priv->window != NULL);
-
-	for (l = priv->pages; l != NULL; l = l->next)
-		gtk_object_unref (GTK_OBJECT (l->data));
-
-	gtk_object_destroy (GTK_OBJECT (editor));
-}
-
-/* Menu Commands */
-static void
-save_close_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-
-	save_comp (editor);
-	close_dialog (editor);
-}
-
-static void
-save_as_ok (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	struct stat s;
-	char *path;
-	int ret = 0;
-	
-	priv = editor->priv;
-	
-	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (priv->filesel));
-	
-	if (stat (path, &s) == 0) {
-		GtkWidget *dlg;
-		GtkWidget *text;
-		
-		dlg = gnome_dialog_new (_("Overwrite file?"),
-					GNOME_STOCK_BUTTON_YES, 
-					GNOME_STOCK_BUTTON_NO,
-					NULL);
-		text = gtk_label_new (_("A file by that name already exists.\nOverwrite it?"));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), text, TRUE, TRUE, 4);
-		gtk_window_set_policy (GTK_WINDOW (dlg), FALSE, TRUE, FALSE);
-		gtk_widget_show (text);
-		
-		ret = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-	}
-	
-	if (ret == 0) {
-		FILE *file;
-		gchar *ical_string;
-
-		icalcomponent *top_level;
-		icalcomponent *icalcomp;
-		icalproperty *prop;
-
-		top_level = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-
-		/* RFC 2445, section 4.7.1 */
-		prop = icalproperty_new_calscale ("GREGORIAN");
-		icalcomponent_add_property (top_level, prop);
-		
-		/* RFC 2445, section 4.7.3 */
-		prop = icalproperty_new_prodid ("-//Ximian//NONSGML Evolution Calendar//EN");
-		icalcomponent_add_property (top_level, 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 (top_level, prop);
-				
-		icalcomp = cal_component_get_icalcomponent (priv->comp);
-		g_assert (icalcomp != NULL);
-
-		icalcomponent_add_component (top_level, icalcomp);
-		
-		ical_string = icalcomponent_as_ical_string (top_level);
-
-		file = fopen (path, "w");
-		if (file == NULL) {			
-			g_warning ("Couldn't save item");
-			gtk_main_quit ();
-			return;
-		}
-		
-		fprintf (file, ical_string);
-		fclose (file);
-
-		gtk_main_quit ();
-	}
-}
-
-static void
-save_as_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	GtkFileSelection *fs;
-	char *path;
-	
-	priv = editor->priv;
-	
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save As...")));
-	path = g_strdup_printf ("%s/", g_get_home_dir ());
-	gtk_file_selection_set_filename (fs, path);
-	g_free (path);
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked", 
-			    GTK_SIGNAL_FUNC (save_as_ok), editor);
-	gtk_signal_connect (GTK_OBJECT (fs->cancel_button), "clicked", 
-			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-	
-	priv->filesel = GTK_WIDGET (fs);
-	gtk_widget_show (priv->filesel);
-	gtk_grab_add (priv->filesel);
-	gtk_main ();
-
-	gtk_widget_destroy (priv->filesel);
-	priv->filesel = NULL;
-}
-
-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, 1, vtype, priv->window))
-		delete_comp (editor);
-}
-
-static void
-print_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (editor);
-	print_comp (comp, FALSE);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-static void
-print_preview_cmd (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (editor);
-	print_comp (comp, 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);
-
-	if (prompt_to_save_changes (editor))
-		close_dialog (editor);
-}
-
-static void
-page_changed_cb (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	
-	priv = editor->priv;
-	
-	priv->changed = TRUE;
-}
-
-static void
-page_needs_send_cb (GtkWidget *widget, gpointer data)
-{
-	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	
-	priv = editor->priv;
-	
-	priv->needs_send = TRUE;	
-}
-
-/* Page signal callbacks */
-static void
-page_summary_changed_cb (GtkWidget *widget, 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)
-		comp_editor_page_set_summary (l->data, summary);
-	
-	priv->changed = TRUE;
-}
-
-static void
-page_dates_changed_cb (GtkWidget *widget,
-		       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)
-		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))
-		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 12cfa64031..0000000000
--- a/calendar/gui/dialogs/comp-editor.h
+++ /dev/null
@@ -1,90 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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-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 {
-	GtkObject object;
-
-	/* Private data */
-	CompEditorPrivate *priv;
-} CompEditor;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Virtual functions */
-	void (* edit_comp) (CompEditor *page, CalComponent *comp);
-} CompEditorClass;
-
-GtkType       comp_editor_get_type         (void);
-CompEditor   *comp_editor_new              (void);
-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);
-void          comp_editor_save_comp        (CompEditor             *editor);
-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 a5ba1162db..0000000000
--- a/calendar/gui/dialogs/delete-comp.c
+++ /dev/null
@@ -1,148 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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.
- * @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.
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-delete_component_dialog (CalComponent *comp,
-			 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 (comp) {
-		CalComponentText summary;
-		char *tmp;
-
-		vtype = cal_component_get_vtype (comp);
-		cal_component_get_summary (comp, &summary);
-
-		tmp = e_utf8_to_gtk_string (widget, summary.value);
-
-		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 = gnome_question_dialog_modal (str, NULL, NULL);
-	g_free (str);
-
-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
-		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 3b728a3f7e..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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,
-				  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 beb93d5dc8..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ /dev/null
@@ -1,351 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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)
-{
-	EDelegateDialogPrivate *priv;
-	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);
-
-
-	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 (void)
-{
-	EDelegateDialog *edd;
-
-	edd = E_DELEGATE_DIALOG (gtk_type_new (E_TYPE_DELEGATE_DIALOG));
-	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd));
-}
-
-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), "text", &string, NULL);
-	destv = e_destination_importv (string);
-	
-	g_message ("importv: [%s]", 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), "text", &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);
-}
-
-void
-e_delegate_dialog_set_delegate		(EDelegateDialog  *edd,
-					 const char *address)
-{
-	EDelegateDialogPrivate *priv;
-
-	g_return_if_fail (edd != NULL);
-	g_return_if_fail (E_IS_DELEGATE_DIALOG (edd));
-
-	priv = edd->priv;
-
-	if (priv->address)
-		g_free (priv->address);
-
-	priv->address = g_strdup (address);
-}
-
-
-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 971751828b..0000000000
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ /dev/null
@@ -1,70 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-EDelegateDialog* e_delegate_dialog_new			(void);
-
-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/e-timezone-dialog.c b/calendar/gui/dialogs/e-timezone-dialog.c
deleted file mode 100644
index 1379470707..0000000000
--- a/calendar/gui/dialogs/e-timezone-dialog.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Timezone 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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-timezone-dialog.h"
-
-#define E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA 0xc070a0ff
-#define E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA 0xffff60ff
-#define E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA 0xff60e0ff
-#define E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA 0x000000ff
-
-struct _ETimezoneDialogPrivate {
-	/* The TZID of the timezone. May be NULL for a 'local time' (i.e. when
-	   the displayed name is "") or for builtin timezones which we haven't
-	   loaded yet. */
-	char *tzid;
-
-	/* Glade XML data */
-	GladeXML *xml;
-
-	EMapPoint *point_selected;
-	EMapPoint *point_hover;
-
-	EMap *map;
-
-	/* The timeout used to flash the nearest point. */
-	guint timeout_id;
-
-	/* Widgets from the Glade file */
-	GtkWidget *app;
-	GtkWidget *map_window;
-	GtkWidget *timezone_preview;
-	GtkWidget *timezone_combo;
-};
-
-
-static void e_timezone_dialog_class_init	(ETimezoneDialogClass *class);
-static void e_timezone_dialog_init		(ETimezoneDialog      *etd);
-static void e_timezone_dialog_destroy		(GtkObject	*object);
-
-static gboolean get_widgets			(ETimezoneDialog *etd);
-static gboolean on_map_timeout			(gpointer	 data);
-static gboolean on_map_motion			(GtkWidget	*widget,
-						 GdkEventMotion *event,
-						 gpointer	 data);
-static gboolean on_map_leave			(GtkWidget	*widget,
-						 GdkEventCrossing *event,
-						 gpointer	 data);
-static gboolean on_map_visibility_changed	(GtkWidget	*w,
-						 GdkEventVisibility *event,
-						 gpointer	 data);
-static gboolean on_map_button_pressed		(GtkWidget	*w,
-						 GdkEventButton *event,
-						 gpointer	 data);
-
-static char*	get_zone_from_point		(ETimezoneDialog *etd,
-						 EMapPoint	*point);
-static void	find_selected_point		(ETimezoneDialog *etd);
-static void	on_combo_changed		(GtkEditable	*entry,
-						 ETimezoneDialog *etd);
-
-
-static GtkObjectClass *parent_class;
-
-
-GtkType
-e_timezone_dialog_get_type (void)
-{
-	static GtkType e_timezone_dialog_type = 0;
-
-	if (!e_timezone_dialog_type) {
-		static const GtkTypeInfo e_timezone_dialog_info = {
-			"ETimezoneDialog",
-			sizeof (ETimezoneDialog),
-			sizeof (ETimezoneDialogClass),
-			(GtkClassInitFunc) e_timezone_dialog_class_init,
-			(GtkObjectInitFunc) e_timezone_dialog_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_timezone_dialog_type = gtk_type_unique (GTK_TYPE_OBJECT,
-							  &e_timezone_dialog_info);
-	}
-
-	return e_timezone_dialog_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-e_timezone_dialog_class_init (ETimezoneDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = e_timezone_dialog_destroy;
-}
-
-/* Object initialization function for the event editor */
-static void
-e_timezone_dialog_init (ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-
-	priv = g_new0 (ETimezoneDialogPrivate, 1);
-	etd->priv = priv;
-
-	priv->tzid = NULL;
-	priv->point_selected = NULL;
-	priv->point_hover = NULL;
-	priv->timeout_id = 0;
-}
-
-/* Destroy handler for the event editor */
-static void
-e_timezone_dialog_destroy (GtkObject *object)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-	GtkWidget *dialog;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TIMEZONE_DIALOG (object));
-
-	etd = E_TIMEZONE_DIALOG (object);
-	priv = etd->priv;
-
-	/* Destroy the actual dialog. */
-	dialog = e_timezone_dialog_get_toplevel (etd);
-	gtk_widget_destroy (dialog);
-
-	g_free (priv->tzid);
-	priv->tzid = NULL;
-
-	if (priv->timeout_id) {
-		g_source_remove (priv->timeout_id);
-		priv->timeout_id = 0;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	etd->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-e_timezone_dialog_add_timezones (ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-	icalarray *zones;
-	GtkWidget *listitem;
-	GtkCombo *combo;
-	int i;
-
-	priv = etd->priv;
-
-	combo = GTK_COMBO (priv->timezone_combo);
-
-	/* Clear any existing items in the combo. */
-	gtk_list_clear_items (GTK_LIST (combo->list), 0, -1);
-
-	/* Put the "None" and "UTC" entries at the top of the combo's list.
-	   When "None" is selected we want the field to be cleared. */
-	listitem = gtk_list_item_new_with_label (_("None"));
-	gtk_combo_set_item_string (combo, GTK_ITEM (listitem), "");
-	gtk_widget_show (listitem);
-	gtk_container_add (GTK_CONTAINER (combo->list), listitem);
-
-	/* Note: We don't translate timezone names at the moment. */
-	listitem = gtk_list_item_new_with_label ("UTC");
-	gtk_widget_show (listitem);
-	gtk_container_add (GTK_CONTAINER (combo->list), listitem);
-
-	/* Get the array of builtin timezones. */
-	zones = icaltimezone_get_builtin_timezones ();
-
-	for (i = 0; i < zones->num_elements; i++) {
-		icaltimezone *zone;
-		char *location;
-
-		zone = icalarray_element_at (zones, i);
-
-		location = icaltimezone_get_location (zone);
-
-		e_map_add_point (priv->map, location,
-				 icaltimezone_get_longitude (zone),
-				 icaltimezone_get_latitude (zone),
-				 E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
-
-		listitem = gtk_list_item_new_with_label (location);
-		gtk_widget_show (listitem);
-		gtk_container_add (GTK_CONTAINER (combo->list), listitem);
-	}
-}
-
-
-ETimezoneDialog *
-e_timezone_dialog_construct (ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-	GtkWidget *map;
-
-	g_return_val_if_fail (etd != NULL, NULL);
-	g_return_val_if_fail (E_IS_TIMEZONE_DIALOG (etd), NULL);
-
-	priv = etd->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-timezone-dialog.glade",
-				   NULL);
-	if (!priv->xml) {
-		g_message ("e_timezone_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (etd)) {
-		g_message ("e_timezone_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	map = GTK_WIDGET (e_map_new ());
-	priv->map = E_MAP (map);
-	gtk_widget_set_events (map, gtk_widget_get_events (map)
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_VISIBILITY_NOTIFY_MASK);
-
-	gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry), FALSE);
-
-	e_timezone_dialog_add_timezones (etd);
-
-	gtk_container_add (GTK_CONTAINER (priv->map_window), map);
-	gtk_widget_show (map);
-
-        gtk_signal_connect (GTK_OBJECT (map), "motion-notify-event",
-			    GTK_SIGNAL_FUNC (on_map_motion), etd);
-        gtk_signal_connect (GTK_OBJECT (map), "leave-notify-event",
-			    GTK_SIGNAL_FUNC (on_map_leave), etd);
-        gtk_signal_connect (GTK_OBJECT (map), "visibility-notify-event",
-			    GTK_SIGNAL_FUNC (on_map_visibility_changed), etd);
-	gtk_signal_connect (GTK_OBJECT (map), "button-press-event",
-			    GTK_SIGNAL_FUNC (on_map_button_pressed), etd);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv->timezone_combo)->entry), "changed", 
-			    GTK_SIGNAL_FUNC (on_combo_changed), etd);
-
-	return etd;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (etd));
-	return NULL;
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-
-	priv = etd->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app		= GW ("timezone-dialog");
-	priv->map_window	= GW ("map-window");
-	priv->timezone_combo	= GW ("timezone-combo");
-	priv->timezone_preview	= GW ("timezone-preview");
-
-	return (priv->app
-		&& priv->map_window
-		&& priv->timezone_combo
-		&& priv->timezone_preview);
-}
-
-
-/**
- * e_timezone_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.
- **/
-ETimezoneDialog *
-e_timezone_dialog_new (void)
-{
-	ETimezoneDialog *etd;
-
-	etd = E_TIMEZONE_DIALOG (gtk_type_new (E_TYPE_TIMEZONE_DIALOG));
-	return e_timezone_dialog_construct (E_TIMEZONE_DIALOG (etd));
-}
-
-
-
-/* This flashes the currently selected timezone in the map. */
-static gboolean
-on_map_timeout (gpointer data)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-
-	etd = E_TIMEZONE_DIALOG (data);
-	priv = etd->priv;
-
-	if (!priv->point_selected)
-		return TRUE;
-
-        if (e_map_point_get_color_rgba (priv->point_selected)
-	    == E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA)
-	        e_map_point_set_color_rgba (priv->map, priv->point_selected,
-					    E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA);
-	else
-	        e_map_point_set_color_rgba (priv->map, priv->point_selected,
-					    E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA);
-
-	return TRUE;
-}
-
-
-static gboolean
-on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-	double longitude, latitude;
-	char *old_zone, *new_zone;
-
-	etd = E_TIMEZONE_DIALOG (data);
-	priv = etd->priv;
-
-	e_map_window_to_world (priv->map, (double) event->x, (double) event->y,
-			       &longitude, &latitude);
-
-	if (priv->point_hover && priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
-					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
-
-	priv->point_hover = e_map_get_closest_point (priv->map, longitude,
-						     latitude, TRUE);
-
-	if (priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
-					    E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA);
-
-	gtk_label_get (GTK_LABEL (priv->timezone_preview), &old_zone);
-	new_zone = get_zone_from_point (etd, priv->point_hover);
-	if (strcmp (old_zone, new_zone))
-		gtk_label_set_text (GTK_LABEL (priv->timezone_preview),
-				    new_zone);
-
-	return TRUE;
-}
-
-
-static gboolean
-on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-	char *old_zone;
-
-	etd = E_TIMEZONE_DIALOG (data);
-	priv = etd->priv;
-
-	/* We only want to reset the hover point and the preview text if this
-	   is a normal leave event. For some reason we are getting leave events
-	   when the button is pressed in the map, which causes problems. */
-	if (event->mode != GDK_CROSSING_NORMAL)
-		return FALSE;
-
-	if (priv->point_hover && priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
-					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
-
-	priv->point_hover = NULL;
-
-	/* Clear the timezone preview label, if it isn't already empty. */
-	gtk_label_get (GTK_LABEL (priv->timezone_preview), &old_zone);
-	if (strcmp (old_zone, ""))
-		gtk_label_set_text (GTK_LABEL (priv->timezone_preview), "");
-
-	return FALSE;
-}
-
-
-static gboolean
-on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event,
-			   gpointer data)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-	
-	etd = E_TIMEZONE_DIALOG (data);
-	priv = etd->priv;
-
-	if (event->state != GDK_VISIBILITY_FULLY_OBSCURED) {
-		/* Map is visible, at least partly, so make sure we flash the
-		   selected point. */
-		if (!priv->timeout_id)
-			priv->timeout_id = gtk_timeout_add (100, on_map_timeout, etd);
-	} else {
-		/* Map is invisible, so don't waste resources on the timeout.*/
-		if (priv->timeout_id) {
-			g_source_remove (priv->timeout_id);
-			priv->timeout_id = 0;
-		}
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
-{
-	ETimezoneDialog *etd;
-	ETimezoneDialogPrivate *priv;
-	double longitude, latitude;
-	char *location;
-	
-	etd = E_TIMEZONE_DIALOG (data);
-	priv = etd->priv;
-
-	e_map_window_to_world (priv->map, (double) event->x, (double) event->y,
-			       &longitude, &latitude);
-	
-	if (event->button != 1) {
-	        e_map_zoom_out (priv->map);
-	} else {
-		if (e_map_get_magnification (priv->map) <= 1.0)
-		        e_map_zoom_to_location (priv->map, longitude,
-						latitude);
-	
-		if (priv->point_selected)
-		        e_map_point_set_color_rgba (priv->map,
-						    priv->point_selected,
-						    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
-		priv->point_selected = priv->point_hover;
-		
-		location = get_zone_from_point (etd, priv->point_selected);
-		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
-				    location);
-
-		g_free (priv->tzid);
-		priv->tzid = NULL;
-	}
-	
-	return TRUE;
-}
-
-
-static char*
-get_zone_from_point (ETimezoneDialog *etd,
-		     EMapPoint *point)
-{
-	ETimezoneDialogPrivate *priv;
-	icalarray *zones;
-	double longitude, latitude;
-	int i;
-
-	priv = etd->priv;
-
-	if (point == NULL)
-		return "";
-
-	e_map_point_get_location (point, &longitude, &latitude);
-
-	/* Get the array of builtin timezones. */
-	zones = icaltimezone_get_builtin_timezones ();
-
-	for (i = 0; i < zones->num_elements; i++) {
-		icaltimezone *zone;
-		double zone_longitude, zone_latitude;
-
-		zone = icalarray_element_at (zones, i);
-		zone_longitude = icaltimezone_get_longitude (zone);
-		zone_latitude = icaltimezone_get_latitude (zone);
-
-		if (zone_longitude - 0.005 <= longitude &&
-		    zone_longitude + 0.005 >= longitude &&
-		    zone_latitude - 0.005 <= latitude &&
-		    zone_latitude + 0.005 >= latitude)
-		{
-			return icaltimezone_get_location (zone);
-		}
-	}
-
-	g_assert_not_reached ();
-
-	return NULL;
-}
-
-
-/* Returns the TZID of the timezone set, and optionally its displayed name.
-   The TZID may be NULL, in which case the builtin timezone with the city name
-   of display_name should be used. If display_name is also NULL or "", then it
-   is assumed to be a 'local time'. */
-char*
-e_timezone_dialog_get_timezone		(ETimezoneDialog  *etd,
-					 char		 **display_name)
-{
-	ETimezoneDialogPrivate *priv;
-
-	g_return_val_if_fail (etd != NULL, NULL);
-	g_return_val_if_fail (E_IS_TIMEZONE_DIALOG (etd), NULL);
-
-	priv = etd->priv;
-
-	if (display_name)
-		*display_name = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry));
-
-	return priv->tzid;
-}
-
-
-/* Sets the TZID and displayed name of the timezone. The TZID may be NULL for
-   a 'local time' (i.e. display_name is NULL or "") or if it is a builtin
-   timezone which hasn't been loaded yet. (This is done so we don't load
-   timezones until we really need them.) */
-void
-e_timezone_dialog_set_timezone		(ETimezoneDialog  *etd,
-					 char		  *tzid,
-					 char		  *display_name)
-{
-	ETimezoneDialogPrivate *priv;
-
-	g_return_if_fail (etd != NULL);
-	g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd));
-
-	priv = etd->priv;
-
-	if (priv->tzid)
-		g_free (priv->tzid);
-
-	priv->tzid = g_strdup (tzid);
-
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
-			    display_name ? display_name : "");
-
-	find_selected_point (etd);
-}
-
-
-GtkWidget*
-e_timezone_dialog_get_toplevel	(ETimezoneDialog  *etd)
-{
-	ETimezoneDialogPrivate *priv;
-
-	g_return_val_if_fail (etd != NULL, NULL);
-	g_return_val_if_fail (E_IS_TIMEZONE_DIALOG (etd), NULL);
-
-	priv = etd->priv;
-
-	return priv->app;
-}
-
-
-/* This tries to find the timezone corresponding to the text in the combo,
-   and selects the point so that it flashes. */
-static void
-find_selected_point (ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-	icalarray *zones;
-	char *current_zone;
-	EMapPoint *point = NULL;
-	int i;
-
-	priv = etd->priv;
-
-	current_zone = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry));
-
-	/* Get the array of builtin timezones. */
-	zones = icaltimezone_get_builtin_timezones ();
-
-	for (i = 0; i < zones->num_elements; i++) {
-		icaltimezone *zone;
-		char *location;
-
-		zone = icalarray_element_at (zones, i);
-
-		location = icaltimezone_get_location (zone);
-
-		if (!strcmp (current_zone, location)) {
-			double zone_longitude, zone_latitude;
-
-			zone_longitude = icaltimezone_get_longitude (zone);
-			zone_latitude = icaltimezone_get_latitude (zone);
-
-			point = e_map_get_closest_point (priv->map,
-							 zone_longitude,
-							 zone_latitude,
-							 FALSE);
-			break;
-		}
-	}
-
-	if (priv->point_selected)
-		e_map_point_set_color_rgba (priv->map, priv->point_selected,
-					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
-
-	priv->point_selected = point;
-}
-
-
-static void
-on_combo_changed (GtkEditable *entry, ETimezoneDialog *etd)
-{
-	ETimezoneDialogPrivate *priv;
-
-	priv = etd->priv;
-
-	find_selected_point (etd);
-
-	g_free (priv->tzid);
-	priv->tzid = NULL;
-}
diff --git a/calendar/gui/dialogs/e-timezone-dialog.glade b/calendar/gui/dialogs/e-timezone-dialog.glade
deleted file mode 100644
index 15254056c7..0000000000
--- a/calendar/gui/dialogs/e-timezone-dialog.glade
+++ /dev/null
@@ -1,264 +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>timezone-dialog</name>
-  <visible>False</visible>
-  <title>Select a Time Zone</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>500</default_width>
-  <default_height>400</default_height>
-  <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>GtkTable</class>
-      <name>table1</name>
-      <rows>3</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>4</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Use the left mouse button to zoom in on an area of the map and select a time zone.
- Use the right mouse button to zoom out.</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>2</ypad>
-	  <xexpand>True</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>Time Zones</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>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>GtkVBox</class>
-	  <name>vbox1</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>map-window</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>Placeholder</class>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox2</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>timezone-preview</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>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>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>label3</name>
-	  <label>Selection:</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>GtkCombo</class>
-	  <name>timezone-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></items>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>combo-entry1</name>
-	    <can_focus>True</can_focus>
-	    <editable>False</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/e-timezone-dialog.h b/calendar/gui/dialogs/e-timezone-dialog.h
deleted file mode 100644
index 4f6f9dd934..0000000000
--- a/calendar/gui/dialogs/e-timezone-dialog.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Evolution calendar - Timezone 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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_TIMEZONE_DIALOG_H__
-#define __E_TIMEZONE_DIALOG_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-
-
-
-#define E_TYPE_TIMEZONE_DIALOG       (e_timezone_dialog_get_type ())
-#define E_TIMEZONE_DIALOG(obj)       (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialog))
-#define E_TIMEZONE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_DIALOG,	\
-				      ETimezoneDialogClass))
-#define E_IS_TIMEZONE_DIALOG(obj)    (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG))
-#define E_IS_TIMEZONE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG))
-
-
-typedef struct _ETimezoneDialog		ETimezoneDialog;
-typedef struct _ETimezoneDialogClass	ETimezoneDialogClass;
-typedef struct _ETimezoneDialogPrivate	ETimezoneDialogPrivate;
-
-struct _ETimezoneDialog {
-	GtkObject object;
-
-	/* Private data */
-	ETimezoneDialogPrivate *priv;
-};
-
-struct _ETimezoneDialogClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType		 e_timezone_dialog_get_type		(void);
-ETimezoneDialog* e_timezone_dialog_construct		(ETimezoneDialog  *etd);
-
-ETimezoneDialog* e_timezone_dialog_new			(void);
-
-/* Returns the TZID of the timezone set, and optionally its displayed name.
-   The TZID may be NULL, in which case the builtin timezone with the city name
-   of display_name should be used. If display_name is also NULL or "", then it
-   is assumed to be a 'local time'. */
-char*		 e_timezone_dialog_get_timezone		(ETimezoneDialog  *etd,
-							 char		 **display_name);
-
-/* Sets the TZID and displayed name of the timezone. The TZID may be NULL for
-   a 'local time' (i.e. display_name is NULL or "") or if it is a builtin
-   timezone which hasn't been loaded yet. (This is done so we don't load
-   timezones until we really need them.) */
-void		 e_timezone_dialog_set_timezone		(ETimezoneDialog  *etd,
-							 char		  *tzid,
-							 char		  *display_name);
-
-GtkWidget*	 e_timezone_dialog_get_toplevel		(ETimezoneDialog  *etd);
-
-
-
-#endif /* __E_TIMEZONE_DIALOG_H__ */
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
deleted file mode 100644
index 59c587b18b..0000000000
--- a/calendar/gui/dialogs/event-editor.c
+++ /dev/null
@@ -1,285 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cancel-comp.h"
-#include "event-editor.h"
-
-struct _EventEditorPrivate {
-	EventPage *event_page;
-	AlarmPage *alarm_page;
-	RecurrencePage *recur_page;
-	MeetingPage *meet_page;
-	
-	gboolean meeting_shown;
-};
-
-
-
-static void event_editor_class_init (EventEditorClass *class);
-static void event_editor_init (EventEditor *ee);
-static void event_editor_edit_comp (CompEditor *editor, CalComponent *comp);
-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 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->edit_comp = event_editor_edit_comp;
-	
-	object_class->destroy = event_editor_destroy;
-}
-
-static void
-set_menu_sens (EventEditor *ee) 
-{
-	EventEditorPrivate *priv;
-	
-	priv = ee->priv;
-
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionScheduleMeeting", 
-				 "sensitive", priv->meeting_shown ? "0" : "1");
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionRefreshMeeting", 
-				 "sensitive", priv->meeting_shown ? "1" : "0");
-	comp_editor_set_ui_prop (COMP_EDITOR (ee), 
-				 "/commands/ActionCancelMeeting", 
-				 "sensitive", priv->meeting_shown ? "1" : "0");
-}
-
-/* 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->meet_page = meeting_page_new ();
-	comp_editor_append_page (COMP_EDITOR (ee),
-				 COMP_EDITOR_PAGE (priv->meet_page),
-				 _("Meeting"));
-
- 	comp_editor_merge_ui (COMP_EDITOR (ee), EVOLUTION_DATADIR 
- 			      "/gnome/ui/evolution-event-editor.xml",
- 			      verbs);
-	
-	priv->meeting_shown = TRUE;
-	set_menu_sens (ee);
-}
-
-static void
-event_editor_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	GSList *attendees = NULL;
-	
-	ee = EVENT_EDITOR (editor);
-	priv = ee->priv;
-	
-	cal_component_get_attendee_list (comp, &attendees);
-	if (attendees == NULL) {
-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		priv->meeting_shown = FALSE;
-		set_menu_sens (ee);
-	}
-	cal_component_free_attendee_list (attendees);
-		
-	if (parent_class->edit_comp)
-		parent_class->edit_comp (editor, comp);
-}
-
-/* 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));
-
-	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
-schedule_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	if (!priv->meeting_shown) {
-		comp_editor_append_page (COMP_EDITOR (ee),
-					 COMP_EDITOR_PAGE (priv->meet_page),
-					 _("Meeting"));
-		priv->meeting_shown = TRUE;
-		set_menu_sens (ee);
-	}
-	
-	comp_editor_show_page (COMP_EDITOR (ee),
-			       COMP_EDITOR_PAGE (priv->meet_page));
-}
-
-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);
-	
-	comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_PUBLISH);
-}
-
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
deleted file mode 100644
index 8ab343521c..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-
-
-#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 76b5df5b3d..0000000000
--- a/calendar/gui/dialogs/event-page.c
+++ /dev/null
@@ -1,1124 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 *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 *contacts_btn;
-	GtkWidget *contacts;
-
-	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;
-};
-
-
-
-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 void 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->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->contacts_btn = NULL;
-	priv->contacts = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-
-	priv->updating = FALSE;
-	priv->sync_timezones = FALSE;
-}
-
-/* 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->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
-};
-
-/* 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);
-}
-
-/* Checks if the event's time starts and ends at midnight, and sets the 
- *"all day event" box accordingly.
- */
-static void
-check_all_day (EventPage *epage)
-{
-	EventPagePrivate *priv;
-	gboolean all_day = FALSE, start_set, end_set;
-	gint start_hour, start_minute, end_hour, end_minute;
-
-	priv = epage->priv;
-
-	start_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-						 &start_hour, &start_minute);
-
-	end_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-					       &end_hour, &end_minute);
-
-	/* all day event checkbox */
-	if ((!start_set || (start_hour == 0 && start_minute == 0))
-	    && (!end_set || (end_hour == 0 && end_minute == 0)))
-		all_day = TRUE;
-
-	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);
-}
-
-/* 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->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);
-
-	check_all_day (epage);
-
-	/* Classification */
-	e_dialog_radio_set (priv->classification_public,
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-/* 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;
-	CalComponentDateTime start_date, end_date;
-	GSList *l;
-	const char *categories;
-	CalClientGetStatus status;
-	struct icaltimetype *start_tt, *end_tt;
-	icaltimezone *start_zone = NULL, *end_zone = NULL;
-
-	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, 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);
-	}
-	cal_component_free_text_list (l);
-
-	/* Start and end times */
-
-	cal_component_get_dtstart (comp, &start_date);
-
-	/* 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 (page->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 : "");
-	}
-
-	cal_component_get_dtend (comp, &end_date);
-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date.tzid);
-	if (!end_zone) {
-		status = cal_client_get_timezone (page->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 : "");
-	}
-
-	/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb
-	   then the event includes all of the 2nd Feb. We would normally show
-	   3rd Feb as the end date, since it really ends at midnight on 3rd,
-	   so we have to subtract a day so we only show the 2nd. */
-	start_tt = start_date.value;
-	end_tt = end_date.value;
-	if (start_tt->hour == 0 && start_tt->minute == 0 && start_tt->second == 0
-	    && end_tt->hour == 0 && end_tt->minute == 0 && end_tt->second == 0)
-		icaltime_adjust (end_tt, -1, 0, 0, 0);
-
-	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);
-
-	cal_component_free_datetime (&start_date);
-	cal_component_free_datetime (&end_date);
-
-	check_all_day (epage);
-
-	/* Set the timezones, and set sync_timezones to TRUE if both timezones
-	   are the same. */
-	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);
-	priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
-
-
-	/* 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:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-
-	/* Categories */
-	cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the event page */
-static void
-event_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	CalComponentDateTime date;
-	struct icaltimetype icaltime;
-	gboolean all_day_event, date_set;
-	char *cat, *str;
-	CalComponentClassification classif;
-	icaltimezone *zone;
-
-	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);
-
-	/* 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;
-
-	/* FIXME: We should use is_date at some point. */
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	g_assert (date_set);
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-	if (zone)
-		date.tzid = icaltimezone_get_tzid (zone);
-	cal_component_set_dtstart (comp, &date);
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	g_assert (date_set);
-
-	if (all_day_event) {
-		icaltime.hour = 0;
-		icaltime.minute = 0;
-		icaltime.second = 0;
-		icaltime_adjust (&icaltime, 1, 0, 0, 0);
-	}
-
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
-	if (zone)
-	  date.tzid = icaltimezone_get_tzid (zone);
-	cal_component_set_dtend (comp, &date);
-
-
-	/* Categories */
-
-	cat = e_dialog_editable_get (priv->categories);
-	cal_component_set_categories (comp, cat);
-
-	if (cat)
-		g_free (cat);
-
-	/* Classification */
-
-	classif = e_dialog_radio_get (priv->classification_public,
-				      classification_map);
-	cal_component_set_classification (comp, classif);
-}
-
-/* set_summary handler for the event page */
-static void
-event_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-
-	epage = EVENT_PAGE (page);
-	priv = epage->priv;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->summary), epage);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (priv->summary), summary);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->summary), epage);
-}
-
-static void
-event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	/* nothing */
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	priv = epage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("event-page");
-	if (!priv->main)
-		return FALSE;
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("general-summary");
-
-	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->contacts_btn = GW ("contacts-button");
-	priv->contacts = GW ("contacts");
-
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-#undef GW
-
-	return (priv->summary
-		&& 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->contacts_btn
-		&& priv->contacts
-		&& 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 = gtk_editable_get_chars (editable, 0, -1);
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (epage),
-						 summary);
-	g_free (summary);
-}
-
-/* Callback used when the start or end date widgets change.  We check that the
- * start date < end date and we set the "all day event" button as appropriate.
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	EventPage *epage;
-	EventPagePrivate *priv;
-	CompEditorPageDates dates;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
-	int cmp;
-	gboolean date_set;
-	
-	epage = EVENT_PAGE (data);
-	priv = epage->priv;
-
-	if (priv->updating)
-		return;
-
-	/* Ensure that start < end */
-	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);
-
-	/* FIXME: TIMEZONES. */
-	cmp = icaltime_compare (start_tt, end_tt);
-	if (cmp >= 0) {
-		if (cmp == 0 && start_tt.hour == 0
-		    && start_tt.minute == 0
-		    && start_tt.second == 0) {
-			/* If the start and end times are the same, but both
-			 * are on day boundaries, then that is OK since it 
-			 * means we have an all-day event lasting 1 day.  So
-			 * we do nothing here.
-			 */
-		} else if (GTK_WIDGET (dedit) == priv->start_time) {
-			/* Modify the end time, to be the start + 1 hour. */
-
-			/* FIXME: TIMEZONES - Probably want to leave the
-			   timezone as it is, so we need to convert the time.*/
-
-			end_tt = start_tt;
-			icaltime_adjust (&end_tt, 0, 1, 0, 0);
-
-			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);
-		} else if (GTK_WIDGET (dedit) == priv->end_time) {
-			/* Modify the start time, to be the end - 1 hour. */
-
-			/* FIXME: TIMEZONES - Probably want to leave the
-			   timezone as it is, so we need to convert the time.*/
-
-			start_tt = end_tt;
-			icaltime_adjust (&start_tt, 0, -1, 0, 0);
-
-			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);
-		} else
-			g_assert_not_reached ();
-	}
-
-	/* Set the "all day event" button as appropriate */
-	check_all_day (epage);
-
-	/* Notify upstream */
-	dates.start = &start_tt;
-	dates.end = &end_tt;
-	dates.due = NULL;
-	dates.complete = NULL;
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (epage),
-					       &dates);
-}
-
-/* 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));
-		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone);
-	}
-}
-
-
-/* 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;
-}
-
-/* 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;
-	CompEditorPageDates dates;
-	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 do not round it down to the previous
-	 * day, since if we do that and the user repeatedly turns the
-	 * all_day toggle on and off, the event keeps shrinking.
-	 * (We'd also need to make sure we didn't adjust the time when
-	 * the radio button is initially set.)
-	 *
-	 * When the all_day_toggle is turned off, we set the event start to the
-	 * start of the working day, and if the event end is on or before the
-	 * day of the event start we set it to one hour after the event start.
-	 */
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	/*
-	 * Start time.
-	 */
-	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);
-
-	if (all_day) {
-		/* Round down to the start of the day. */
-		start_tt.hour = 0;
-		start_tt.minute  = 0;
-		start_tt.second  = 0;
-	} else {
-		/* Set to the start of the working day. */
-		start_tt.hour = calendar_config_get_day_start_hour ();
-		start_tt.minute  = calendar_config_get_day_start_minute ();
-		start_tt.second  = 0;
-	}
-
-	/*
-	 * End time.
-	 */
-	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. */
-		end_tt.hour = 0;
-		end_tt.minute  = 0;
-		end_tt.second  = 0;
-	} else {
-		/* If the event end is now on or before the event start day,
-		 * make it end one hour after the start. */
-		if (end_tt.year < start_tt.year
-		    || (end_tt.year == start_tt.year
-			&& end_tt.month < start_tt.month)
-		    || (end_tt.year == start_tt.year
-			&& end_tt.month == start_tt.month
-			&& end_tt.day <= start_tt.day)) {
-			end_tt.year = start_tt.year;
-			end_tt.month = start_tt.month;
-			end_tt.day = start_tt.day;
-			end_tt.hour = start_tt.hour;
-			icaltime_adjust (&end_tt, 0, 1, 0, 0);
-		}
-	}
-
-	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);
-
-	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);
-
-	/* Notify upstream */
-	dates.start = &start_tt;
-	dates.end = &end_tt;
-	dates.due = NULL;
-	dates.complete = NULL;
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (epage),
-					       &dates);
-}
-
-/* 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 void
-init_widgets (EventPage *epage)
-{
-	EventPagePrivate *priv;
-
-	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);
-
-	/* 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);
-
-	/* 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->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->categories), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
-
-	/* FIXME: we do not support these fields yet, so we disable them */
-
-	gtk_widget_set_sensitive (priv->contacts_btn, FALSE);
-	gtk_widget_set_sensitive (priv->contacts, FALSE);
-}
-
-
-
-/**
- * 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;
-	}
-
-	init_widgets (epage);
-
-	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);
-}
-
-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 bd1c094357..0000000000
--- a/calendar/gui/dialogs/event-page.glade
+++ /dev/null
@@ -1,485 +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>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>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>
-
-    <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>0.5</xalign>
-	  <yalign>7.45058e-09</yalign>
-	  <xscale>1</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>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>False</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>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>_Confidential</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <group>classification_radio_group</group>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <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>GtkEntry</class>
-	<name>contacts</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>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 232455e491..0000000000
--- a/calendar/gui/dialogs/event-page.h
+++ /dev/null
@@ -1,62 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 99c5cf37c6..0000000000
--- a/calendar/gui/dialogs/meeting-page.c
+++ /dev/null
@@ -1,1354 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-control.h>
-#include <bonobo/bonobo-widget.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 "Evolution-Addressbook-SelectNames.h"
-#include "../component-factory.h"
-#include "../itip-utils.h"
-#include "comp-editor-util.h"
-#include "e-delegate-dialog.h"
-#include "meeting-page.h"
-
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-
-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
-};
-
-struct attendee {
-	char *address;
-	char *member;
-
-	CalComponentCUType cutype;
-	CalComponentRole role;
-	CalComponentPartStat status;
-	gboolean rsvp;
-
-	char *delto;
-	char *delfrom;
-	char *sentby;
-	char *cn;
-	char *language;
-};
-
-/* Private part of the MeetingPage structure */
-struct _MeetingPagePrivate {
-	/* List of attendees */
-	GSList *attendees;
-
-	/* 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 */
-	ETableModel *model;
-	GtkWidget *etable;
-	gint row;
-	
-	/* For handling who the organizer is */
-	gboolean other;
-	gboolean existing;
-        gboolean updating;
-	
-	/* For handling the invite button */
-        GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-};
-
-
-
-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 void meeting_page_fill_component (CompEditorPage *page, CalComponent *comp);
-
-static int row_count (ETableModel *etm, void *data);
-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->xml = NULL;
-
-	priv->main = NULL;
-	priv->invite = NULL;
-	
-	priv->model = NULL;
-	priv->etable = NULL;
-	
-	priv->updating = FALSE;
-}
-
-/* Destroy handler for the task page */
-static void
-meeting_page_destroy (GtkObject *object)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	ETable *real_table;
-	char *filename;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_MEETING_PAGE (object));
-
-	mpage = MEETING_PAGE (object);
-	priv = mpage->priv;
-
-	itip_addresses_free (priv->addresses);
-	g_list_free (priv->address_strings);
-
-	filename = g_strdup_printf ("%s/config/et-header-meeting-page", 
-				    evolution_dir);
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (priv->etable));
-	e_table_save_state (real_table, filename);
-	g_free (filename);
-	
-	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;
-	GSList *attendees, *l;
-	GList *l2;
-	
-	mpage = MEETING_PAGE (page);
-	priv = mpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (mpage);
-
-	/* Organizer */
-	cal_component_get_organizer (comp, &organizer);
-	priv->addresses = itip_addresses_get ();
-	for (l2 = priv->addresses; l2 != NULL; l2 = l2->next) {
-		ItipAddress *a = l2->data;
-		
-		priv->address_strings = g_list_append (priv->address_strings, a->full);
-		if (a->default_address)
-			priv->default_address = a->full;
-	}
-	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 = e_utf8_to_gtk_string (priv->existing_organizer, strip);
-
-		gtk_widget_hide (priv->organizer_table);
-		gtk_widget_show (priv->existing_organizer_table);
-		gtk_widget_hide (priv->invite);
-		
-		gtk_label_set_text (GTK_LABEL (priv->existing_organizer), s);
-		g_free (s);
-		
-		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);
-	}
-
-	/* Attendees */
-	cal_component_get_attendee_list (comp, &attendees);
-	for (l = attendees; l != NULL; l = l->next) {
-		CalComponentAttendee *att = l->data;
-		struct attendee *attendee = g_new0 (struct attendee, 1);
-
-		attendee->address = att->value ? g_strdup (att->value) : g_strdup ("");
-		attendee->member = att->member ? g_strdup (att->member) : g_strdup ("");
-		attendee->cutype= att->cutype;
-		attendee->role = att->role;
-		attendee->status = att->status;
-		attendee->rsvp = att->rsvp;
-		attendee->delto = att->delto ? g_strdup (att->delto) : g_strdup ("");
-		attendee->delfrom = att->delto ? g_strdup (att->delfrom) : g_strdup ("");
-		attendee->sentby = att->sentby ? g_strdup (att->sentby) : g_strdup ("");
-		attendee->cn = att->cn ? g_strdup (att->cn) : g_strdup ("");
-		attendee->language = att->language ? g_strdup (att->language) : g_strdup ("");
-		
-		priv->attendees = g_slist_prepend (priv->attendees, attendee);
-	
-	}
-	priv->attendees = g_slist_reverse (priv->attendees);
-	cal_component_free_attendee_list (attendees);
-	
-	/* Table */
-	e_table_model_rows_inserted (priv->model, 0, row_count (priv->model, mpage));
-
-	/* So the comp editor knows we need to send if anything changes */
-	if (priv->attendees != NULL)
-		comp_editor_page_notify_needs_send (COMP_EDITOR_PAGE (mpage));
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the meeting page */
-static void
-meeting_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	CalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};
-	GSList *attendees = NULL, *l;
-	
-	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) {		
-			g_free (addr);
-			g_free (cn);		
-			return;
-		} 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);
-	}
-	
-	for (l = priv->attendees; l != NULL; l = l->next) {
-		struct attendee *attendee = l->data;
-		CalComponentAttendee *att = g_new0 (CalComponentAttendee, 1);
-		
-		
-		att->value = attendee->address;
-		att->member = (attendee->member && *attendee->member) ? attendee->member : NULL;
-		att->cutype= attendee->cutype;
-		att->role = attendee->role;
-		att->status = attendee->status;
-		att->rsvp = attendee->rsvp;
-		att->delto = (attendee->delto && *attendee->delto) ? attendee->delto : NULL;
-		att->delfrom = (attendee->delfrom && *attendee->delfrom) ? attendee->delfrom : NULL;
-		att->sentby = (attendee->sentby && *attendee->sentby) ? attendee->sentby : NULL;
-		att->cn = (attendee->cn && *attendee->cn) ? attendee->cn : NULL;
-		att->language = (attendee->language && *attendee->language) ? attendee->language : NULL;
-		
-		attendees = g_slist_prepend (attendees, att);
-		
-	}
-	attendees = g_slist_reverse (attendees);
-	cal_component_set_attendee_list (comp, attendees);
-	g_slist_free (attendees);
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-
-	priv = mpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("meeting-page");
-	if (!priv->main)
-		return FALSE;
-
-	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);
-}
-
-static void
-invite_entry_changed (BonoboListener    *listener,
-		      char              *event_name,
-		      CORBA_any         *arg,
-		      CORBA_Environment *ev,
-		      gpointer           user_data)
-{
-	g_message ("event: \"%s\", section \"%s\"", event_name, BONOBO_ARG_GET_STRING (arg));
-}
-
-static void
-add_section (GNOME_Evolution_Addressbook_SelectNames corba_select_names, const char *name, int limit)
-{
-	Bonobo_Control corba_control;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (limit != 0)
-	GNOME_Evolution_Addressbook_SelectNames_addSectionWithLimit (corba_select_names,
-								     name, name, limit, &ev);
-	else
-	GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names,
-							    name, name, &ev);
-
-	corba_control =
-		GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (
-			corba_select_names, name, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	bonobo_event_source_client_add_listener (corba_control, 
-						 invite_entry_changed,
-						 "changed:working_copy",
-						 NULL, NULL);
-}
-
-static gboolean
-get_select_name_dialog (MeetingPage *mpage) 
-{
-	MeetingPagePrivate *priv;
-	CORBA_Environment ev;
-	
-	priv = mpage->priv;
-
-	if (priv->corba_select_names != CORBA_OBJECT_NIL)
-		return TRUE;
-	
-	CORBA_exception_init (&ev);
-
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-
-	add_section (priv->corba_select_names, "Required Participants", 0);
-	add_section (priv->corba_select_names, "Optional Participants", 0);
-	add_section (priv->corba_select_names, "Non-Participants", 0);
-
-	bonobo_event_source_client_add_listener (priv->corba_select_names,
-						 invite_entry_changed,
-						 "GNOME/Evolution:changed",
-						 NULL, NULL);
-
-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without
-           raising an exception in `ev'.  */
-	if (ev._major != CORBA_NO_EXCEPTION || priv->corba_select_names == CORBA_OBJECT_NIL) {
-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/* 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_show (priv->other_organizer_lbl);
-	gtk_widget_show (priv->other_organizer);
-
-	gtk_label_set_text (GTK_LABEL (priv->organizer_lbl), _("Sent By:"));
-
-	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;
-	CORBA_Environment ev;
-	
-	mpage = MEETING_PAGE (data);
-	priv = mpage->priv;
-	
-	if (!get_select_name_dialog (mpage))
-		return;
-	
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (
-		priv->corba_select_names, "Required Participants", &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-/* 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);
-}
-
-static CalComponentCUType
-text_to_type (const char *type)
-{
-	if (!g_strcasecmp (type, "Individual"))
-		return CAL_COMPONENT_CUTYPE_INDIVIDUAL;
-	else if (!g_strcasecmp (type, "Group"))
-		return CAL_COMPONENT_CUTYPE_GROUP;
-	else if (!g_strcasecmp (type, "Resource"))
-		return CAL_COMPONENT_CUTYPE_RESOURCE;
-	else if (!g_strcasecmp (type, "Room"))
-		return CAL_COMPONENT_CUTYPE_ROOM;
-	else
-		return CAL_COMPONENT_ROLE_UNKNOWN;
-}
-
-static char *
-type_to_text (CalComponentCUType type)
-{
-	switch (type) {
-	case CAL_COMPONENT_CUTYPE_INDIVIDUAL:
-		return "Individual";
-	case CAL_COMPONENT_CUTYPE_GROUP:
-		return "Group";
-	case CAL_COMPONENT_CUTYPE_RESOURCE:
-		return "Resource";
-	case CAL_COMPONENT_CUTYPE_ROOM:
-		return "Room";
-	default:
-		return "Unknown";
-	}
-
-	return NULL;
-
-}
-
-static CalComponentRole
-text_to_role (const char *role)
-{
-	if (!g_strcasecmp (role, "Chair"))
-		return CAL_COMPONENT_ROLE_CHAIR;
-	else if (!g_strcasecmp (role, "Required Participant"))
-		return CAL_COMPONENT_ROLE_REQUIRED;
-	else if (!g_strcasecmp (role, "Optional Participant"))
-		return CAL_COMPONENT_ROLE_OPTIONAL;
-	else if (!g_strcasecmp (role, "Non-Participant"))
-		return CAL_COMPONENT_ROLE_NON;
-	else
-		return CAL_COMPONENT_ROLE_UNKNOWN;
-}
-
-static char *
-role_to_text (CalComponentRole role) 
-{
-	switch (role) {
-	case CAL_COMPONENT_ROLE_CHAIR:
-		return "Chair";
-	case CAL_COMPONENT_ROLE_REQUIRED:
-		return "Required Participant";
-	case CAL_COMPONENT_ROLE_OPTIONAL:
-		return "Optional Participant";
-	case CAL_COMPONENT_ROLE_NON:
-		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 CalComponentPartStat
-text_to_partstat (const char *partstat)
-{
-	if (!g_strcasecmp (partstat, "Needs Action"))
-		return CAL_COMPONENT_PARTSTAT_NEEDSACTION;
-	else if (!g_strcasecmp (partstat, "Accepted"))
-		return CAL_COMPONENT_PARTSTAT_ACCEPTED;
-	else if (!g_strcasecmp (partstat, "Declined"))
-		return CAL_COMPONENT_PARTSTAT_DECLINED;
-	else if (!g_strcasecmp (partstat, "Tentative"))
-		return CAL_COMPONENT_PARTSTAT_TENTATIVE;
-	else if (!g_strcasecmp (partstat, "Delegated"))
-		return CAL_COMPONENT_PARTSTAT_DELEGATED;
-	else if (!g_strcasecmp (partstat, "Completed"))
-		return CAL_COMPONENT_PARTSTAT_COMPLETED;
-	else if (!g_strcasecmp (partstat, "In Process"))
-		return CAL_COMPONENT_PARTSTAT_INPROCESS;
-	else
-		return CAL_COMPONENT_PARTSTAT_UNKNOWN;
-}
-
-static char *
-partstat_to_text (CalComponentPartStat partstat) 
-{
-	switch (partstat) {
-	case CAL_COMPONENT_PARTSTAT_NEEDSACTION:
-		return "Needs Action";
-	case CAL_COMPONENT_PARTSTAT_ACCEPTED:
-		return "Accepted";
-	case CAL_COMPONENT_PARTSTAT_DECLINED:
-		return "Declined";
-	case CAL_COMPONENT_PARTSTAT_TENTATIVE:
-		return "Tentative";
-	case CAL_COMPONENT_PARTSTAT_DELEGATED:
-		return "Delegated";
-	case CAL_COMPONENT_PARTSTAT_COMPLETED:
-		return "Completed";
-	case CAL_COMPONENT_PARTSTAT_INPROCESS:
-		return "In Process";
-	case CAL_COMPONENT_PARTSTAT_UNKNOWN:
-	default:
-		return "Unknown";
-	}
-
-	return NULL;
-}
-
-static int
-column_count (ETableModel *etm, void *data)
-{
-	return MEETING_COLUMN_COUNT;
-}
-
-static int
-row_count (ETableModel *etm, void *data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-
-	mpage = MEETING_PAGE (data);	
-	priv = mpage->priv;
-
-	return g_slist_length (priv->attendees);
-}
-
-static void
-append_row (ETableModel *etm, ETableModel *model, int row, void *data)
-{	
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	struct attendee *attendee;
-	gint row_cnt;
-	
-	mpage = MEETING_PAGE (data);	
-	priv = mpage->priv;
-
-	attendee = g_new0 (struct attendee, 1);
-	
-	attendee->address = g_strdup_printf ("MAILTO:%s", (char *) e_table_model_value_at (model, MEETING_ATTENDEE_COL, row));
-	attendee->member = g_strdup (e_table_model_value_at (model, MEETING_MEMBER_COL, row));
-	attendee->cutype = text_to_type (e_table_model_value_at (model, MEETING_TYPE_COL, row));
-	attendee->role = text_to_role (e_table_model_value_at (model, MEETING_ROLE_COL, row));
-	attendee->rsvp = text_to_boolean (e_table_model_value_at (model, MEETING_RSVP_COL, row));
-	attendee->delto = g_strdup (e_table_model_value_at (model, MEETING_DELTO_COL, row));
-	attendee->delfrom = g_strdup (e_table_model_value_at (model, MEETING_DELFROM_COL, row));
-	attendee->status = text_to_partstat (e_table_model_value_at (model, MEETING_STATUS_COL, row));
-	attendee->cn = g_strdup (e_table_model_value_at (model, MEETING_CN_COL, row));
-	attendee->language = g_strdup (e_table_model_value_at (model, MEETING_LANG_COL, row));
-
-	priv->attendees = g_slist_append (priv->attendees, attendee);
-	
-	row_cnt = row_count (etm, data) - 1;
-	e_table_model_row_inserted (E_TABLE_MODEL (etm), row_cnt);
-
-	comp_editor_page_notify_needs_send (COMP_EDITOR_PAGE (mpage));
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
-}
-
-static void *
-value_at (ETableModel *etm, int col, int row, void *data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	struct attendee *attendee;
-
-	mpage = MEETING_PAGE (data);	
-	priv = mpage->priv;
-
-	attendee = g_slist_nth_data (priv->attendees, row);
-	
-	switch (col) {
-	case MEETING_ATTENDEE_COL:
-		return itip_strip_mailto (attendee->address);
-	case MEETING_MEMBER_COL:
-		return attendee->member;
-	case MEETING_TYPE_COL:
-		return type_to_text (attendee->cutype);
-	case MEETING_ROLE_COL:
-		return role_to_text (attendee->role);
-	case MEETING_RSVP_COL:
-		return boolean_to_text (attendee->rsvp);
-	case MEETING_DELTO_COL:
-		return itip_strip_mailto (attendee->delto);
-	case MEETING_DELFROM_COL:
-		return itip_strip_mailto (attendee->delfrom);
-	case MEETING_STATUS_COL:
-		return partstat_to_text (attendee->status);
-	case MEETING_CN_COL:
-		return attendee->cn;
-	case MEETING_LANG_COL:
-		return attendee->language;
-	}
-	
-	return NULL;
-}
-
-static void
-set_value_at (ETableModel *etm, int col, int row, const void *val, void *data)
-{
-	MeetingPage *mpage;
-	MeetingPagePrivate *priv;
-	struct attendee *attendee;
-
-	mpage = MEETING_PAGE (data);	
-	priv = mpage->priv;
-	
-	attendee = g_slist_nth_data (priv->attendees, row);
-	
-	switch (col) {
-	case MEETING_ATTENDEE_COL:
-		if (attendee->address)
-			g_free (attendee->address);
-		attendee->address = g_strdup_printf ("MAILTO:%s", (char *) val);
-		break;
-	case MEETING_MEMBER_COL:
-		if (attendee->member)
-			g_free (attendee->member);
-		attendee->member = g_strdup (val);
-		break;
-	case MEETING_TYPE_COL:
-		attendee->cutype = text_to_type (val);
-		break;
-	case MEETING_ROLE_COL:
-		attendee->role = text_to_role (val);
-		break;
-	case MEETING_RSVP_COL:
-		attendee->rsvp = text_to_boolean (val);
-		break;
-	case MEETING_DELTO_COL:
-		if (attendee->delto)
-			g_free (attendee->delto);
-		attendee->delto = g_strdup (val);
-		break;
-	case MEETING_DELFROM_COL:
-		if (attendee->delfrom)
-			g_free (attendee->delfrom);
-		attendee->delto = g_strdup (val);
-		break;
-	case MEETING_STATUS_COL:
-		attendee->status = text_to_partstat (val);
-		break;
-	case MEETING_CN_COL:
-		if (attendee->cn)
-			g_free (attendee->cn);
-		attendee->cn = g_strdup (val);
-		break;
-	case MEETING_LANG_COL:
-		if (attendee->language)
-			g_free (attendee->language);
-		attendee->language = g_strdup (val);
-		break;
-	}
-
-	if (!priv->updating) {		
-		comp_editor_page_notify_needs_send (COMP_EDITOR_PAGE (mpage));
-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
-	}
-}
-
-static gboolean
-is_cell_editable (ETableModel *etm, int col, int row, void *data)
-{
-	switch (col) {
-	case MEETING_DELTO_COL:
-	case MEETING_DELFROM_COL:
-		return FALSE;
-
-	default:
-	}
-
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etm, int col, const void *val, void *data)
-{
-	return g_strdup (val);
-}
-
-static void
-free_value (ETableModel *etm, int col, void *val, void *data)
-{
-	g_free (val);
-}
-
-static void *
-init_value (ETableModel *etm, int col, void *data)
-{
-	switch (col) {
-	case MEETING_ATTENDEE_COL:
-		return g_strdup ("");
-	case MEETING_MEMBER_COL:
-		return g_strdup ("");
-	case MEETING_TYPE_COL:
-		return g_strdup ("Individual");
-	case MEETING_ROLE_COL:
-		return g_strdup ("Required Participant");
-	case MEETING_RSVP_COL:
-		return g_strdup ("Yes");
-	case MEETING_DELTO_COL:
-		return g_strdup ("");
-	case MEETING_DELFROM_COL:
-		return g_strdup ("");
-	case MEETING_STATUS_COL:
-		return g_strdup ("Needs Action");
-	case MEETING_CN_COL:
-		return g_strdup ("");
-	case MEETING_LANG_COL:
-		return g_strdup ("en");
-	}
-	
-	return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etm, int col, const void *val, void *data)
-{
-	
-	switch (col) {
-	case MEETING_ATTENDEE_COL:
-	case MEETING_MEMBER_COL:
-	case MEETING_DELTO_COL:
-	case MEETING_DELFROM_COL:
-	case MEETING_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, void *data)
-{
-	return g_strdup (val);
-}
-
-static void
-build_etable (MeetingPage *mpage)
-{
-	MeetingPagePrivate *priv;
-	ETable *real_table;
-	ETableExtras *extras;
-	GList *strings;
-	ECell *popup_cell, *cell;
-	
-	char *filename;
-	
-	priv = mpage->priv;
-	
-	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, "Individual");
-	strings = g_list_append (strings, "Group");
-	strings = g_list_append (strings, "Resource");
-	strings = g_list_append (strings, "Room");
-	strings = g_list_append (strings, "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, "Chair");
-	strings = g_list_append (strings, "Required Participant");
-	strings = g_list_append (strings, "Optional Participant");
-	strings = g_list_append (strings, "Non-Participant");
-	strings = g_list_append (strings, "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, "Yes");
-	strings = g_list_append (strings, "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, "Needs Action");
-	strings = g_list_append (strings, "Accepted");
-	strings = g_list_append (strings, "Declined");
-	strings = g_list_append (strings, "Tentative");
-	strings = g_list_append (strings, "Delegated");
-
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);
-	e_table_extras_add_cell (extras, "statusedit", popup_cell);
-
-
-	/* The table itself */
-	priv->model = e_table_simple_new (column_count,
-					  row_count,
-					  value_at,
-					  set_value_at,
-					  is_cell_editable,
-					  duplicate_value,
-					  free_value,
-					  init_value,
-					  value_is_empty,
-					  value_to_string,
-					  mpage);
-	gtk_object_set (GTK_OBJECT (priv->model),
-			"append_row", append_row,
-			NULL);
-	
-	priv->etable = e_table_scrolled_new_from_spec_file (priv->model,
-							    extras, 
-							    EVOLUTION_ETSPECDIR "/meeting-page.etspec",
-							    NULL);
-	filename = g_strdup_printf ("%s/config/et-header-meeting-page", 
-				    evolution_dir);
-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (priv->etable));
-	e_table_load_state (real_table, filename);
-	g_free (filename);
-
-	gtk_signal_connect (GTK_OBJECT (real_table),
-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);
-
-	gtk_object_unref (GTK_OBJECT (extras));
-}
-
-static void
-popup_delegate_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage = MEETING_PAGE (data);
-	MeetingPagePrivate *priv;
-	EDelegateDialog *edd;
-	GtkWidget *dialog;
-	char *address = NULL, *name = NULL;
-	gint row_cnt;
-	
-	priv = mpage->priv;
-
-	/* Show dialog. */
-	edd = e_delegate_dialog_new ();
-	dialog = e_delegate_dialog_get_toplevel (edd);
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0){
-		struct attendee *a;
-		char *str;
-		GSList *l;
-		
-		name = e_delegate_dialog_get_delegate_name (edd);
-		address = e_delegate_dialog_get_delegate (edd);
-		
-		for (l = priv->attendees; l != NULL; l = l->next) {
-			a = l->data;
-			
-			if (a->address != NULL && !g_strcasecmp (itip_strip_mailto (a->address), address)) {
-				GtkWidget *dlg = gnome_error_dialog ("That person is already attending the meeting!");
-				gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-				goto cleanup;
-			}
-		}
-		
-		a = g_slist_nth_data (priv->attendees, priv->row);		
-		if (a->delto)
-			g_free (a->delto);
-		a->delto = g_strdup_printf ("MAILTO:%s", address);
-
-		a = g_new0 (struct attendee, 1);
-		
-		a->address = g_strdup_printf ("MAILTO:%s", address);
-		a->member = init_value (NULL, MEETING_MEMBER_COL, mpage);
-		str = init_value (NULL, MEETING_TYPE_COL, mpage);
-		a->cutype = text_to_type (str);
-		g_free (str);
-		str = init_value (NULL, MEETING_ROLE_COL, mpage);
-		a->role = text_to_role (str);
-		g_free (str);
-		str = init_value (NULL, MEETING_RSVP_COL, mpage);
-		a->rsvp = text_to_boolean (str);
-		g_free (str);
-		a->delto = init_value (NULL, MEETING_DELTO_COL, mpage);
-		a->delfrom = g_strdup_printf ("MAILTO:%s", (char *) value_at (NULL, MEETING_ATTENDEE_COL, priv->row, mpage));
-		str = init_value (NULL, MEETING_STATUS_COL, mpage);
-		a->status = text_to_partstat (str);
-		g_free (str);
-		a->cn = name ? g_strdup (name) : g_strdup ("");
-		a->language = init_value (NULL, MEETING_LANG_COL, mpage);
-		
-		priv->attendees = g_slist_append (priv->attendees, a);
-
-		row_cnt = row_count (priv->model, mpage) - 1;
-		e_table_model_row_changed (priv->model, priv->row);
-		e_table_model_row_inserted (priv->model, row_cnt);
-	}
-
- cleanup:
-	g_free (name);
-	g_free (address);
-	gtk_object_unref (GTK_OBJECT (edd));
-}
-
-static void
-popup_delete_cb (GtkWidget *widget, gpointer data) 
-{
-	MeetingPage *mpage = MEETING_PAGE (data);
-	MeetingPagePrivate *priv;
-	GSList *l;
-	
-	priv = mpage->priv;
-
-	l = g_slist_nth (priv->attendees, priv->row);
-	priv->attendees = g_slist_remove (priv->attendees, l->data);
-	
-	e_table_model_row_deleted (priv->model, priv->row);
-}
-
-enum {
-	CAN_DELEGATE = 2,
-	CAN_DELETE = 4
-};
-
-static EPopupMenu context_menu[] = {
-	{ N_("_Delegate To..."),              NULL,
-	  GTK_SIGNAL_FUNC (popup_delegate_cb),NULL,  CAN_DELEGATE },
-
-	E_POPUP_SEPARATOR,
-
-	{ N_("_Delete"),                      GNOME_STOCK_MENU_TRASH,
-	  GTK_SIGNAL_FUNC (popup_delete_cb),  NULL,  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;
-
-	priv = mpage->priv;
-
-	priv->row = row;
-
-	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;
-}
-
-
-
-/**
- * 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)
-{
-	MeetingPagePrivate *priv;
-	
-	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 */
-	build_etable (mpage);	
-	gtk_widget_show (priv->etable);
-	gtk_box_pack_start (GTK_BOX (priv->main), 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 (void)
-{
-	MeetingPage *mpage;
-
-	mpage = gtk_type_new (TYPE_MEETING_PAGE);
-	if (!meeting_page_construct (mpage)) {
-		gtk_object_unref (GTK_OBJECT (mpage));
-		return NULL;
-	}
-
-	return mpage;
-}
-
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
deleted file mode 100644
index da49873e61..0000000000
--- a/calendar/gui/dialogs/meeting-page.etspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification click-to-add="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 3aabf95102..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 d04c1b110f..0000000000
--- a/calendar/gui/dialogs/meeting-page.h
+++ /dev/null
@@ -1,62 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 "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);
-MeetingPage *meeting_page_new       (void);
-
-
-
-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 df3dd7e9cf..0000000000
--- a/calendar/gui/dialogs/recurrence-page.c
+++ /dev/null
@@ -1,2248 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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"
-
-
-
-/* We set this as the TZID on all exceptions added. When we actually fill
-   the component, we replace it with the TZID from DTSTART. */
-static char *DUMMY_TZID = "DUMMY";
-
-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
-};
-
-/* 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 */
-	GtkWidget *month_index_spin;
-	int month_index;
-
-	GtkWidget *month_day_menu;
-	enum month_day_options month_day;
-
-	/* For ending date, created by hand */
-	GtkWidget *ending_date_edit;
-	time_t ending_date;
-
-	/* 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 void 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_index_spin = NULL;
-	priv->month_day_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 rows and the row data in the exceptions GtkCList */
-static void
-free_exception_clist_data (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	int i;
-
-	priv = rpage->priv;
-
-	if (priv->exception_list) {
-		GtkCList *clist = GTK_CLIST (priv->exception_list);
-
-		for (i = 0; i < clist->rows; i++) {
-			CalComponentDateTime *dt;
-			
-			dt = gtk_clist_get_row_data (clist, i);
-			g_free (dt->value);
-			g_free (dt);
-			gtk_clist_set_row_data (clist, i, NULL);
-		}
-	
-		gtk_clist_clear (clist);
-	}
-}
-
-/* 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;
-	}
-
-	free_exception_clist_data (rpage);
-
-	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_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 = time (NULL);
-	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 */
-	free_exception_clist_data (rpage);
-}
-
-/* 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);
-
-	strftime (buf, sizeof (buf), _("%a %b %d %Y"), &tmp_tm);
-	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 = 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 (clist, i, dt);
-
-	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 ();
-	}
-}
-
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day.
- */
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-
-/* 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: {
-		int day_index;
-		enum month_day_options month_day;
-
-		g_assert (GTK_BIN (priv->special)->child != NULL);
-		g_assert (priv->month_index_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->month_index_spin));
-		g_assert (priv->month_day_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->month_day_menu));
-
-		day_index = e_dialog_spin_get_int (priv->month_index_spin);
-		month_day = e_dialog_option_menu_get (priv->month_day_menu,
-						      month_day_options_map);
-
-		switch (month_day) {
-		case MONTH_DAY_NTH:
-			r.by_month_day[0] = day_index;
-			break;
-
-		case MONTH_DAY_MON:
-			r.by_day[0] = nth_weekday (day_index, 
-						   ICAL_MONDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_TUE:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_TUESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_WED:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_WEDNESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_THU:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_THURSDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_FRI:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_FRIDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SAT:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_SATURDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SUN:
-			r.by_day[0] = nth_weekday (day_index,
-						   ICAL_SUNDAY_WEEKDAY);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		break;
-	}
-
-	case ICAL_YEARLY_RECURRENCE:
-		/* Nothing else is required */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Ending date */
-
-	ending_type = e_dialog_option_menu_get (priv->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));
-
-		date_set = e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit),
-						 &r.until.year,
-						 &r.until.month,
-						 &r.until.day);
-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->ending_date_edit),
-					     &r.until.hour,
-					     &r.until.minute);
-		g_assert (date_set);
-
-		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;
-	CalComponentDateTime start_date;
-	enum recur_type recur_type;
-	GtkCList *exception_list;
-	GSList *list;
-	const char *tzid;
-	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 */
-
-	cal_component_get_dtstart (comp, &start_date);
-	tzid = start_date.tzid;
-	cal_component_free_datetime (&start_date);
-
-	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;
-
-		/* If the dummy TZID was used, we use the TZID from the
-		   start date. We do this because we don't allow editing
-		   of timezones for RDATEs, so we try to use the same timezone
-		   as the DTSTART for all new exceptions added. */
-		if (dt->tzid == DUMMY_TZID)
-			cdt->tzid = tzid;
-		else
-			cdt->tzid = dt->tzid;
-
-		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);
-	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);
-}
-
-/* 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;
-}
-
-/* For monthly recurrences, changes the valid range of the recurrence day index
- * spin button; e.g. month days are 1-31 while the valid range for a Sunday is
- * the 1st through 5th of the month.
- */
-static void
-adjust_day_index_spin (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-	GtkAdjustment *adj;
-	enum month_day_options month_day;
-
-	priv = rpage->priv;
-
-	g_assert (priv->month_day_menu != NULL);
-	g_assert (GTK_IS_OPTION_MENU (priv->month_day_menu));
-	g_assert (priv->month_index_spin != NULL);
-	g_assert (GTK_IS_SPIN_BUTTON (priv->month_index_spin));
-
-	month_day = e_dialog_option_menu_get (priv->month_day_menu,
-					      month_day_options_map);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->month_index_spin));
-
-	switch (month_day) {
-	case MONTH_DAY_NTH:
-		adj->upper = 31;
-		gtk_adjustment_changed (adj);
-		break;
-
-	case MONTH_DAY_MON:
-	case MONTH_DAY_TUE:
-	case MONTH_DAY_WED:
-	case MONTH_DAY_THU:
-	case MONTH_DAY_FRI:
-	case MONTH_DAY_SAT:
-	case MONTH_DAY_SUN:
-		adj->upper = 5;
-		gtk_adjustment_changed (adj);
-
-		if (adj->value > 5) {
-			adj->value = 5;
-			gtk_adjustment_value_changed (adj);
-		}
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* 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;
-
-	rpage = RECURRENCE_PAGE (data);
-
-	adjust_day_index_spin (rpage);
-	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_index_spin == 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_index_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->month_index_spin,
-			    FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("th"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, 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_spin_set (priv->month_index_spin, priv->month_index);
-	e_dialog_option_menu_set (priv->month_day_menu,
-				  priv->month_day,
-				  month_day_options_map);
-	adjust_day_index_spin (rpage);
-
-	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_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_index_spin = NULL;
-		priv->month_day_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);
-	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_time (de, priv->ending_date);
-
-	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 */
-
-			/* FIXME: UNTIL needs to be checked. */
-			priv->ending_date = icaltime_as_timet (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);
-
-	/* 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);
-		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 != 0)
-			goto custom;
-
-		if (n_by_month_day == 1) {
-			int nth;
-
-			nth = r->by_month_day[0];
-			if (nth < 1)
-				goto custom;
-
-			priv->month_index = nth;
-			priv->month_day = MONTH_DAY_NTH;
-		} else if (n_by_day == 1) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-			enum month_day_options month_day;
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-
-			if (pos < 1)
-				goto custom;
-
-			switch (weekday) {
-			case ICAL_MONDAY_WEEKDAY:
-				month_day = MONTH_DAY_MON;
-				break;
-
-			case ICAL_TUESDAY_WEEKDAY:
-				month_day = MONTH_DAY_TUE;
-				break;
-
-			case ICAL_WEDNESDAY_WEEKDAY:
-				month_day = MONTH_DAY_WED;
-				break;
-
-			case ICAL_THURSDAY_WEEKDAY:
-				month_day = MONTH_DAY_THU;
-				break;
-
-			case ICAL_FRIDAY_WEEKDAY:
-				month_day = MONTH_DAY_FRI;
-				break;
-
-			case ICAL_SATURDAY_WEEKDAY:
-				month_day = MONTH_DAY_SAT;
-				break;
-
-			case ICAL_SUNDAY_WEEKDAY:
-				month_day = MONTH_DAY_SUN;
-				break;
-
-			default:
-				goto custom;
-			}
-
-			priv->month_index = 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 void
-recurrence_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	RecurrencePage *rpage;
-
-	rpage = RECURRENCE_PAGE (page);
-	fill_component (rpage, comp);
-}
-
-/* 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, old_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;
-
-		/* Copy the TZID from the old property.
-		   FIXME: Should get notified when the TZID changes.*/
-		cal_component_get_dtstart (priv->comp, &old_dt);
-		dt.tzid = NULL;
-		if (old_dt.tzid)
-			dt.tzid = old_dt.tzid;
-		cal_component_free_datetime (&old_dt);
-
-		cal_component_set_dtstart (priv->comp, &dt);
-	}
-
-	if (dates->end) {
-		icaltime = *dates->end;
-
-		/* Copy the TZID from the old property.
-		   FIXME: Should get notified when the TZID changes.*/
-		cal_component_get_dtend (priv->comp, &old_dt);
-		dt.tzid = NULL;
-		if (old_dt.tzid)
-			dt.tzid = old_dt.tzid;
-		cal_component_free_datetime (&old_dt);
-
-		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);
-	}
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (RecurrencePage *rpage)
-{
-	RecurrencePagePrivate *priv;
-
-	priv = rpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("recurrence-page");
-	if (!priv->main)
-		return FALSE;
-
-	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 set this to the dummy TZID for now. When we fill the component
-	   we will replace it with the TZID from DTSTART. */
-	dt.tzid = DUMMY_TZID;
-
-	icaltime.is_date = 1;
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->exception_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->exception_date),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	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);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->exception_date), 
-				     &tt->hour, &tt->minute);
-	tt->second = 0;
-
-	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;
-	CalComponentDateTime *dt;
-
-	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);
-	g_assert (dt != NULL);
-	g_free (dt->value);
-	g_free (dt);
-
-	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;
-
-	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;
-}
diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade
deleted file mode 100644
index 92e0712ed9..0000000000
--- a/calendar/gui/dialogs/recurrence-page.glade
+++ /dev/null
@@ -1,603 +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>
-	  <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>False</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>
-	  <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>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>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>_Add</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<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>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<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>_Delete</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>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_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 aba59003f7..0000000000
--- a/calendar/gui/dialogs/recurrence-page.h
+++ /dev/null
@@ -1,62 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 d8ee62164a..0000000000
--- a/calendar/gui/dialogs/save-comp.c
+++ /dev/null
@@ -1,63 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 17b449291c..0000000000
--- a/calendar/gui/dialogs/save-comp.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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/send-comp.c b/calendar/gui/dialogs/send-comp.c
deleted file mode 100644
index 7f7874fa41..0000000000
--- a/calendar/gui/dialogs/send-comp.c
+++ /dev/null
@@ -1,82 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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)
-{
-	GtkWidget *dialog;
-	CalComponentVType vtype;
-	char *str;
-
-	vtype = cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		str = g_strdup_printf (_("The meeting information has changed. "
-					 "Send an updated version?"));
-		break;
-
-	case CAL_COMPONENT_TODO:
-		str = g_strdup_printf (_("The task information has changed. "
-					 "Send an updated version?"));
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		str = g_strdup_printf (_("The journal entry 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 f60ab947aa..0000000000
--- a/calendar/gui/dialogs/send-comp.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-#endif
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
deleted file mode 100644
index 6212e8f76f..0000000000
--- a/calendar/gui/dialogs/task-details-page.c
+++ /dev/null
@@ -1,648 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "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 *summary;
-	GtkWidget *date_time;
-	
-	GtkWidget *completed_date;
-
-	GtkWidget *url;
-
-	GtkWidget *organizer;
-	GtkWidget *organizer_lbl;
-	GtkWidget *delegated_to;
-	GtkWidget *delegated_to_lbl;
-	GtkWidget *delegated_from;
-	GtkWidget *delegated_from_lbl;	
-
-	gboolean updating;
-};
-
-
-
-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 void task_details_page_fill_component (CompEditorPage *page, CalComponent *comp);
-static void task_details_page_set_summary (CompEditorPage *page, const char *summary);
-static void task_details_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
-
-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;
-	editor_page_class->set_summary = task_details_page_set_summary;
-	editor_page_class->set_dates = task_details_page_set_dates;
-
-	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->summary = NULL;
-	priv->date_time = NULL;
-	priv->completed_date = 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->organizer);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	/* Summary */
-	gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	/* Start date */
-	gtk_label_set_text (GTK_LABEL (priv->date_time), "");
-
-	/* 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;
-	GSList *list;
-	CalComponentText text;
-	CalComponentOrganizer organizer;
-	const char *url;
-	CompEditorPageDates dates;
-	
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	priv->updating = TRUE;
-	
-	/* Clean the screen */
-	clear_widgets (tdpage);
-	
-	/* Summary */
-	cal_component_get_summary (comp, &text);
-	task_details_page_set_summary (page, text.value);
-
-	/* Dates */
-	comp_editor_dates (&dates, comp);
-	task_details_page_set_dates (page, &dates);
-	
-	/* URL */
-	cal_component_get_url (comp, &url);
-	e_dialog_editable_set (priv->url, url);
-
-	/* Delegation */
-	cal_component_get_organizer (comp, &organizer);
-	if (organizer.value)
-		e_dialog_editable_set (priv->organizer, organizer.value);
-
-	cal_component_get_attendee_list (comp, &list);
-	if (list != NULL) {
-		CalComponentAttendee *attendee;
-		
-		attendee = list->data;
-		if (attendee->delto)
-			e_dialog_editable_set (priv->delegated_to, attendee->delto);
-		if (attendee->delfrom) {
-			gchar *s = e_utf8_to_gtk_string (priv->delegated_from, attendee->delfrom);
-			gtk_label_set_text (GTK_LABEL (priv->delegated_from), s);
-			g_free (s);
-		}
-	}
-	cal_component_free_attendee_list (list);
-	
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the task page */
-static void
-task_details_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	struct icaltimetype icaltime;
-	GSList list;
-	CalComponentOrganizer organizer;
-	CalComponentAttendee attendee;
-	char *url;
-	gboolean date_set;
-	
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	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);
-
-	/* Delegation */
-	organizer.value = e_dialog_editable_get (priv->organizer);
-	organizer.sentby = NULL;
-	organizer.cn = NULL;
-	organizer.language = NULL;
-	cal_component_set_organizer (comp, &organizer);
-	attendee.value = e_dialog_editable_get (priv->delegated_to);
-	attendee.member = NULL;
-	attendee.cutype = CAL_COMPONENT_CUTYPE_INDIVIDUAL;
-	attendee.role = CAL_COMPONENT_ROLE_REQUIRED;
-	attendee.status = CAL_COMPONENT_PARTSTAT_NEEDSACTION;
-	attendee.rsvp = TRUE;
-	attendee.delto = e_dialog_editable_get (priv->delegated_to);
-	attendee.delfrom = NULL;
-	attendee.sentby = NULL;
-	attendee.cn = NULL;
-	attendee.language = NULL;
-	list.data = &attendee;
-	list.next = NULL;
-	cal_component_set_attendee_list (comp, &list);
-	g_free ((char *)organizer.value);
-	g_free ((char *)attendee.value);
-	g_free ((char *)attendee.delto);
-	g_free ((char *)attendee.delfrom);
-}
-
-/* set_summary handler for the task page */
-static void
-task_details_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	gchar *s;
-	
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	s = e_utf8_to_gtk_string (priv->summary, summary);
-	gtk_label_set_text (GTK_LABEL (priv->summary), s);
-	g_free (s);
-}
-
-static void
-task_details_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-	
-	priv->updating = TRUE;
-	
-	comp_editor_date_label (dates, priv->date_time);
-
-	if (dates->complete) {
-		if (icaltime_is_null_time (*dates->complete)) {
-			e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-		} else {
-			struct icaltimetype *tt = dates->complete;
-
-			/* Convert it from UTC to local time to display.
-			   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 (tt,
-						   icaltimezone_get_utc_timezone (),
-						   zone);
-
-			e_date_edit_set_date (E_DATE_EDIT (priv->completed_date),
-					      tt->year, tt->month, tt->day);
-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv->completed_date),
-						     tt->hour, tt->minute);
-		}
-	}
-	
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskDetailsPage *tdpage)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-details-page");
-	if (!priv->main)
-		return FALSE;
-
-	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
-
-	priv->summary = GW ("summary");
-	priv->date_time = GW ("date-time");
-
-	priv->completed_date = GW ("completed-date");
-
-	priv->url = GW ("url");
-
-	priv->organizer = GW ("organizer");
-	priv->organizer_lbl = GW ("organizer-label");
-	priv->delegated_to = GW ("delegated-to");
-	priv->delegated_to_lbl = GW ("delegated-to-label");
-	priv->delegated_from = GW ("delegated-from");
-	priv->delegated_from_lbl = GW ("delegated-from-label");
-
-#undef GW
-
-	return (priv->summary
-		&& priv->date_time
-		&& priv->completed_date
-		&& priv->url
-		&& priv->organizer
-		&& priv->organizer_lbl
-		&& priv->delegated_to
-		&& priv->delegated_to_lbl
-		&& priv->delegated_from
-		&& priv->delegated_from_lbl);
-}
-
-/* Callback used when the start or end date widgets change.  We check that the
- * start date < end date and we set the "all day task" button as appropriate.
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
-	CompEditorPageDates dates;
-	struct icaltimetype completed_tt = icaltime_null_time();
-	gboolean date_set;
-
-	tdpage = TASK_DETAILS_PAGE (data);
-	priv = tdpage->priv;
-
-	if (priv->updating)
-		return;
-
-	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);
-	if (!date_set)
-		completed_tt = icaltime_null_time ();
-
-	dates.start = NULL;
-	dates.end = NULL;
-	dates.due = NULL;
-	dates.complete = &completed_tt;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage), &dates);
-}
-
-/* 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);
-
-	/* 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);
-
-	/* Delegation */
-	gtk_signal_connect (GTK_OBJECT (priv->organizer), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tdpage);
-
-	gtk_signal_connect (GTK_OBJECT (priv->delegated_to), "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;
-}
-
-void
-task_details_page_show_delegation (TaskDetailsPage *tdpage, gboolean show)
-{
-	TaskDetailsPagePrivate *priv;
-
-	priv = tdpage->priv;
-
-	if (show) {
-		gtk_widget_show (priv->organizer);
-		gtk_widget_show (priv->organizer_lbl);
-		gtk_widget_show (priv->delegated_to);
-		gtk_widget_show (priv->delegated_to_lbl);
-		gtk_widget_show (priv->delegated_from);
-		gtk_widget_show (priv->delegated_from_lbl);
-		comp_editor_page_notify_needs_send (COMP_EDITOR_PAGE (tdpage));
-	} else {
-		gtk_widget_hide (priv->organizer);
-		gtk_widget_hide (priv->organizer_lbl);
-		gtk_widget_hide (priv->delegated_to);
-		gtk_widget_hide (priv->delegated_to_lbl);
-		gtk_widget_hide (priv->delegated_from);
-		gtk_widget_hide (priv->delegated_from_lbl);
-	}
-}
-
-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);
-	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 c92bd52b8f..0000000000
--- a/calendar/gui/dialogs/task-details-page.glade
+++ /dev/null
@@ -1,431 +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>frame1</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>table1</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>label15</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>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label16</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>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>date-time</name>
-	  <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>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>
-	  <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>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
-      <border_width>4</border_width>
-      <rows>5</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>GtkEntry</class>
-	<name>url</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>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>delegated-to</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>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>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>delegated-from-label</name>
-	<label>Delegated From:</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>delegated-to-label</name>
-	<label>Delegated To:</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>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>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>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>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>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>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>delegated-from</name>
-	<label>No one</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>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>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/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
deleted file mode 100644
index 01aae95d93..0000000000
--- a/calendar/gui/dialogs/task-details-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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-void             task_details_page_show_delegation (TaskDetailsPage *tdpage,
-						    gboolean         show);
-
-
-
-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 6e5a6f689e..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,237 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "recurrence-page.h"
-#include "cancel-comp.h"
-#include "task-editor.h"
-
-struct _TaskEditorPrivate {
-	TaskPage *task_page;
-	TaskDetailsPage *task_details_page;
-};
-
-
-
-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_destroy (GtkObject *object);
-
-static void delegate_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 BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ActionDelegateTask", delegate_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;
-
-	object_class->destroy = task_editor_destroy;
-}
-
-/* Object initialization function for the event 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),
-				 _("Task"));
-
-	priv->task_details_page = task_details_page_new ();
-	comp_editor_append_page (COMP_EDITOR (te),
-				 COMP_EDITOR_PAGE (priv->task_details_page),
-				 _("Details"));
-
-	comp_editor_merge_ui (COMP_EDITOR (te), EVOLUTION_DATADIR 
-			      "/gnome/ui/evolution-task-editor.xml",
-			      verbs);
-}
-
-static void
-task_editor_edit_comp (CompEditor *editor, CalComponent *comp)
-{
-	TaskEditor *te;
-	TaskEditorPrivate *priv;
-	GSList *attendees = NULL;
-	
-	te = TASK_EDITOR (editor);
-	priv = te->priv;
-	
-	cal_component_get_attendee_list (comp, &attendees);
-	if (attendees == NULL)
-		task_details_page_show_delegation (priv->task_details_page, FALSE);
-	else
-		task_details_page_show_delegation (priv->task_details_page, TRUE);
-	cal_component_free_attendee_list (attendees);
-
-	if (parent_class->edit_comp)
-		parent_class->edit_comp (editor, comp);
-}
-
-/* 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));
-	
-	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
-delegate_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-	TaskEditorPrivate *priv;
-
-	priv = te->priv;
-
-	task_details_page_show_delegation (priv->task_details_page, TRUE);
-	comp_editor_show_page (COMP_EDITOR (te),
-			       COMP_EDITOR_PAGE (priv->task_details_page));
-}
-
-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);
-	
-	comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_PUBLISH);
-}
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index 47644f482f..0000000000
--- a/calendar/gui/dialogs/task-editor.h
+++ /dev/null
@@ -1,62 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 *ee);
-TaskEditor *task_editor_new            (void);
-
-
-
-#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 e50f9f9681..0000000000
--- a/calendar/gui/dialogs/task-page.c
+++ /dev/null
@@ -1,1088 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/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 "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 *percent_complete;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-
-	GtkWidget *description;
-
-	GtkWidget *classification_public;
-	GtkWidget *classification_private;
-	GtkWidget *classification_confidential;
-
-	GtkWidget *contacts_btn;	
-	GtkWidget *contacts;
-
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	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 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 void 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->percent_complete = NULL;
-	priv->status = NULL;
-	priv->description = NULL;
-	priv->classification_public = NULL;
-	priv->classification_private = NULL;
-	priv->classification_confidential = NULL;
-	priv->contacts_btn = NULL;
-	priv->contacts = NULL;
-	priv->categories_btn = NULL;
-	priv->categories = NULL;
-
-	priv->updating = FALSE;
-}
-
-/* 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->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);
-
-	/* Status, priority, complete percent */
-	e_dialog_spin_set (priv->percent_complete, 0.0);
-	e_dialog_option_menu_set (priv->status, 0, status_map);
-	e_dialog_option_menu_set (priv->priority, 0, priority_map);
-	
-	/* Categories */
-	e_dialog_editable_set (priv->categories, NULL);
-}
-
-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;
-}
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-/* 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;
-	int *priority_value, *percent;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	const char *categories;
-	icaltimezone *zone;
-
-	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);
-
-	/* Due Date. */
-	cal_component_get_due (comp, &d);
-	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);
-		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);
-	}
-
-	/* 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. */
-	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);
-	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);
-		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);
-	}
-
-	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);
-
-
-	/* 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 user the percent value. */
-		if (percent) {
-			if (*percent == 0)
-				status = ICAL_STATUS_NEEDSACTION;
-			else if (*percent == 100)
-				status = ICAL_STATUS_COMPLETED;
-			else
-				status = ICAL_STATUS_INPROCESS;
-		} else
-			status = ICAL_STATUS_NEEDSACTION;
-	}
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	/* 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);
-
-
-	/* 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);
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_public,
-				    CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-	default:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-
-	/* Categories */
-	cal_component_get_categories (comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the task page */
-static void
-task_page_fill_component (CompEditorPage *page, CalComponent *comp)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CalComponentDateTime date;
-	struct icaltimetype icaltime;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	char *cat;
-	char *str;
-	gboolean date_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;
-
-	/* FIXME: We should use is_date at some point. */
-
-	/* Due Date. */
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	if (date_set) {
-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->due_timezone));
-		if (zone)
-			date.tzid = icaltimezone_get_tzid (zone);
-		cal_component_set_due (comp, &date);
-	} else {
-		cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_date),
-					 &icaltime.year,
-					 &icaltime.month,
-					 &icaltime.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-				     &icaltime.hour,
-				     &icaltime.minute);
-	if (date_set) {
-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
-		if (zone)
-			date.tzid = icaltimezone_get_tzid (zone);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		cal_component_set_dtstart (comp, NULL);
-	}
-
-	/* 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);
-
-	/* Classification. */
-	cal_component_set_classification (comp, classification_get (priv->classification_public));
-
-	/* Categories */
-	cat = e_dialog_editable_get (priv->categories);
-	cal_component_set_categories (comp, cat);
-
-	if (cat)
-		g_free (cat);
-}
-
-/* set_summary handler for the task page */
-static void
-task_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-
-	tpage = TASK_PAGE (page);
-	priv = tpage->priv;
-
-	priv->updating = TRUE;
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (priv->summary), summary);
-	priv->updating = FALSE;
-}
-
-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;
-	
-	if (dates->complete) {
-		if (icaltime_is_null_time (*dates->complete)) {
-			/* If the 'Completed Date' is set to 'None',
-			   we set the status to 'Not Started' and the
-			   percent-complete to 0.  The task may
-			   actually be partially-complete, but we
-			   leave it to the user to set those
-			   fields. */
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_NEEDSACTION,
-						  status_map);
-			e_dialog_spin_set (priv->percent_complete, 0);
-		} else {
-			e_dialog_option_menu_set (priv->status,
-						  ICAL_STATUS_COMPLETED,
-						  status_map);
-			e_dialog_spin_set (priv->percent_complete, 100);
-		}
-	}
-
-	priv->updating = FALSE;
-}
-
-
-
-/* Gets the widgets from the XML file and returns if they are all available. */
-static gboolean
-get_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	priv = tpage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("task-page");
-	if (!priv->main)
-		return FALSE;
-
-	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->percent_complete = GW ("percent-complete");
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-
-	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 = GW ("contacts");
-
-	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->percent_complete
-		&& priv->status
-		&& priv->priority
-		&& priv->classification_public
-		&& priv->classification_private
-		&& priv->classification_confidential
-		&& priv->description
-		&& priv->contacts_btn
-		&& priv->contacts
-		&& 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 = gtk_editable_get_chars (editable, 0, -1);
-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), 
-						 summary);
-	g_free (summary);
-}
-
-/* Callback used when the start or end date widgets change.  We check that the
- * start date < end date and we set the "all day task" button as appropriate.
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	TaskPage *tpage;
-	TaskPagePrivate *priv;
-	CompEditorPageDates dates;
-	gboolean date_set;
-	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);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_date),
-				     &start_tt.hour,
-				     &start_tt.minute);
-	if (!date_set)
-		start_tt = icaltime_null_time ();
-
-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date),
-					 &due_tt.year,
-					 &due_tt.month,
-					 &due_tt.day);
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->due_date),
-				     &due_tt.hour,
-				     &due_tt.minute);
-	if (!date_set)
-		due_tt = icaltime_null_time ();
-
-	dates.start = &start_tt;
-	dates.end = NULL;
-	dates.due = &due_tt;
-	dates.complete = NULL;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage),
-					       &dates);
-}
-
-/* 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));
-}
-
-static void
-complete_date_changed (TaskPage *tpage, gboolean complete)
-{
-	TaskPagePrivate *priv;
-	CompEditorPageDates dates;
-	icaltimezone *zone;
-	struct icaltimetype completed_tt = icaltime_null_time();
-
-	priv = tpage->priv;
-
-	/* Get the current time in UTC. */
-	zone = icaltimezone_get_utc_timezone ();
-	completed_tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-	completed_tt.is_utc = TRUE;
-
-	dates.start = NULL;
-	dates.end = NULL;
-	dates.due = NULL;	
-	dates.complete = &completed_tt;
-	
-	/* Notify upstream */
-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage),
-					       &dates);
-}
-
-static void
-status_changed (GtkMenu	*menu, TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-	icalproperty_status status;
-
-	priv = tpage->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);
-		complete_date_changed (tpage, FALSE);
-	} else if (status == ICAL_STATUS_INPROCESS) {
-		e_dialog_spin_set (priv->percent_complete, 50);
-		complete_date_changed (tpage, FALSE);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		complete_date_changed (tpage, TRUE);
-	}
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-static void
-percent_complete_changed (GtkAdjustment	*adj, TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	gboolean complete;
-
-	priv = tpage->priv;
-
-	if (priv->updating)
-		return;
-	
-	priv->updating = TRUE;
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	if (percent == 100) {
-		complete = TRUE;
-		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);
-	complete_date_changed (tpage, complete);
-
-	priv->updating = FALSE;
-
-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
-}
-
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskPage *tpage)
-{
-	TaskPagePrivate *priv;
-
-	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);
-
-	/* 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);
-
-	/* 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), tpage);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    GTK_SIGNAL_FUNC (percent_complete_changed), tpage);
-
-	/* Classification */
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	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 (GTK_OPTION_MENU (priv->priority)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->contacts), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-	gtk_signal_connect (GTK_OBJECT (priv->categories), "changed",
-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);
-
-	/* Button clicks */
-	gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked",
-			    GTK_SIGNAL_FUNC (categories_clicked_cb), tpage);
-
-	/* FIXME: we do not support these fields yet, so we disable them */
-
-	gtk_widget_set_sensitive (priv->contacts_btn, FALSE);
-	gtk_widget_set_sensitive (priv->contacts, FALSE);
-}
-
-
-
-/**
- * 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;
-	}
-
-	init_widgets (tpage);
-
-	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);
-	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 0c54bb80a9..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,594 +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>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label5</name>
-	    <label>_Due Date:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>due-date</name>
-	    <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>
-	    <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>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>
-      <class>GtkFrame</class>
-      <name>frame23</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>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label7</name>
-	  <label>_Status:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>status</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>status</name>
-	  <can_focus>True</can_focus>
-	  <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label>_Priority:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>priority</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>priority</name>
-	  <can_focus>True</can_focus>
-	  <items>High
-Normal
-Low
-Undefined
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label9</name>
-	  <label>% Comp_lete:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>percent-complete</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>percent-complete</name>
-	  <width>60</width>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>10</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</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>_Confidential</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <group>classification_radio_group</group>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <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>GtkEntry</class>
-	<name>contacts</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>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 cc56892c5b..0000000000
--- a/calendar/gui/dialogs/task-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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 e24f1d3d2b..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,1262 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <widgets/misc/e-cell-date-edit.h>
-#include "e-calendar-table.h"
-#include "calendar-config.h"
-#include "calendar-model.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_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 gint e_calendar_table_on_key_press	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEventKey	*event,
-						 ECalendarTable *cal_table);
-
-static void e_calendar_table_apply_filter	(ECalendarTable	*cal_table);
-static void e_calendar_table_on_model_changed	(ETableModel	*model,
-						 ECalendarTable	*cal_table);
-static void e_calendar_table_on_rows_inserted	(ETableModel	*model,
-						 int		 row,
-						 int		 count,
-						 ECalendarTable	*cal_table);
-static void e_calendar_table_on_rows_deleted	(ETableModel	*model,
-						 int		 row,
-						 int		 count,
-						 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);
-
-
-/* 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.
- */
-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. */
-		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 void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETable *e_table;
-	ECell *cell, *popup_cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_TABLE_COLOR_LAST];
-	gint nfailed;
-	GList *strings;
-
-	/* Allocate the colors we need. */
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal_table));
-
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].red   = 65535;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].green = 0;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, cal_table->colors,
-					     E_CALENDAR_TABLE_COLOR_LAST,
-					     FALSE, TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-	/* Create the model */
-
-	cal_table->model = calendar_model_new ();
-	cal_table->subset_model = e_table_subset_variable_new (E_TABLE_MODEL (cal_table->model));
-
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_changed",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_model_changed),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_rows_inserted",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_rows_inserted),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_rows_deleted",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_rows_deleted),
-			    cal_table);
-
-	/* 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_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, _("None"));
-	strings = g_list_append (strings, _("Public"));
-	strings = g_list_append (strings, _("Private"));
-	strings = g_list_append (strings, _("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, _("High"));
-	strings = g_list_append (strings, _("Normal"));
-	strings = g_list_append (strings, _("Low"));
-	strings = g_list_append (strings, _("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_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_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, _("0%"));
-	strings = g_list_append (strings, _("10%"));
-	strings = g_list_append (strings, _("20%"));
-	strings = g_list_append (strings, _("30%"));
-	strings = g_list_append (strings, _("40%"));
-	strings = g_list_append (strings, _("50%"));
-	strings = g_list_append (strings, _("60%"));
-	strings = g_list_append (strings, _("70%"));
-	strings = g_list_append (strings, _("80%"));
-	strings = g_list_append (strings, _("90%"));
-	strings = g_list_append (strings, _("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, _("None"));
-	strings = g_list_append (strings, _("Opaque"));
-	strings = g_list_append (strings, _("Transparent"));
-	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, _("Not Started"));
-	strings = g_list_append (strings, _("In Progress"));
-	strings = g_list_append (strings, _("Completed"));
-	strings = g_list_append (strings, _("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);
-
-	/* 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 (cal_table->subset_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;
-
-	gtk_object_unref (GTK_OBJECT (cal_table->subset_model));
-	cal_table->subset_model = NULL;
-
-	if (cal_table->invisible)
-		gtk_widget_destroy (cal_table->invisible);
-	if (cal_table->clipboard_selection)
-		g_free (cal_table->clipboard_selection);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-void
-e_calendar_table_set_cal_client (ECalendarTable *cal_table,
-				 CalClient	*client)
-{
-	calendar_model_set_cal_client (cal_table->model, client,
-				       CALOBJ_TYPE_TODO);
-}
-
-/**
- * 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));
-}
-
-/* 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));
-	g_assert (e_table_selected_count (etable) == 1);
-
-	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);
-
-	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);
-	}
-
-	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);
-	g_assert (n_selected > 0);
-
-	if (n_selected == 1)
-		comp = get_selected_comp (cal_table);
-	else
-		comp = NULL;
-
-	if (delete_component_dialog (comp, 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 = icalcomponent_new_from_string (comp_str);
-	icalcomponent_add_component (cal_table->tmp_vcal, 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;
-	
-	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);
-
-	cal_table->clipboard_selection = icalcomponent_as_ical_string (cal_table->tmp_vcal);
-	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)
-{
-	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);
-	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);
-}
-
-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);
-}
-
-static GnomeUIInfo tasks_popup_one[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("Edit this task"), NULL, e_calendar_table_on_open_task),
-	GNOMEUIINFO_ITEM_NONE (N_("Cut"), NULL, e_calendar_table_on_cut),
-	GNOMEUIINFO_ITEM_NONE (N_("Copy"), NULL, e_calendar_table_on_copy),
-	GNOMEUIINFO_ITEM_NONE (N_("Paste"), NULL, e_calendar_table_on_paste),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("Mark as complete"), NULL, mark_as_complete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("Delete this task"), NULL, delete_cb),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tasks_popup_many[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("Cut"), NULL, e_calendar_table_on_cut),
-	GNOMEUIINFO_ITEM_NONE (N_("Copy"), NULL, e_calendar_table_on_copy),
-	GNOMEUIINFO_ITEM_NONE (N_("Paste"), NULL, e_calendar_table_on_paste),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("Mark tasks as complete"), NULL, mark_as_complete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("Delete selected tasks"), NULL, delete_cb),
-	GNOMEUIINFO_END
-};
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEventButton *event,
-				 ECalendarTable *cal_table)
-{
-	GtkWidget *popup_menu;
-	int n_selected;
-
-	n_selected = e_table_selected_count (table);
-	g_assert (n_selected > 0);
-
-	if (n_selected == 1)
-		popup_menu = gnome_popup_menu_new (tasks_popup_one);
-	else
-		popup_menu = gnome_popup_menu_new (tasks_popup_many);
-
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event, cal_table);
-	gtk_widget_destroy (popup_menu);
-
-	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);
-	open_task (cal_table, comp);
-}
-
-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 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);
-}
-
-
-void
-e_calendar_table_set_filter_func	(ECalendarTable *cal_table,
-					 ECalendarTableFilterFunc filter_func,
-					 gpointer	 filter_data,
-					 GDestroyNotify  filter_data_destroy)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (cal_table->filter_func == filter_func
-	    && cal_table->filter_data == filter_data
-	    && cal_table->filter_data_destroy == filter_data_destroy)
-		return;
-
-	if (cal_table->filter_data_destroy)
-		(*cal_table->filter_data_destroy) (cal_table->filter_data);
-
-	cal_table->filter_func = filter_func;
-	cal_table->filter_data = filter_data;
-	cal_table->filter_data_destroy = filter_data_destroy;
-
-	e_calendar_table_apply_filter (cal_table);
-}
-
-
-static void
-e_calendar_table_apply_filter		(ECalendarTable	*cal_table)
-{
-	ETableSubsetVariable *etssv;
-	CalComponent *comp;
-	gint rows, row;
-
-	etssv = E_TABLE_SUBSET_VARIABLE (cal_table->subset_model);
-
-	/* Make sure that any edits get saved first. */
-	e_table_model_pre_change (cal_table->subset_model);
-
-	/* FIXME: A hack to remove all the existing rows quickly. */
-	E_TABLE_SUBSET (cal_table->subset_model)->n_map = 0;
-
-	if (cal_table->filter_func == NULL) {
-		e_table_subset_variable_add_all (etssv);
-	} else {
-		rows = e_table_model_row_count (E_TABLE_MODEL (cal_table->model));
-		for (row = 0; row < rows; row++) {
-			comp = calendar_model_get_component (cal_table->model,
-							     row);
-
-			if ((*cal_table->filter_func) (cal_table, comp,
-						       cal_table->filter_data))
-				e_table_subset_variable_add (etssv, row);
-		}
-	}
-
-	e_table_model_changed (cal_table->subset_model);
-}
-
-
-gboolean
-e_calendar_table_filter_by_category  (ECalendarTable	*cal_table,
-				      CalComponent	*comp,
-				      gpointer		 filter_data)
-{
-	GSList *categories_list, *elem;
-	gboolean retval = FALSE;
-
-	cal_component_get_categories_list (comp, &categories_list);
-
-	for (elem = categories_list; elem; elem = elem->next) {
-		if (retval == FALSE
-		    && !strcmp ((char*) elem->data, (char*) filter_data))
-			retval = TRUE;
-		g_free (elem->data);
-	}
-
-	g_slist_free (categories_list);
-
-	return retval;
-}
-
-
-static void
-e_calendar_table_on_model_changed	(ETableModel	*model,
-					 ECalendarTable	*cal_table)
-{
-	e_calendar_table_apply_filter (cal_table);
-}
-
-
-static void
-e_calendar_table_on_rows_inserted	(ETableModel	*model,
-					 int		 row,
-					 int		 count,
-					 ECalendarTable	*cal_table)
-{
-	int i;
-
-	for (i = 0; i < count; i++) {
-		gboolean add_row;
-
-		add_row = FALSE;
-
-		if (cal_table->filter_func) {
-			CalComponent *comp;
-
-			comp = calendar_model_get_component (cal_table->model, row + i);
-			g_assert (comp != NULL);
-
-			add_row = (* cal_table->filter_func) (cal_table, comp,
-							      cal_table->filter_data);
-		} else
-			add_row = TRUE;
-
-		if (add_row) {
-			ETableSubsetVariable *etssv;
-
-			etssv = E_TABLE_SUBSET_VARIABLE (cal_table->subset_model);
-
-			e_table_subset_variable_increment (etssv, row, 1);
-			e_table_subset_variable_add (etssv, row);
-		}
-	}
-}
-
-
-static void
-e_calendar_table_on_rows_deleted	(ETableModel	*model,
-					 int		 row,
-					 int		 count,
-					 ECalendarTable	*cal_table)
-{
-	/* We just reapply the filter since we aren't too bothered about
-	   being efficient. It doesn't happen often. */
-	e_calendar_table_apply_filter (cal_table);
-}
-
-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;
-
-	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;
-	}
-
-	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));
-}
-
-
-/* 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 here 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 0b759a1580..0000000000
--- a/calendar/gui/e-calendar-table.etspec
+++ /dev/null
@@ -1,26 +0,0 @@
-<ETableSpecification click-to-add="true" _click-to-add-message="Click here 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"/>
-  <ETableColumn model_col= "2" _title="Completion Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Due Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="string"/>
-  <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="string"/>
-  <ETableColumn model_col= "8" _title="Priority" expansion="1.0" minimum_width="10" resizable="true" cell="priority" compare="string"/>
-  <ETableColumn model_col= "9" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/>
-  <ETableColumn model_col="10" _title="Transparency" expansion="1.0" minimum_width="10" resizable="true" cell="transparency" compare="string"/>
-  <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"/>
-  <ETableColumn model_col="13" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer"/>
-  <ETableColumn model_col="14" pixbuf="complete" _title="Complete" expansion="1.0" minimum_width="16" resizable="false" cell="checkbox" compare="integer"/>
-  <ETableColumn model_col="18" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="string"/>
-  <ETableColumn model_col="19" _title="Task sort" cell="task-sort" compare="task-sort"/>
-
-  <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 5ab32f3c18..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,136 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.
- */
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_TABLE_COLOR_OVERDUE,
-	
-	E_CALENDAR_TABLE_COLOR_LAST
-} ECalendarTableColors;
-
-
-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())
-
-
-typedef struct _ECalendarTable       ECalendarTable;
-typedef struct _ECalendarTableClass  ECalendarTableClass;
-
-
-typedef gboolean (*ECalendarTableFilterFunc)	(ECalendarTable *cal_table,
-						 CalComponent   *comp,
-						 gpointer	 data);
-
-struct _ECalendarTable
-{
-	GtkTable table;
-
-	/* This is the underlying model which contains all the tasks/events. */
-	CalendarModel *model;
-
-	/* This is the model that we use when filtering the tasks/events. */
-	ETableModel *subset_model;
-	
-	GtkWidget *etable;
-	
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];
-
-	/* Data for filtering the Tasks. */
-	ECalendarTableFilterFunc filter_func;
-	gpointer filter_data;
-	GDestroyNotify filter_data_destroy;
-
-	/* 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);
-
-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,
-						 CalClient	*client);
-
-ETable *e_calendar_table_get_table (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);
-
-void	   e_calendar_table_set_filter_func	(ECalendarTable *cal_table,
-						 ECalendarTableFilterFunc filter_func,
-						 gpointer	 filter_data,
-						 GDestroyNotify  filter_data_destroy);
-gboolean   e_calendar_table_filter_by_category  (ECalendarTable *cal_table,
-						 CalComponent	*comp,
-						 gpointer	 filter_data);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
deleted file mode 100644
index 00a448d7ec..0000000000
--- a/calendar/gui/e-day-view-layout.c
+++ /dev/null
@@ -1,349 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-
-	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;
-
-	/* 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 353d024e3c..0000000000
--- a/calendar/gui/e-day-view-layout.h
+++ /dev/null
@@ -1,57 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 79ee0b0826..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,735 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	grid_x = day_view->day_offsets[day] + 1 - x;
-
-	/* Draw the busy times corresponding to the events in the day. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* We can skip the events in the first column since they will
-		   draw over this anyway. */
-		if (event->num_columns > 0 && event->start_row_or_col == 0)
-			continue;
-
-		bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
-		bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
-		bar_y -= y;
-
-		/* Skip it if it isn't visible. */
-		if (bar_y >= height || bar_y + bar_h <= 0)
-			continue;
-
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    grid_x, bar_y,
-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_h);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-						GdkDrawable *drawable,
-						int x, int y,
-						int width, int height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x;
-	GdkGC *gc;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (!e_day_view_find_long_event_days (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;
-
-	day_view = dvmitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == day
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	style = GTK_WIDGET (day_view)->style;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	/* Get the position of the event. If it is not shown skip it.*/
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h))
-		return;
-
-	item_x -= x;
-	item_y -= y;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Fill in the white background. Note that for events in the first
-	   column of the day, we might not want to paint over the vertical bar,
-	   since that is used for multiple events. But then you can't see
-	   where the event in the first column finishes. */
-#if 0
-	if (event->start_row_or_col == 0)
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + E_DAY_VIEW_BAR_WIDTH, item_y + 1,
-				    MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1, 0),
-				    item_h - 2);
-	else
-#endif
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + 1, item_y + 1,
-				    MAX (item_w - 2, 0), item_h - 2);
-
-	/* Draw the right edge of the vertical bar. */
-	gdk_draw_line (drawable, style->black_gc,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + 1,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + item_h - 2);
-
-	/* Draw the vertical colored bar showing when the appointment
-	   begins & ends. */
-	bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-	bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-
-	/* When an item is being resized, we fill the bar up to the new row. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			bar_y1 = item_y + 1;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			bar_y2 = item_y + item_h - 1;
-	}
-
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    item_x + 1, bar_y1,
-			    E_DAY_VIEW_BAR_WIDTH - 2, bar_y2 - bar_y1);
-
-	/* Draw the box around the entire event. Do this after drawing
-	   the colored bar so we don't have to worry about being 1
-	   pixel out. */
-	gdk_draw_rectangle (drawable, style->black_gc, FALSE,
-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);
-
-#if 0
-	/* Draw the horizontal bars above and beneath the event if it
-	   is currently being edited. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num) {
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x,
-				    item_y - E_DAY_VIEW_BAR_HEIGHT,
-				    item_w,
-				    E_DAY_VIEW_BAR_HEIGHT);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x, item_y + item_h,
-				    item_w, E_DAY_VIEW_BAR_HEIGHT);
-	}
-#endif
-
-	/* Draw the reminder & recurrence icons, if needed. */
-	num_icons = 0;
-	draw_reminder_icon = FALSE;
-	draw_recurrence_icon = FALSE;
-	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 (!cal_component_compare_event_timezone (comp, day_view->zone)) {
-		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;
-			GdkBitmap *mask;
-
-			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);
-			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));
-
-			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 9a57392870..0000000000
--- a/calendar/gui/e-day-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 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_MAIN_ITEM_H_
-#define _E_DAY_VIEW_MAIN_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#define E_DAY_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_main_item_get_type (), EDayViewMainItem))
-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_main_item_get_type ()))
-#define E_IS_DAY_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewMainItemClass;
-
-
-GtkType  e_day_view_main_item_get_type      (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
deleted file mode 100644
index 62afbf2407..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,660 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 54b5a14f4c..0000000000
--- a/calendar/gui/e-day-view-time-item.h
+++ /dev/null
@@ -1,75 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 10b1cd0b13..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,690 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 + 1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 2 - y,
-		       left_edge + 1 - x, item_height - 1 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       left_edge + 2 - 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 - 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;
-		GdkBitmap *mask;
-
-		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);
-			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;
-		}
-	}
-
-	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 3fed29aebb..0000000000
--- a/calendar/gui/e-day-view-top-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 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TOP_ITEM_H_
-#define _E_DAY_VIEW_TOP_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#define E_DAY_VIEW_TOP_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_top_item_get_type (), EDayViewTopItem))
-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_top_item_get_type ()))
-#define E_IS_DAY_VIEW_TOP_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_top_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewTopItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTopItemClass;
-
-
-GtkType  e_day_view_top_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
deleted file mode 100644
index d46d941c2b..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,6711 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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-popup-menu.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "cal-util/timeutil.h"
-#include "dialogs/delete-comp.h"
-#include "comp-util.h"
-#include "calendar-commands.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"
-
-/* 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
-
-
-/* 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_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_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 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;
-
-	/* 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;
-
-	/* 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;
-
-	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;
-
-	/* 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;
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_day_view_on_canvas_realized (GtkWidget *widget,
-			       EDayView *day_view)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/**
- * e_day_view_new:
- * @Returns: a new #EDayView.
- *
- * Creates a new #EDayView.
- **/
-GtkWidget *
-e_day_view_new (void)
-{
-	GtkWidget *day_view;
-
-	day_view = GTK_WIDGET (gtk_type_new (e_day_view_get_type ()));
-
-	return day_view;
-}
-
-
-static void
-e_day_view_destroy (GtkObject *object)
-{
-	EDayView *day_view;
-	gint day;
-
-	day_view = E_DAY_VIEW (object);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	if (day_view->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);
-
-	gdk_cursor_destroy (day_view->normal_cursor);
-	gdk_cursor_destroy (day_view->move_cursor);
-	gdk_cursor_destroy (day_view->resize_width_cursor);
-	gdk_cursor_destroy (day_view->resize_height_cursor);
-
-	e_day_view_free_events (day_view);
-	g_array_free (day_view->long_events, TRUE);
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		g_array_free (day_view->events[day], TRUE);
-
-	if (day_view->invisible)
-		gtk_widget_destroy (day_view->invisible);
-	if (day_view->clipboard_selection)
-		g_free (day_view->clipboard_selection);
-
-	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   = 148 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].green = 149 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].blue  = 148 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].red   = 148 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].green = 149 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].blue  = 148 * 257;
-
-	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);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_day_view_check_layout (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Callback used when 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 */
-
-	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 */
-
-	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 g_strdup ("#f");
-
-	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)
-{
-	char *real_sexp;
-
-	e_day_view_free_events (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	if (!(day_view->client
-	      && cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	if (day_view->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->query), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->query));
-	}
-
-	g_assert (day_view->sexp != NULL);
-	real_sexp = adjust_query_sexp (day_view, day_view->sexp);
-
-	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);
-}
-
-
-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_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		day_view->editing_event_day = -1;
-
-	if (event->canvas_item)
-		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		g_array_remove_index (day_view->long_events, event_num);
-		day_view->long_events_need_layout = TRUE;
-	} else {
-		g_array_remove_index (day_view->events[day], event_num);
-		day_view->need_layout[day] = TRUE;
-	}
-	return TRUE;
-}
-
-
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text, *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_num == -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_copy_clipboard (day_view);
-	cal_component_get_uid (event->comp, &uid);
-	cal_client_remove_object (day_view->client, uid);
-}
-
-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 (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, -1);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_convert_event_coords (EDayView *day_view,
-				 GdkEvent *event,
-				 GdkWindow *window,
-				 gint *x_return,
-				 gint *y_return)
-{
-	gint event_x, event_y, win_x, win_y;
-	GdkWindow *event_window;;
-
-	/* Get the event window, x & y from the appropriate event struct. */
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		event_x = event->button.x;
-		event_y = event->button.y;
-		event_window = event->button.window;
-		break;
-	case GDK_MOTION_NOTIFY:
-		event_x = event->motion.x;
-		event_y = event->motion.y;
-		event_window = event->motion.window;
-		break;
-	default:
-		/* Shouldn't get here. */
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
-		gdk_window_get_position (event_window, &win_x, &win_y);
-		event_x += win_x;
-		event_y += win_y;
-		event_window = gdk_window_get_parent (event_window);
-	}
-
-	*x_return = event_x;
-	*y_return = event_y;
-
-	if (event_window != window)
-		g_warning ("Couldn't find event window\n");
-
-	return (event_window == window) ? TRUE : FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-					GdkEventButton *event,
-					EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, row, day, event_num;
-	EDayViewPosition pos;
-
-	/* Handle scroll wheel events */
-	if (event->button == 4) {
-		/* 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 (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, row);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_on_time_canvas_button_press (GtkWidget      *widget,
-					GdkEventButton *event,
-					EDayView       *day_view)
-{
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_long_event_button_press (EDayView		*day_view,
-				       gint		 event_num,
-				       GdkEventButton	*event,
-				       EDayViewPosition  pos,
-				       gint		 event_x,
-				       gint		 event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_long_event_click (day_view, event_num,
-							event, pos,
-							event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, -1,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 E_DAY_VIEW_LONG_EVENT,
-						 event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_event_button_press (EDayView	  *day_view,
-				  gint		   day,
-				  gint		   event_num,
-				  GdkEventButton  *event,
-				  EDayViewPosition pos,
-				  gint		   event_x,
-				  gint		   event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_event_click (day_view, day, event_num,
-						   event, pos,
-						   event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, day,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 day, event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_long_event_click (EDayView *day_view,
-				gint event_num,
-				GdkEventButton  *bevent,
-				EDayViewPosition pos,
-				gint	     event_x,
-				gint	     event_y)
-{
-	EDayViewEvent *event;
-	gint start_day, end_day, day;
-	gint item_x, item_y, item_w, item_h;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_LEFT_EDGE
-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (event,
-						      day_view->days_shown,
-						      day_view->day_starts,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_long_event_rect_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-
-
-static void
-e_day_view_on_event_click (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   GdkEventButton  *bevent,
-			   EDayViewPosition pos,
-			   gint		  event_x,
-			   gint		  event_y)
-{
-	EDayViewEvent *event;
-	gint tmp_day, row, start_row;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_TOP_EDGE
-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = day;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = event->start_minute / day_view->mins_per_row;
-			day_view->resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-			day_view->resize_bars_event_day = day;
-			day_view->resize_bars_event_num = event_num;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_rect_item (day_view);
-
-			e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_rect_item);
-			gnome_canvas_item_raise_to_top (day_view->resize_bar_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-
-	} else {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = day;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_main_canvas (day_view,
-							    event_x, event_y,
-							    &tmp_day, &row,
-							    NULL);
-		start_row = event->start_minute / day_view->mins_per_row;
-		day_view->drag_event_offset = row - start_row;
-	}
-}
-
-
-static void
-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
-{
-	gint day, event_num, start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_long_event_position (day_view, event_num,
-						    &start_day, &end_day,
-						    &item_x, &item_y,
-						    &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_long_event_rect_item);
-}
-
-
-static void
-e_day_view_reshape_resize_rect_item (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_event_position (day_view, day, event_num,
-					       &item_x, &item_y,
-					       &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "x1", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_rect_item);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_bar_item);
-}
-
-
-static void
-e_day_view_on_event_double_click (EDayView *day_view,
-				  gint day,
-				  gint event_num)
-{
-}
-
-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 [] = {
-	{ N_("Paste"), NULL,
-	  e_day_view_on_paste, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, 0 },
-
-	{ N_("New Appointment"), NULL,
-	  e_day_view_on_new_appointment, NULL, 0 },
-	{ N_("New All Day Event"), NULL,
-	  e_day_view_on_new_event, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, 0 },
-
-	{ N_("Go to Today"), NULL,
-	  e_day_view_on_goto_today, NULL, 0 },
-	{ N_("Go to Date..."), NULL,
-	  e_day_view_on_goto_date, NULL, 0 },
-
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-static EPopupMenu child_items [] = {
-	{ N_("Open"), NULL,
-	  e_day_view_on_edit_appointment, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("Delete this Appointment"), NULL,
-	  e_day_view_on_delete_appointment, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("Cut"), NULL,
-	  e_day_view_on_cut, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("Copy"), NULL,
-	  e_day_view_on_copy, NULL, 0 },
-	{ N_("Paste"), NULL,
-	  e_day_view_on_paste, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, MASK_SINGLE},
-
-	/*
-	 * The following are only shown if this is a recurring event
-	 */
-	{ "", NULL, NULL, NULL, MASK_SINGLE},
-	{ N_("Make this Occurrence Movable"), NULL,
-	  e_day_view_on_unrecur_appointment, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete this Occurrence"), NULL,
-	  e_day_view_on_delete_occurrence, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete all Occurrences"), NULL,
-	  e_day_view_on_delete_appointment, NULL, MASK_RECURRING | MASK_EDITING },
-	
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-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;
-	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)
-		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;
-
-	e_popup_menu_run (context_menu, (GdkEvent *) bevent, disable_mask, hide_mask, day_view);
-}
-
-static void
-e_day_view_on_new_appointment (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, 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);
-}
-
-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);
-	else
-		g_warning ("Calendar not set");
-}
-
-
-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_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponentVType vtype;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	if (day_view->editing_event_day >= 0)
-		e_day_view_stop_editing_event (day_view);
-
-	vtype = cal_component_get_vtype (event->comp);
-
-	if (delete_component_dialog (event->comp, 1, vtype, widget)) {
-		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_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) {
-		e_day_view_finish_long_event_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_update_calendar_selection_time (EDayView *day_view)
-{
-	time_t start, end;
-
-	e_day_view_get_selected_time_range (day_view, &start, &end);
-
-#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))
-		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))
-		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 = -1;
-	event.num_columns = -1;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start >= day_view->day_starts[day]
-		    && end <= day_view->day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == day_view->day_starts[day + 1]) {
-
-				/* If the event last the entire day, then we
-				   skip it here so it gets added to the top
-				   canvas. */
-				if (start == day_view->day_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (day_view->events[day], event);
-			day_view->events_sorted[day] = FALSE;
-			day_view->need_layout[day] = TRUE;
-			return TRUE;
-		}
-	}
-
-	/* The event wasn't within one day so it must be a long event,
-	   i.e. shown in the top canvas. */
-	g_array_append_val (day_view->long_events, event);
-	day_view->long_events_sorted = FALSE;
-	day_view->long_events_need_layout = TRUE;
-	return TRUE;
-}
-
-
-/* This lays out the short (less than 1 day) events in the columns.
-   Any long events are simply skipped. */
-void
-e_day_view_check_layout (EDayView *day_view)
-{
-	gint day, 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 (!cal_component_compare_event_timezone (comp,
-							   day_view->zone))
-			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;
-	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 (!cal_component_compare_event_timezone (comp,
-								   day_view->zone))
-				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 dt;
-	struct icaltimetype itt;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-	keyval = event->keyval;
-
-	/* The Escape key aborts a resize operation. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (keyval == GDK_Escape) {
-			e_day_view_abort_resize (day_view, event->time);
-		}
-		return FALSE;
-	}
-
-	/* Handle the cursor keys for moving & extending the selection. */
-	stop_emission = TRUE;
-	if (event->state & GDK_SHIFT_MASK) {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up_shifted (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down_shifted (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left_shifted (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right_shifted (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	} else {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right (day_view, event);
-			break;
-		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->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		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_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	dt.value = &itt;
-	dt.tzid = icaltimezone_get_tzid (day_view->zone);
-
-	*dt.value = icaltime_from_timet_with_zone (dtstart, FALSE,
-						   day_view->zone);
-	cal_component_set_dtstart (comp, &dt);
-
-	*dt.value = icaltime_from_timet_with_zone (dtend, FALSE,
-						   day_view->zone);
-	cal_component_set_dtend (comp, &dt);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_day_view_add_event (comp, dtstart, dtend, day_view);
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		e_day_view_start_editing_event (day_view, day, event_num,
-						initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	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);
-}
-
-
-static gboolean
-e_day_view_on_text_item_event (GnomeCanvasItem *item,
-			       GdkEvent *event,
-			       EDayView *day_view)
-{
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing)
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in)
-			e_day_view_on_editing_started (day_view, item);
-		else
-			e_day_view_on_editing_stopped (day_view, item);
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_editing_started (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-
-	if (!e_day_view_find_event_from_item (day_view, item,
-					      &day, &event_num))
-		return;
-
-#if 0
-	g_print ("In e_day_view_on_editing_started Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* FIXME: This is a temporary workaround for a bug which seems to stop
-	   us getting focus_out signals. It is not a complete fix since if we
-	   don't get focus_out signals we don't save the appointment text so
-	   this may be lost. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	day_view->editing_event_day = day;
-	day_view->editing_event_num = event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		day_view->resize_bars_event_day = day;
-		day_view->resize_bars_event_num = event_num;
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-	}
-}
-
-
-static void
-e_day_view_on_editing_stopped (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-	gboolean editing_long_event = FALSE;
-	EDayViewEvent *event;
-	gchar *text = NULL;
-	CalComponentText summary;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-#if 0
-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* If no item is being edited, just return. */
-	if (day == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		editing_long_event = TRUE;
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* Hide the horizontal bars. */
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-
-	/* Reset the edit fields. */
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		return;
-	}
-
-	if (text) {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		g_free (text);
-	} else
-		cal_component_set_summary (event->comp, NULL);
-
-	if (!cal_client_update_object (day_view->client, event->comp))
-		g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-/* FIXME: It is possible that we may produce an invalid time due to daylight
-   saving times (i.e. when clocks go forward there is a range of time which
-   is not valid). I don't know the best way to handle daylight saving time. */
-static time_t
-e_day_view_convert_grid_position_to_time (EDayView *day_view,
-					  gint col,
-					  gint row)
-{
-	struct 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;
-	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;
-
-		cal_component_get_summary (event->comp, &summary);
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_long_event_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_item);
-		gnome_canvas_item_show (day_view->drag_long_event_item);
-
-		g_free (text);
-	}
-}
-
-
-static gint
-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-				       GdkDragContext *context,
-				       gint            x,
-				       gint            y,
-				       guint           time,
-				       EDayView	      *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_main_canvas_drag_item (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	e_day_view_check_auto_scroll (day_view, x, y);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day, row;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,
-							  &day, &row, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day != -1
-	    && day_view->drag_event_day != E_DAY_VIEW_LONG_EVENT)
-		row -= day_view->drag_event_offset;
-	row = MAX (row, 0);
-
-	e_day_view_update_main_canvas_drag (day_view, row, day);
-}
-
-
-static void
-e_day_view_update_main_canvas_drag (EDayView *day_view,
-				    gint row,
-				    gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && day_view->drag_last_row == row
-	    && (day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-	day_view->drag_last_row = row;
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	cols_in_row = 1;
-	start_row = 0;
-	start_col = 0;
-	num_columns = 1;
-	num_rows = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-		start_row = event->start_minute / day_view->mins_per_row;
-		end_row = (event->end_minute - 1) / day_view->mins_per_row;
-		num_rows = end_row - start_row + 1;
-	}
-
-	if (day_view->drag_event_day == day && start_row == row) {
-		cols_in_row = day_view->cols_per_row[day][row];
-		start_col = event->start_row_or_col;
-		num_columns = event->num_columns;
-	}
-
-	item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->row_height;
-	item_h = num_rows * day_view->row_height;
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_item,
-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);
-
-	if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_bar_item);
-		gnome_canvas_item_show (day_view->drag_bar_item);
-	}
-
-	if (!(day_view->drag_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_rect_item);
-		gnome_canvas_item_show (day_view->drag_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_item);
-		gnome_canvas_item_show (day_view->drag_item);
-
-		g_free (text);
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-				     GdkDragContext *context,
-				     guint           time,
-				     EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-	/* Hide the resize bars if they are being used in the drag. */
-	if (day_view->drag_event_day == day_view->resize_bars_event_day
-	    && day_view->drag_event_num == day_view->resize_bars_event_num) {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-}
-
-
-static void
-e_day_view_on_drag_begin (GtkWidget      *widget,
-			  GdkDragContext *context,
-			  EDayView	 *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	/* Hide the text item, since it will be shown in the special drag
-	   items. */
-	gnome_canvas_item_hide (event->canvas_item);
-}
-
-
-static void
-e_day_view_on_drag_end (GtkWidget      *widget,
-			GdkDragContext *context,
-			EDayView       *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* If the calendar has already been updated in drag_data_received()
-	   we just return. */
-	if (day == -1 || event_num == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-
-	/* Show the text item again. */
-	gnome_canvas_item_show (event->canvas_item);
-
-	day_view->drag_event_day = -1;
-	day_view->drag_event_num = -1;
-}
-
-
-static void
-e_day_view_on_drag_data_get (GtkWidget          *widget,
-			     GdkDragContext     *context,
-			     GtkSelectionData   *selection_data,
-			     guint               info,
-			     guint               time,
-			     EDayView		*day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *event_uid;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-
-	cal_component_get_uid (event->comp, &event_uid);
-
-	g_return_if_fail (event_uid != NULL);
-
-	if (info == TARGET_CALENDAR_EVENT) {
-		gtk_selection_data_set (selection_data,	selection_data->target,
-					8, event_uid, strlen (event_uid));
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
-					      GdkDragContext     *context,
-					      gint                x,
-					      gint                y,
-					      GtkSelectionData   *data,
-					      guint               info,
-					      guint               time,
-					      EDayView	         *day_view)
-{
-	EDayViewEvent *event=NULL;
-	EDayViewPosition pos;
-	gint day, start_day, end_day, num_days;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_days = 1;
-			start_offset = 0;
-			end_offset = -1;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (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 if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow of the comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			/* FIXME: Should probably keep the timezone of the
-			   original start and end times. */
-			date.tzid = icaltimezone_get_tzid (day_view->zone);
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
-								     day_view->zone);
-			cal_component_set_dtstart (comp, &date);
-			if (end_offset == -1 || end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			*date.value = icaltime_from_timet_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))
-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "
-					   "not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
-					       GdkDragContext     *context,
-					       gint                x,
-					       gint                y,
-					       GtkSelectionData   *data,
-					       guint               info,
-					       guint               time,
-					       EDayView		  *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	x += scroll_x;
-	y += scroll_y;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_rows = 1;
-			start_offset = 0;
-			end_offset = 0;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-				row -= day_view->drag_event_offset;
-
-				/* Calculate time offset from start row. */
-				start_row = event->start_minute / day_view->mins_per_row;
-				end_row = (event->end_minute - 1) / day_view->mins_per_row;
-				num_rows = end_row - start_row + 1;
-
-				start_offset = event->start_minute % day_view->mins_per_row;
-				end_offset = event->end_minute % day_view->mins_per_row;
-				if (end_offset != 0)
-					end_offset = day_view->mins_per_row - end_offset;
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow copy of comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = 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))
-				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;
-	CalComponent *comp;
-	char *uid;
-
-	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) {
-		e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-		itime = icaltime_from_timet_with_zone (dtstart, FALSE,
-						       day_view->zone);
-		/* FIXME: Need to set TZID. */
-		icalcomponent_set_dtstart (icalcomp, itime);
-
-		itime = icaltime_from_timet_with_zone (dtend, FALSE,
-						       day_view->zone);
-		/* FIXME: Need to set TZID. */
-		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));
-	}
-}
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index bddc36b708..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,633 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_H_
-#define _E_DAY_VIEW_H_
-
-#include <time.h>
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-/* The maximum number of days shown. We use the week view for anything more
-   than about 9 days. */
-#define E_DAY_VIEW_MAX_DAYS		10
-
-/* This is used as a special code to signify a long event instead of the day
-   of a normal event. */
-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
-
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
-
-/* The width of the gap between appointments. This should be at least
-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
-   the triangle to represent continuing events. */
-#define E_DAY_VIEW_GAP_WIDTH		7
-
-/* The width of the bars down the left of each column and appointment.
-   This includes the borders on each side of it. */
-#define E_DAY_VIEW_BAR_WIDTH		7
-
-/* The height of the horizontal bar above & beneath the selected event.
-   This includes the borders on the top and bottom. */
-#define E_DAY_VIEW_BAR_HEIGHT		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_DAY_VIEW_ICON_WIDTH		16
-#define E_DAY_VIEW_ICON_HEIGHT		16
-#define E_DAY_VIEW_ICON_X_PAD		0
-#define E_DAY_VIEW_ICON_Y_PAD		0
-
-/* The size of the border around the event. */
-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_DAY_VIEW_EVENT_X_PAD		2
-#define E_DAY_VIEW_EVENT_Y_PAD		1
-
-/* The padding on each side of the event text for events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2
-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2
-
-/* The size of the border around the long events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1
-
-/* The space between the time and the icon/text in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2
-
-/* The gap between rows in the top canvas. */
-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	E_DAY_VIEW_SUNDAY	= 1 << 0,
-	E_DAY_VIEW_MONDAY	= 1 << 1,
-	E_DAY_VIEW_TUESDAY	= 1 << 2,
-	E_DAY_VIEW_WEDNESDAY	= 1 << 3,
-	E_DAY_VIEW_THURSDAY	= 1 << 4,
-	E_DAY_VIEW_FRIDAY	= 1 << 5,
-	E_DAY_VIEW_SATURDAY	= 1 << 6
-} EDayViewDays;
-
-
-/* These are used to specify the type of an appointment. They match those
-   used in EMeetingTimeSelector. */
-typedef enum
-{
-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,
-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,
-	E_DAY_VIEW_BUSY_BUSY		= 2,
-
-	E_DAY_VIEW_BUSY_LAST		= 3
-} EDayViewBusyType;
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Thursday 12 September'. The abbreviated format is
-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
-   is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
-typedef enum
-{
-	E_DAY_VIEW_DATE_FULL,
-	E_DAY_VIEW_DATE_ABBREVIATED,
-	E_DAY_VIEW_DATE_NO_WEEKDAY,
-	E_DAY_VIEW_DATE_SHORT
-} EDayViewDateFormat;
-
-/* These index our colors array. */
-typedef enum
-{
-	E_DAY_VIEW_COLOR_BG_WORKING,
-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,
-	E_DAY_VIEW_COLOR_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;
-
-	/* 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 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;
-
-	/* 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;
-};
-
-struct _EDayViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_day_view_get_type			(void);
-GtkWidget* e_day_view_new			(void);
-
-void       e_day_view_set_calendar		(EDayView	*day_view,
-						 GnomeCalendar	*calendar);
-
-void       e_day_view_set_cal_client		(EDayView	*day_view,
-						 CalClient	*client);
-
-void       e_day_view_set_query			(EDayView	*day_view,
-						 const char	*sexp);
-
-/* 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);
-
-/* 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);
-
-/*
- * 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);
-
-#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 bb060dc5c9..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,1122 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <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-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <ical.h>
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-#include <e-util/e-time-utils.h>
-#include <e-util/e-dialog-widgets.h>
-#include "calendar-config.h"
-#include "itip-utils.h"
-#include "e-itip-control.h"
-
-struct _EItipControlPrivate {
-	GtkWidget *summary;
-	GtkWidget *datetime;
-	GtkWidget *message;
-	GtkWidget *count;
-	GtkWidget *options;
-	GtkWidget *ok;
-	GtkWidget *next;
-	GtkWidget *prev;
-
-	CalClient *event_client;
-	CalClient *task_client;
-
-	char *vcalendar;
-	CalComponent *comp;
-	icalcomponent *main_comp;
-	icalcomponent *ical_comp;
-	icalcomponent *top_level;
-	icalcompiter iter;
-	icalproperty_method method;
-
-	const int *map;
-	int current;
-	int total;
-
-	GList *addresses;
-	gchar *from_address;
-	gchar *my_address;
-};
-
-/* Option menu maps */
-enum { 
-	UPDATE_CALENDAR
-};
-
-enum { 
-	ACCEPT_TO_CALENDAR_RSVP,
-	ACCEPT_TO_CALENDAR,
-	TENTATIVE_TO_CALENDAR_RSVP,
-	TENTATIVE_TO_CALENDAR,
-	DECLINE_TO_CALENDAR_RSVP,
-	DECLINE_TO_CALENDAR
-};
-
-enum { 
-	SEND_FREEBUSY
-};
-
-enum { 
-	CANCEL_CALENDAR
-};
-
-static const int publish_map[] = {
-	UPDATE_CALENDAR,
-	-1
-};
-
-static const char *publish_text_map[] = {
-	"Update Calendar",
-	NULL
-};
-
-static const int request_map[] = {
-	ACCEPT_TO_CALENDAR_RSVP,
-	ACCEPT_TO_CALENDAR,
-	TENTATIVE_TO_CALENDAR_RSVP,
-	TENTATIVE_TO_CALENDAR,
-	DECLINE_TO_CALENDAR_RSVP,
-	DECLINE_TO_CALENDAR,
-	-1
-};
-
-static const char *request_text_map[] = {
-	"Accept and RSVP",
-	"Accept and do not RSVP",
-	"Tentatively accept and RSVP",
-	"Tentatively accept and do not RSVP",
-	"Decline and RSVP",
-	"Decline and do not RSVP",
-	NULL
-};
-
-static const int request_fb_map[] = {
-	SEND_FREEBUSY,
-	-1
-};
-
-static const char *request_fb_text_map[] = {
-	"Send Free/Busy Information",
-	NULL
-};
-
-static const int reply_map[] = {
-	UPDATE_CALENDAR,
-	-1
-};
-
-static const char *reply_text_map[] = {
-	"Update Calendar",
-	NULL
-};
-
-static const int cancel_map[] = {
-	CANCEL_CALENDAR,
-	-1
-};
-
-static const char *cancel_text_map[] = {
-	"Cancel",
-	NULL
-};
-
-static void class_init	(EItipControlClass	 *klass);
-static void init	(EItipControl		 *itip);
-static void destroy	(GtkObject               *obj);
-
-static void prev_clicked_cb (GtkWidget *widget, gpointer data);
-static void next_clicked_cb (GtkWidget *widget, gpointer data);
-static void ok_clicked_cb (GtkWidget *widget, 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 (gchar *uri)
-{
-	CalClient *client;
-	gchar *filename;
-	gboolean success;
-	
-	client = cal_client_new ();
-
-	/* FIX ME */
-	filename = g_concat_dir_and_file (g_get_home_dir (), uri);
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-			    start_calendar_server_cb, &success);
-
-	if (!cal_client_open_calendar (client, filename, FALSE))
-		return NULL;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (success)
-		return client;
-
-	return NULL;
-}
-
-static void
-init (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	GtkWidget *hbox, *table, *lbl;
-	
-	priv = g_new0 (EItipControlPrivate, 1);
-
-	itip->priv = priv;
-
-	/* Addresses */
-	priv->addresses = itip_addresses_get ();
-	
-	/* Header */
-	priv->count = gtk_label_new ("0 of 0");
-	gtk_widget_show (priv->count);
-	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_box_pack_start (GTK_BOX (itip), hbox, FALSE, FALSE, 4);
-
-	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);
-
-	/* Information */
-	table = gtk_table_new (1, 3, FALSE);
-	gtk_widget_show (table);
-
-	lbl = gtk_label_new (_("Summary:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.0);
-	gtk_widget_show (lbl);
-	gtk_table_attach (GTK_TABLE (table), lbl, 0, 1, 0, 1,
-			  GTK_EXPAND & GTK_FILL, GTK_SHRINK, 4, 0);
-	priv->summary = gtk_label_new ("");
-	gtk_misc_set_alignment (GTK_MISC (priv->summary), 0.0, 0.5);
-	gtk_widget_show (priv->summary);
-	gtk_table_attach (GTK_TABLE (table), priv->summary, 1, 2, 0, 1,
-			  GTK_EXPAND & GTK_FILL, GTK_EXPAND, 4, 0);
-
-	lbl = gtk_label_new (_("Date/Time:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	gtk_widget_show (lbl);
-	gtk_table_attach (GTK_TABLE (table), lbl, 0, 1, 1, 2, 
-			  GTK_EXPAND, GTK_SHRINK, 4, 0);
-	priv->datetime = gtk_label_new ("");
-	gtk_misc_set_alignment (GTK_MISC (priv->datetime), 0.0, 0.5);
-	gtk_widget_show (priv->datetime);
-	gtk_table_attach (GTK_TABLE (table), priv->datetime, 1, 2, 1, 2,
-			  GTK_EXPAND & GTK_FILL, GTK_EXPAND, 4, 0);
-
-	priv->message = gtk_label_new ("");
-	gtk_label_set_line_wrap (GTK_LABEL (priv->message), TRUE);
-	gtk_widget_show (priv->message);
-	gtk_table_attach (GTK_TABLE (table), priv->message, 0, 2, 2, 3, 
-			  GTK_EXPAND & GTK_FILL, GTK_EXPAND & GTK_FILL, 4, 0);
-
-	gtk_box_pack_start (GTK_BOX (itip), table, FALSE, FALSE, 4);
-
-	/* Actions */
-	priv->options = gtk_option_menu_new ();
-	gtk_widget_show (priv->options);
-	priv->ok = gnome_stock_button (GNOME_STOCK_BUTTON_OK);
-	gtk_widget_show (priv->ok);
-
-	hbox = hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->options, TRUE, TRUE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->ok, FALSE, FALSE, 4);
-	gtk_widget_show (hbox);
-
-	gtk_signal_connect (GTK_OBJECT (priv->ok), "clicked",
-			    GTK_SIGNAL_FUNC (ok_clicked_cb), itip);
-
-	gtk_box_pack_start (GTK_BOX (itip), hbox, FALSE, FALSE, 4);
-
-	/* Get the cal clients */
-	priv->event_client = start_calendar_server ("evolution/local/Calendar/calendar.ics");
-	if (priv->event_client == NULL)
-		g_warning ("Unable to start calendar client");
-	priv->task_client = start_calendar_server ("evolution/local/Tasks/tasks.ics");
-		g_warning ("Unable to start calendar client");
-}
-
-static void
-clean_up (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-
-	priv = itip->priv;
-
-	g_free (priv->vcalendar);
-	priv->vcalendar = NULL;
-
-	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->map = NULL;
-	
-	priv->current = 0;
-	priv->total = 0;
-
-	itip_addresses_free (priv->addresses);
-	priv->addresses = NULL;
-
-	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;
-
-	priv = itip->priv;
-
-	clean_up (itip);
-	
-	gtk_object_unref (GTK_OBJECT (priv->event_client));
-	gtk_object_unref (GTK_OBJECT (priv->task_client));
-	
-	g_free (priv);
-}
-
-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;
-	const char *attendee, *text;
-	icalvalue *value;
-	
-	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))
-	{
-		GList *l;
-		
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-		
-		attendee = icalvalue_get_string (value);
-
-		text = itip_strip_mailto (attendee);
-		for (l = priv->addresses; l != NULL; l = l->next) {
-			ItipAddress *a = l->data;
-			
-			if (strcmp (a->address, text)) {
-				priv->my_address = a->address;
-				return;
-			}
-		}
-	}
-}
-
-static icalproperty *
-find_attendee (icalcomponent *ical_comp, char *address)
-{
-	icalproperty *prop;
-	const char *attendee, *text;
-	icalvalue *value;
-	
-	g_return_val_if_fail (address != NULL, NULL);
-
-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
-	{
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		text = itip_strip_mailto (attendee);
-		if (!strstr (text, address))
-			break;
-	}
-			
-	return prop;
-}
-
-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);
-}
-
-static GtkWidget *
-create_menu (const char **map) 
-{
-	GtkWidget *menu, *item;
-	int i;
-	
-	menu = gtk_menu_new ();
-
-	for (i = 0; map[i] != NULL; i++) {
-		item = gtk_menu_item_new_with_label (map[i]);
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-	gtk_widget_show (menu);
-	
-	return menu;
-}
-
-static void
-set_options (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	gboolean sens = TRUE;
-	
-	priv = itip->priv;
-	
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		priv->map = publish_map;
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->options), 
-					  create_menu (publish_text_map));
-		break;
-	case ICAL_METHOD_REQUEST:
-		priv->map = request_map;
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->options),
-					  create_menu (request_text_map));
-		break;
-	case ICAL_METHOD_REPLY:
-		priv->map = reply_map;
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->options),
-					  create_menu (reply_text_map));
-		break;
-	case ICAL_METHOD_CANCEL:
-		priv->map = cancel_map;
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->options),
-					  create_menu (cancel_text_map));
-		break;
-	default:
-		priv->map = NULL;
-		gtk_option_menu_remove_menu (GTK_OPTION_MENU (priv->options));
-		sens = FALSE;
-	}
-
-	gtk_widget_set_sensitive (priv->options, sens);
-	gtk_widget_set_sensitive (priv->ok, sens);
-}
-
-
-static void
-set_options_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	gboolean sens = TRUE;
-	
-	priv = itip->priv;
-	
-	switch (priv->method) {
-	case ICAL_METHOD_REQUEST:
-		priv->map = request_fb_map;
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->options),
-					  create_menu (request_fb_text_map));
-		break;
-	default:
-		priv->map = NULL;
-		gtk_option_menu_remove_menu (GTK_OPTION_MENU (priv->options));
-		sens = FALSE;
-	}
-
-	gtk_widget_set_sensitive (priv->options, sens);
-	gtk_widget_set_sensitive (priv->ok, sens);
-}
-
-static void
-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
-{
-	struct tm *tmp_tm;
-	int len;
-	
-	/* FIXME: Convert to an appropriate timezone. */
-	tmp_tm = localtime (&t);
-	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 void
-set_date_label (GtkWidget *lbl, CalComponent *comp)
-{
-	CalComponentDateTime datetime;
-	time_t start = 0, end = 0, complete = 0, due = 0;
-	static char buffer[1024];
-
-	/* FIXME: timezones. */
-	cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value)
-		start = icaltime_as_timet (*datetime.value);
-	cal_component_get_dtend (comp, &datetime);
-	if (datetime.value)
-		end = icaltime_as_timet (*datetime.value);
-	cal_component_get_due (comp, &datetime);
-	if (datetime.value)
-		due = icaltime_as_timet (*datetime.value);
-	cal_component_get_completed (comp, &datetime.value);
-	if (datetime.value)
-		complete = icaltime_as_timet (*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);
-	}
-
-	gtk_label_set_text (GTK_LABEL (lbl), buffer);
-}
-
-static void
-set_message (EItipControl *itip, gchar *message, gboolean err) 
-{
-	EItipControlPrivate *priv;
-	GtkStyle *style = NULL;
-	
-	priv = itip->priv;
-
-	if (err) {
-		GdkColor color = {0, 65535, 0, 0};
-		
-		style = gtk_style_copy (gtk_widget_get_style (priv->message));
-		style->fg[0] = color;
-		gtk_widget_set_style (priv->message, style);
-	} else {
-		gtk_widget_restore_default_style (priv->message);
-	}
-
-	if (message != NULL)
-		gtk_label_set_text (GTK_LABEL (priv->message), message);		
-	else
-		gtk_label_set_text (GTK_LABEL (priv->message), "");
-
-	if (err) {
-		gtk_style_unref (style);
-	}
-}
-
-static void
-show_current_event (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	CalComponentText text;
-	
-	priv = itip->priv;
-
-	set_options (itip);
-	
-	cal_component_get_summary (priv->comp, &text);
-	if (text.value)
-		gtk_label_set_text (GTK_LABEL (priv->summary), text.value);
-	else
-		gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	set_date_label (priv->datetime, priv->comp);
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		set_message (itip, _("This is an event that can be added to your calendar."), FALSE);
-		break;
-	case ICAL_METHOD_REQUEST:
-		set_message (itip, _("This is a meeting request."), FALSE);
-		break;
-	case ICAL_METHOD_ADD:
-		set_message (itip, _("This is one or more additions to a current meeting."), FALSE);
-		break;
-	case ICAL_METHOD_REFRESH:
-		set_message (itip, _("This is a request for the latest event information."), FALSE);
-		break;
-	case ICAL_METHOD_REPLY:
-		set_message (itip, _("This is a reply to a meeting request."), FALSE);
-		break;
-	case ICAL_METHOD_CANCEL:
-		set_message (itip, _("This is an event cancellation."), FALSE);
-		break;
-	default:
-		set_message (itip, _("The message is not understandable."), TRUE);
-	}
-
-}
-
-static void
-show_current_todo (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	CalComponentText text;
-	
-	priv = itip->priv;
-
-	set_options (itip);
-	
-	cal_component_get_summary (priv->comp, &text);
-	if (text.value)
-		gtk_label_set_text (GTK_LABEL (priv->summary), text.value);
-	else
-		gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	set_date_label (priv->datetime, priv->comp);
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		set_message (itip, _("This is an task that can be added to your calendar."), FALSE);
-		break;
-	case ICAL_METHOD_REQUEST:
-		set_message (itip, _("This is a task request."), FALSE);
-		break;
-	case ICAL_METHOD_REFRESH:
-		set_message (itip, _("This is a request for the latest task information."), FALSE);
-		break;
-	case ICAL_METHOD_REPLY:
-		set_message (itip, _("This is a reply to a task request."), FALSE);
-		break;
-	case ICAL_METHOD_CANCEL:
-		set_message (itip, _("This is an task cancellation."), FALSE);
-		break;
-	default:
-		set_message (itip, _("The message is not understandable."), TRUE);
-	}
-}
-
-static void
-show_current_freebusy (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
-
-	set_options_freebusy (itip);
-	
-	gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	set_date_label (priv->datetime, priv->comp);
-
-	switch (priv->method) {
-	case ICAL_METHOD_PUBLISH:
-		set_message (itip, _("This is freebusy information."), FALSE);
-		break;
-	case ICAL_METHOD_REQUEST:
-		set_message (itip, _("This is a request for freebusy information."), FALSE);
-		break;
-	case ICAL_METHOD_REPLY:
-		set_message (itip, _("This is a reply to a freebusy request."), FALSE);
-		break;
-	default:
-		set_message (itip, _("The message is not understandable."), TRUE);
-	}
-}
-
-static icalcomponent *
-get_next (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_next (iter);	
-		ret = icalcompiter_deref (iter);
-		kind = icalcomponent_isa (ret);
-	}
-
-	return ret;
-}
-
-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;
-}
-
-static void
-show_current (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	CalComponentVType type;
-
-	priv = itip->priv;
-
-	set_label (itip);
-	set_button_status (itip);
-
-	if (priv->comp)
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-	
-	priv->comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (priv->comp, priv->ical_comp)) {
-		set_message (itip, _("The message does not appear to be properly formed"), TRUE);
-		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:
-		set_message (itip, _("The message contains only unsupported requests."), TRUE);
-	}
-
-	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->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) {
-		set_message (itip, _("The information contained in this attachment was not valid"), TRUE);
-		priv->comp = NULL;
-		priv->total = 0;
-		priv->current = 0;
-		goto show;
-		
-	}
-
-	prop = icalcomponent_get_first_property (priv->main_comp, ICAL_METHOD_PROPERTY);
-	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);
-	
-	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:	
-	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 void
-update_item (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	icalcomponent *clone;
-	CalClient *client;
-	CalComponentVType type;
-	
-	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)) {
-		GtkWidget *dialog;
-		
-		dialog = gnome_warning_dialog(_("I couldn't update your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-	icalcomponent_remove_component (priv->top_level, clone);
-}
-
-static void
-remove_item (EItipControl *itip) 
-{
-	EItipControlPrivate *priv;
-	CalClient *client;
-	CalComponentVType type;
-	const char *uid;
-	
-	priv = itip->priv;
-
-	type = cal_component_get_vtype (priv->comp);
-	if (type == CAL_COMPONENT_TODO)
-		client = priv->task_client;
-	else 
-		client = priv->event_client;
-
-	cal_component_get_uid (priv->comp, &uid);
-	if (!cal_client_remove_object (client, uid)) {
-		GtkWidget *dialog;
-		
-		dialog = gnome_warning_dialog(_("I couldn't remove the item from your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-}
-
-static void
-send_freebusy (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	CalComponent *comp;
-	CalComponentDateTime datetime;
-	CalClientGetStatus status;
-	time_t start, end;
-
-	priv = itip->priv;
-	
-	/* FIXME: timezones. */
-	cal_component_get_dtstart (priv->comp, &datetime);
-	start = icaltime_as_timet (*datetime.value);
-	cal_component_get_dtend (priv->comp, &datetime);
-	end = icaltime_as_timet (*datetime.value);
-	status = cal_client_get_free_busy (priv->event_client, start, end, &comp);
-	if (status == CAL_CLIENT_GET_SUCCESS)
-		itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp);
-}
-
-static void
-change_status (EItipControl *itip, gchar *address, icalparameter_partstat status)
-{
-	EItipControlPrivate *priv;
-	icalproperty *prop;
-
-	priv = itip->priv;
-
-	prop = find_attendee (priv->ical_comp, address);
-	if (prop) {
-		icalparameter *param;
-
-		icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-		param = icalparameter_new_partstat (status);
-		icalproperty_add_parameter (prop, param);
-	}
-}
-
-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);
-}
-
-static void
-ok_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControl *itip = E_ITIP_CONTROL (data);
-	EItipControlPrivate *priv;
-	gint selection;
-	
-	priv = itip->priv;
-
-	selection = e_dialog_option_menu_get (priv->options, priv->map);
-
-	if (priv->map == publish_map) {
-		update_item (itip);
-	} else if (priv->map == request_map) {
-		gboolean rsvp = FALSE;
-		
-		switch (selection) {
-		case ACCEPT_TO_CALENDAR_RSVP:
-			rsvp = TRUE;
-		case ACCEPT_TO_CALENDAR:
-			change_status (itip, priv->my_address, ICAL_PARTSTAT_ACCEPTED);
-			break;
-		case TENTATIVE_TO_CALENDAR_RSVP:
-			rsvp = TRUE;
-		case TENTATIVE_TO_CALENDAR:
-			change_status (itip, priv->my_address, ICAL_PARTSTAT_TENTATIVE);
-			break;
-		case DECLINE_TO_CALENDAR_RSVP:
-			rsvp = TRUE;
-		case DECLINE_TO_CALENDAR:
-			change_status (itip, priv->my_address, ICAL_PARTSTAT_DECLINED);
-			break;
-		}
-		update_item (itip);
-		if (rsvp)
-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, priv->comp);
-
-	} else if (priv->map == request_fb_map) {
-		send_freebusy (itip);
-
-	} else if (priv->map == reply_map) {
-		update_item (itip);
-
-	} else if (priv->map == cancel_map) {
-		remove_item (itip);
-	}
-}
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 a195161f17..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,75 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#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-tasks.c b/calendar/gui/e-tasks.c
deleted file mode 100644
index dbf7a7d779..0000000000
--- a/calendar/gui/e-tasks.c
+++ /dev/null
@@ -1,670 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-collection.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "dialogs/task-editor.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;
-
-	/* The ECalendarTable showing the tasks. */
-	GtkWidget   *tasks_view;
-
-	/* The option menu showing the categories, and the popup menu. */
-	GtkWidget *categories_option_menu;
-	GtkWidget *categories_menu;
-
-	/* View collection and the view menus handler */
-	GalViewCollection *view_collection;
-	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 void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
-
-static char* e_tasks_get_config_filename (ETasks *tasks);
-
-static void e_tasks_on_filter_selected	(GtkMenuShell	*menu_shell,
-					 ETasks		*tasks);
-static void e_tasks_on_categories_changed	(CalendarModel	*model,
-						 ETasks		*tasks);
-static void e_tasks_rebuild_categories_menu	(ETasks		*tasks);
-static gint e_tasks_add_menu_item		(gpointer key,
-						 gpointer value,
-						 gpointer data);
-
-/* 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_FIRST,
-				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;
-
-	setup_widgets (tasks);
-}
-
-/* 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);
-}
-
-#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;
-	GtkWidget *hbox, *menuitem, *categories_label;
-	CalendarModel *model;
-
-	priv = tasks->priv;
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox);
-	gtk_table_attach (GTK_TABLE (tasks), hbox, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	priv->categories_option_menu = gtk_option_menu_new ();
-	gtk_widget_show (priv->categories_option_menu);
-	gtk_box_pack_end (GTK_BOX (hbox), priv->categories_option_menu,
-			  FALSE, FALSE, 0);
-
-	priv->categories_menu = gtk_menu_new ();
-
-	menuitem = gtk_menu_item_new_with_label (_("All"));
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (priv->categories_menu), menuitem);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->categories_option_menu), priv->categories_menu);
-
-	categories_label = gtk_label_new (_("Category:"));
-	gtk_widget_show (categories_label);
-	gtk_box_pack_end (GTK_BOX (hbox), categories_label, FALSE, FALSE, 4);
-
-
-	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 (E_CALENDAR_TABLE (priv->tasks_view)->model),
-			    "categories-changed",
-			    GTK_SIGNAL_FUNC (e_tasks_on_categories_changed), tasks);
-
-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",
-			    GTK_SIGNAL_FUNC (table_selection_change_cb), tasks);
-}
-
-
-GtkWidget *
-e_tasks_construct (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;
-
-	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), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), tasks);
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->tasks_view),
-					 priv->client);
-
-	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);
-}
-
-
-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);
-}
-
-
-gboolean
-e_tasks_open			(ETasks		*tasks,
-				 char		*file)
-{
-	ETasksPrivate *priv;
-	char *config_filename;
-
-	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;
-
-	if (!cal_client_open_calendar (priv->client, file, FALSE)) {
-		g_message ("e_tasks_open(): Could not issue the request");
-		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);
-
-	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;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		/* Everything is OK */
-		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 ();
-	}
-}
-
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb				(CalClient	*client,
-					 const char	*uid,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	/* FIXME: Do we need to do anything? */
-}
-
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb				(CalClient	*client,
-					 const char	*uid,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	/* FIXME: Do we need to do anything? */
-}
-
-
-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;
-
-	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);
-
-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	comp_editor_focus (COMP_EDITOR (tedit));
-}
-
-/**
- * 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);
-	e_calendar_table_delete_selected (cal_table);
-}
-
-
-static void
-e_tasks_on_filter_selected		(GtkMenuShell	*menu_shell,
-					 ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-	CalendarModel *model;
-	GtkWidget *label;
-	char *category;
-
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	label = GTK_BIN (priv->categories_option_menu)->child;
-	gtk_label_get (GTK_LABEL (label), &category);
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-	model = cal_table->model;
-
-	if (!strcmp (category, _("All"))) {
-		calendar_model_set_default_category (model, NULL);
-		e_calendar_table_set_filter_func (cal_table, NULL, NULL,
-						  NULL);
-	} else {
-		calendar_model_set_default_category (model, category);
-		e_calendar_table_set_filter_func (cal_table,
-						  e_calendar_table_filter_by_category,
-						  g_strdup (category), g_free);
-	}
-}
-
-
-static void
-e_tasks_on_categories_changed	(CalendarModel	*model,
-				 ETasks		*tasks)
-{
-	e_tasks_rebuild_categories_menu (tasks);
-}
-
-
-static void
-e_tasks_rebuild_categories_menu	(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	CalendarModel *model;
-	GTree *categories;
-	GtkWidget *menuitem;
-
-	priv = tasks->priv;
-
-	priv->categories_menu = gtk_menu_new ();
-
-	menuitem = gtk_menu_item_new_with_label (_("All"));
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (priv->categories_menu), menuitem);
-
-	model = E_CALENDAR_TABLE (priv->tasks_view)->model;
-	categories = calendar_model_get_categories (model);
-	g_return_if_fail (categories != NULL);
-
-	g_tree_traverse (categories, e_tasks_add_menu_item, G_IN_ORDER,
-			 priv->categories_menu);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->categories_option_menu), priv->categories_menu);
-
-	gtk_signal_connect (GTK_OBJECT (priv->categories_menu), "deactivate",
-			    GTK_SIGNAL_FUNC (e_tasks_on_filter_selected),
-			    tasks);
-}
-
-
-static gint
-e_tasks_add_menu_item		(gpointer key,
-				 gpointer value,
-				 gpointer data)
-{
-	GtkWidget *menuitem;
-
-	menuitem = gtk_menu_item_new_with_label ((char*) key);
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (data), menuitem);
-
-	return FALSE;
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	ETasks *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);
-	}
-}
-
-void
-e_tasks_setup_menus (ETasks            *tasks,
-		     BonoboUIComponent *uic)
-{
-	GalViewCollection *collection;
-	GalViewMenus *views;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *dir;
-
-	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);
-
-	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);
-	gal_view_collection_add_factory (collection, factory);
-	gtk_object_sink (GTK_OBJECT (factory));
-
-	gal_view_collection_load (collection);
-
-	views = gal_view_menus_new (collection);
-	gal_view_menus_apply (views, uic, NULL); /* This function probably needs to sink the views object. */
-	gtk_signal_connect (GTK_OBJECT (collection), "display_view",
-			    display_view, tasks);
-	/*	gtk_object_sink(GTK_OBJECT(views)); */
-
-	gtk_object_sink (GTK_OBJECT (collection));
-}
-
-/**
- * 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;
-
-	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));
-	}
-}
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
deleted file mode 100644
index c509e1d826..0000000000
--- a/calendar/gui/e-tasks.h
+++ /dev/null
@@ -1,81 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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);
-
-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_delete_selected (ETasks            *tasks);
-
-void       e_tasks_setup_menus     (ETasks            *tasks,
-				    BonoboUIComponent *uic);
-
-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 2b4f06af6d..0000000000
--- a/calendar/gui/e-timezone-entry.c
+++ /dev/null
@@ -1,308 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "dialogs/e-timezone-dialog.h"
-#include "e-timezone-entry.h"
-
-
-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;
-};
-
-
-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	(icaltimezone	*zone);
-
-
-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;
-
-	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
-
-	priv->zone = NULL;
-	priv->changed = FALSE;
-
-	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_with_label ("...");
-	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);
-}
-
-
-/**
- * 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);
-	}
-
-	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));
-
-	if (display_name && display_name[0])
-		return icaltimezone_get_builtin_timezone (display_name);
-	return NULL;
-}
-
-
-void
-e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,
-					 icaltimezone	*zone)
-{
-	ETimezoneEntryPrivate *priv;
-
-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));
-
-	priv = tentry->priv;
-
-	priv->zone = zone;
-	priv->changed = FALSE;
-
-	gtk_entry_set_text (GTK_ENTRY (priv->entry),
-			    zone ? e_timezone_entry_get_display_name (zone) : "");
-}
-
-
-/* Returns the timezone name to display to the user. . 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'. */
-static char*
-e_timezone_entry_get_display_name	(icaltimezone	*zone)
-{
-	char *display_name;
-
-	display_name = icaltimezone_get_location (zone);
-	if (!display_name)
-		display_name = icaltimezone_get_tznames (zone);
-	if (!display_name)
-		display_name = icaltimezone_get_tzid (zone);
-
-	return display_name;
-}
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
deleted file mode 100644
index bfc8525f64..0000000000
--- a/calendar/gui/e-timezone-entry.h
+++ /dev/null
@@ -1,76 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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);
-
-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 e6e8a0e2b4..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,867 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 EWeekViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-							      gdouble x,
-							      gdouble y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_EVENT_NUM,
-	ARG_SPAN_NUM
-};
-
-
-GtkType
-e_week_view_event_item_get_type (void)
-{
-	static GtkType e_week_view_event_item_type = 0;
-
-	if (!e_week_view_event_item_type) {
-		GtkTypeInfo e_week_view_event_item_info = {
-			"EWeekViewEventItem",
-			sizeof (EWeekViewEventItem),
-			sizeof (EWeekViewEventItemClass),
-			(GtkClassInitFunc) e_week_view_event_item_class_init,
-			(GtkObjectInitFunc) e_week_view_event_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_event_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_event_item_info);
-	}
-
-	return e_week_view_event_item_type;
-}
-
-
-static void
-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewEventItem::event_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_EVENT_NUM);
-	gtk_object_add_arg_type ("EWeekViewEventItem::span_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_SPAN_NUM);
-
-	object_class->set_arg = e_week_view_event_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_event_item_update;
-	item_class->draw        = e_week_view_event_item_draw;
-	item_class->point       = e_week_view_event_item_point;
-	item_class->event       = e_week_view_event_item_event;
-}
-
-
-static void
-e_week_view_event_item_init (EWeekViewEventItem *wveitem)
-{
-	wveitem->event_num = -1;
-	wveitem->span_num = -1;
-}
-
-
-static void
-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewEventItem *wveitem;
-	gboolean needs_update = FALSE;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_EVENT_NUM:
-		wveitem->event_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	case ARG_SPAN_NUM:
-		wveitem->span_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	}
-
-	if (needs_update)
-		gnome_canvas_item_request_update (item);
-}
-
-
-static void
-e_week_view_event_item_update (GnomeCanvasItem *item,
-			       double	       *affine,
-			       ArtSVP	       *clip_path,
-			       int	        flags)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	gint span_x, span_y, span_w;
-
-#if 0
-	g_print ("In e_week_view_event_item_update\n");
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	if (wveitem->event_num != -1 && wveitem->span_num != -1) {
-		if (e_week_view_get_span_position (week_view,
-						   wveitem->event_num,
-						   wveitem->span_num,
-						   &span_x, &span_y,
-						   &span_w)) {
-#if 0
-			g_print ("  Event:%i Span:%i %i,%i W:%i\n",
-				 wveitem->event_num, wveitem->span_num,
-				 span_x, span_y, span_w);
-#endif
-			item->x1 = span_x;
-			item->y1 = span_y;
-			item->x2 = span_x + span_w - 1;
-			item->y2 = span_y + week_view->row_height - 1;
-		}
-	}
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
-			     GdkDrawable      *drawable,
-			     int	       x,
-			     int	       y,
-			     int	       width,
-			     int	       height)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GtkStyle *style;
-	GdkGC *fg_gc, *gc;
-	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;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	gc = week_view->main_gc;
-
-	x1 = canvas_item->x1 - x;
-	y1 = canvas_item->y1 - y;
-	x2 = canvas_item->x2 - x;
-	y2 = canvas_item->y2 - y;
-
-	if (x1 == x2 || y1 == y2)
-		return;
-
-	icon_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 - 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;
-
-
-	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 (!cal_component_compare_event_timezone (comp, week_view->zone)) {
-		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;
-		GdkBitmap *mask;
-
-		category = (char *) elem->data;
-		e_categories_config_get_icon_for (category, &pixmap, &mask);
-		if (pixmap == NULL || mask == NULL)
-			continue;
-
-		if (icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			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;
-		}
-	}
-
-	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_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 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 33076cd88c..0000000000
--- a/calendar/gui/e-week-view-event-item.h
+++ /dev/null
@@ -1,71 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 21552e5f17..0000000000
--- a/calendar/gui/e-week-view-layout.c
+++ /dev/null
@@ -1,426 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 - 1 : 7 - 1;
-	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 e4d679e793..0000000000
--- a/calendar/gui/e-week-view-layout.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 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_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 2d0489d3fc..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,389 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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
-		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 d9211afd8d..0000000000
--- a/calendar/gui/e-week-view-main-item.h
+++ /dev/null
@@ -1,67 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 2f93383cce..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,311 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 d2420afec7..0000000000
--- a/calendar/gui/e-week-view-titles-item.h
+++ /dev/null
@@ -1,67 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 719297fe7e..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,3619 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.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-popup-menu.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include "dialogs/delete-comp.h"
-#include "comp-util.h"
-#include "cal-util/timeutil.h"
-#include "calendar-commands.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"
-
-/* 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
-
-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_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_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 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;
-
-	/* 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;
-
-	/* 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->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;
-
-	/* 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;
-}
-
-
-/**
- * e_week_view_new:
- * @Returns: a new #EWeekView.
- *
- * Creates a new #EWeekView.
- **/
-GtkWidget *
-e_week_view_new (void)
-{
-	GtkWidget *week_view;
-
-	week_view = GTK_WIDGET (gtk_type_new (e_week_view_get_type ()));
-
-	return week_view;
-}
-
-
-static void
-e_week_view_destroy (GtkObject *object)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (object);
-
-	e_week_view_free_events (week_view);
-
-	if (week_view->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);
-
-	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);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_week_view_realize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gboolean success[E_WEEK_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	week_view = E_WEEK_VIEW (widget);
-	week_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xeded;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].blue  = 65535;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red   = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 0xd6d6;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	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;
-
-	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);
-
-	/* 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);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* 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);
-
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_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)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* FIXME */
-
-	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)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* FIXME */
-
-	fprintf (stderr, "eval error: %s\n", error_str);
-}
-
-/* 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 g_strdup ("#f");
-
-	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)
-{
-	char *real_sexp;
-
-	e_week_view_free_events (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	if (!(week_view->client
-	      && cal_client_get_load_state (week_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	if (week_view->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->query), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->query));
-	}
-
-	g_assert (week_view->sexp != NULL);
-	real_sexp = adjust_query_sexp (week_view, week_view->sexp);
-
-	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);
-}
-
-
-/* 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_copy_clipboard (week_view);
-	cal_component_get_uid (event->comp, &uid);
-	cal_client_remove_object (week_view->client, uid);
-}
-
-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");
-#endif
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment:
-					  adj->page_increment);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	/* Convert the mouse position to a week & day. */
-	x = event->x;
-	y = event->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			week_view->selection_start_day = day;
-			week_view->selection_end_day = day;
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-
-			/* FIXME: Optimise? */
-			gtk_widget_queue_draw (week_view->main_canvas);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view, event, -1);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_button_release (GtkWidget *widget,
-			       GdkEventButton *event,
-			       EWeekView *week_view)
-{
-	time_t start, end;
-
-#if 0
-	g_print ("In e_week_view_on_button_release\n");
-#endif
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-		gdk_pointer_ungrab (event->time);
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-
-		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;
-	}
-}
-
-
-/* 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;
-
-	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 (!cal_component_compare_event_timezone (comp,
-							   week_view->zone))
-			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);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-void
-e_week_view_start_editing_event (EWeekView *week_view,
-				 gint	    event_num,
-				 gint	    span_num,
-				 gchar     *initial_text)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-	/* If we are already editing the event, just return. */
-	if (event_num == week_view->editing_event_num
-	    && span_num == week_view->editing_span_num)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!span->text_item)
-		return;
-
-	if (initial_text) {
-		gnome_canvas_item_set (span->text_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* 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);
-}
-
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *event,
-				EWeekView *week_view)
-{
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (event->button.button == 3) {
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-			e_week_view_show_popup_menu (week_view,
-						     (GdkEventButton*) event,
-						     event_num);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-
-		week_view->pressed_event_num = event_num;
-		week_view->pressed_span_num = span_num;
-
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-
-			if (event) {
-				week_view->drag_event_x = event->button.x;
-				week_view->drag_event_y = event->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event, 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 (event->focus_change.in) {
-			e_week_view_on_editing_started (week_view, item);
-		} else {
-			e_week_view_on_editing_stopped (week_view, item);
-		}
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_on_editing_started (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-
-	if (!e_week_view_find_event_from_item (week_view, item,
-					       &event_num, &span_num))
-		return;
-
-#if 0
-	g_print ("In e_week_view_on_editing_started event_num:%i span_num:%i\n", event_num, span_num);
-#endif
-
-	week_view->editing_event_num = event_num;
-	week_view->editing_span_num = span_num;
-
-	/* We need to reshape long events so the whole width is used while
-	   editing. */
-	if (!e_week_view_is_one_day_event (week_view, event_num)) {
-		e_week_view_reshape_event_span (week_view, event_num,
-						span_num);
-	}
-}
-
-
-static void
-e_week_view_on_editing_stopped (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gchar *text = NULL;
-	CalComponentText summary;
-	const char *uid;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* Reset the edit fields. */
-	week_view->editing_event_num = -1;
-
-	/* Check that the event is still valid. */
-	cal_component_get_uid (event->comp, &uid);
-	if (!uid)
-		return;
-
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		return;
-	}
-
-	summary.value = text;
-	cal_component_set_summary (event->comp, &summary);
-	g_free (text);
-
-	if (!cal_client_update_object (week_view->client, event->comp))
-		g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-static gboolean
-e_week_view_find_event_from_item (EWeekView	  *week_view,
-				  GnomeCanvasItem *item,
-				  gint		  *event_num_return,
-				  gint		  *span_num_return)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan,
-					       event->spans_index + span_num);
-			if (span->text_item == item) {
-				*event_num_return = event_num;
-				*span_num_return = span_num;
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the index of the event with the given uid.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EWeekViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_week_view_find_event_from_uid (EWeekView	  *week_view,
-				 const gchar	  *uid,
-				 gint		  *event_num_return)
-{
-	EWeekViewEvent *event;
-	gint event_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-gboolean
-e_week_view_is_one_day_event	(EWeekView	*week_view,
-				 gint		 event_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	if (event->num_spans != 1)
-		return FALSE;
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index);
-
-	if (event->start == week_view->day_starts[span->start_day]
-	    && event->end == week_view->day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= week_view->day_starts[span->start_day]
-	    && event->end <= week_view->day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	gint event_num;
-	gchar *initial_text;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dtstart, dtend;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	/* The Escape key aborts a resize operation. */
-#if 0
-	if (week_view->resize_drag_pos != E_WEEK_VIEW_POS_NONE) {
-		if (event->keyval == GDK_Escape) {
-			e_week_view_abort_resize (week_view, event->time);
-		}
-		return FALSE;
-	}
-#endif
-
-	if (week_view->selection_start_day == -1)
-		return FALSE;
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (event->keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((event->keyval < 0x20)
-		   || (event->keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else
-		initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
-
-	/* Add a new event covering the selected range. */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	dtstart = week_view->day_starts[week_view->selection_start_day];
-	dtend = week_view->day_starts[week_view->selection_end_day + 1];
-
-	date.value = &itt;
-	date.tzid = icaltimezone_get_tzid (week_view->zone);
-
-	*date.value = icaltime_from_timet_with_zone (dtstart, FALSE,
-						     week_view->zone);
-	cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet_with_zone (dtend, FALSE,
-						     week_view->zone);
-	cal_component_set_dtend (comp, &date);
-
-	/* We add the event locally and start editing it. We don't send the
-	   new event to the server until the edit is finished.
-	   FIXME: If we get an obj-updated or obj-removed signal while editing
-	   the event, and we have to do a re-layout, we may lose this new
-	   event. */
-	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 [] = {
-	{ N_("Paste"), NULL,
-	  e_week_view_on_paste, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, 0 },
-
-	{ N_("New Appointment..."), NULL,
-	  e_week_view_on_new_appointment, NULL, 0 },
-	{ N_("New All Day Event"), NULL,
-	  e_week_view_on_new_event, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, 0 },
-
-	{ N_("Go to Today"), NULL,
-	  e_week_view_on_goto_today, NULL, 0 },
-	{ N_("Go to Date..."), NULL,
-	  e_week_view_on_goto_date, NULL, 0 },
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-static EPopupMenu child_items [] = {
-	{ N_("Open"), NULL,
-	  e_week_view_on_edit_appointment, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("Delete this Appointment"), NULL,
-	  e_week_view_on_delete_appointment, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("Cut"), NULL,
-	  e_week_view_on_cut, NULL, MASK_EDITING | MASK_EDITABLE },
-	{ N_("Copy"), NULL,
-	  e_week_view_on_copy, NULL, MASK_EDITING | MASK_EDITABLE },
-	{ N_("Paste"), NULL,
-	  e_week_view_on_paste, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, 0},
-
-	{ N_("New Appointment..."), NULL,
-	  e_week_view_on_new_appointment, NULL, 0 },
-
-	{ "", NULL, NULL, NULL, MASK_SINGLE },
-
-	/*
-	 * The following are only shown if this is a recurring event
-	 */
-	{ "", NULL, NULL, NULL, MASK_SINGLE},
-	{ N_("Make this Occurrence Movable"), NULL,
-	  e_week_view_on_unrecur_appointment, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete this Occurrence"), NULL,
-	  e_week_view_on_delete_occurrence, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete All Occurrences"), NULL,
-	  e_week_view_on_delete_appointment, NULL, MASK_RECURRING | MASK_EDITING },
-	
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-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;
-
-	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) {
-		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;
-
-	e_popup_menu_run (context_menu, (GdkEvent *) bevent, disable_mask, hide_mask, week_view);
-}
-
-static void
-e_week_view_on_new_appointment (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, 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);
-}
-
-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);
-	else
-		g_warning ("Calendar not set");
-}
-
-
-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_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponentVType vtype;
-
-	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);
-
-	vtype = cal_component_get_vtype (event->comp);
-
-	if (delete_component_dialog (event->comp, 1, vtype, widget)) {
-		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_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;
-	time_t dtstart, dtend;
-	struct icaltimetype itime;
-	CalComponent *comp;
-	char *uid;
-
-	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) {
-		dtstart = week_view->day_starts[week_view->selection_start_day];
-		itime = icaltime_from_timet_with_zone (dtstart, FALSE,
-						       week_view->zone);
-		icalcomponent_set_dtstart (icalcomp, itime);
-
-		dtend = week_view->day_starts[week_view->selection_end_day + 1];
-		itime = icaltime_from_timet_with_zone (dtend, FALSE,
-						       week_view->zone);
-		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 (week_view->client, comp);
-
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index 5b3f257f5e..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,479 +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 the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_H_
-#define _E_WEEK_VIEW_H_
-
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-/* The maximum number of weeks we show. 5 is usually enough for 1 month,
-   but we allow 6 for longer selections. */
-#define E_WEEK_VIEW_MAX_WEEKS		6
-
-/* The size of the reminder & recurrence icons, and padding around them.
-   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		0
-#define E_WEEK_VIEW_ICON_Y_PAD		0
-#define E_WEEK_VIEW_ICON_R_PAD		2
-
-/* 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_LAST
-} EWeekViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_WEEK_VIEW_DRAG_NONE,
-	E_WEEK_VIEW_DRAG_START,
-	E_WEEK_VIEW_DRAG_END
-} EWeekViewDragPosition;
-
-/* These specify which times are shown for the 1-day events. We use the small
-   font for the minutes if it can be loaded and the option is on. */
-typedef enum
-{
-	E_WEEK_VIEW_TIME_NONE,
-	E_WEEK_VIEW_TIME_START,
-	E_WEEK_VIEW_TIME_BOTH,
-	E_WEEK_VIEW_TIME_START_SMALL_MIN,
-	E_WEEK_VIEW_TIME_BOTH_SMALL_MIN
-} EWeekViewTimeFormat;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_WEEK_VIEW_POS_OUTSIDE,
-	E_WEEK_VIEW_POS_NONE,
-	E_WEEK_VIEW_POS_EVENT,
-	E_WEEK_VIEW_POS_LEFT_EDGE,
-	E_WEEK_VIEW_POS_RIGHT_EDGE
-} EWeekViewPosition;
-
-
-typedef struct _EWeekViewEventSpan EWeekViewEventSpan;
-struct _EWeekViewEventSpan {
-	guint start_day : 6;
-	guint num_days : 3;
-	guint row : 7;
-	GnomeCanvasItem *background_item;
-	GnomeCanvasItem *text_item;
-};
-
-typedef struct _EWeekViewEvent EWeekViewEvent;
-struct _EWeekViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint16 start_minute;	/* Minutes from the start of the day. */
-	guint16 end_minute;
-	gint spans_index;
-	guint num_spans;
-};
-
-
-#define E_WEEK_VIEW(obj)          GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)
-#define E_WEEK_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
-#define E_IS_WEEK_VIEW(obj)       GTK_CHECK_TYPE (obj, e_week_view_get_type ())
-
-
-typedef struct _EWeekView       EWeekView;
-typedef struct _EWeekViewClass  EWeekViewClass;
-
-struct _EWeekView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates are shown. */
-	GtkWidget *titles_canvas;
-	GnomeCanvasItem *titles_canvas_item;
-
-	/* The main canvas where the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	GnomeCanvasItem *jump_buttons[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* 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;
-
-	/* 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;
-
-	/* 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;
-};
-
-struct _EWeekViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_week_view_get_type			(void);
-GtkWidget* e_week_view_new			(void);
-
-void       e_week_view_set_calendar		(EWeekView	*week_view,
-						 GnomeCalendar	*calendar);
-
-/* The first day shown. Note that it will be rounded down to the start of a
-   week when set. The returned value will be invalid if no date has been set
-   yet. */
-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-
-void       e_week_view_set_cal_client		(EWeekView	*week_view,
-						 CalClient	*client);
-
-void       e_week_view_set_query		(EWeekView	*week_view,
-						 const char	*sexp);
-
-/* The selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-
-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */
-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);
-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,
-						 gboolean	 multi_week_view);
-
-/* The number of weeks shown in the multi-week view. */
-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);
-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,
-						 gint		 weeks_shown);
-
-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
-   view. In the Week view they are always compressed. */
-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);
-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,
-						 gboolean	 compress);
-
-/* 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);
-
-
-/*
- * 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);
-
-
-#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 7068fbe1fe..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,2101 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <gal/e-paned/e-hpaned.h>
-#include <gal/e-paned/e-vpaned.h>
-#include <cal-util/timeutil.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
-#include "dialogs/event-editor.h"
-#include "e-calendar-table.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "evolution-calendar.h"
-#include "gnome-cal.h"
-#include "component-factory.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;
-
-	/*
-	 * The TaskPad Folder.
-	 */
-
-	/* The calendar client object we monitor */
-	CalClient   *task_pad_client;
-
-	/*
-	 * 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;
-
-	/* These are the toolbar radio buttons for switching views. */
-	GtkWidget   *day_button;
-	GtkWidget   *work_week_button;
-	GtkWidget   *week_button;
-	GtkWidget   *month_button;
-
-	/* This is the view currently shown. We use it to keep track of the
-	   positions of the panes. range_selected is TRUE if a range of dates
-	   was selected in the date navigator to show the view. */
-	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 collection and menus for the control */
-	GalViewCollection *view_collection;
-	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;
-};
-
-
-
-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 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);
-
-	object_class->destroy = gnome_calendar_destroy;
-}
-
-static ESearchBarItem search_menu_items[] = {
-	E_FILTERBAR_RESET,
-	{ NULL, -1 }
-};
-
-enum {
-	SEARCH_ANY_FIELD_CONTAINS,
-	SEARCH_SUMMARY_CONTAINS,
-	SEARCH_DESCRIPTION_CONTAINS,
-	SEARCH_COMMENT_CONTAINS,
-	SEARCH_HAS_CATEGORY
-};
-
-static ESearchBarItem search_option_items[] = {
-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS },
-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS },
-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS },
-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS },
-	{ N_("Has category"), SEARCH_HAS_CATEGORY },
-	{ NULL, -1 }
-};
-
-/**
- * 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, char *sexp)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (sexp != NULL);
-
-	priv = gcal->priv;
-
-	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 ();
-	}
-}
-
-/* Sets the query string to be (contains? "field" "text") */
-static void
-set_query_contains (GnomeCalendar *gcal, const char *field, const char *text)
-{
-	char *sexp;
-
-	sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);
-	gnome_calendar_set_query (gcal, sexp);
-	g_free (sexp);
-}
-
-/* Callback used when the query string is changed in the search bar */
-static void
-search_bar_query_changed_cb (ESearchBar *search_bar, gpointer data)
-{
-	GnomeCalendar *gcal;
-	int item;
-	char *text;
-
-	gcal = GNOME_CALENDAR (data);
-
-	item = e_search_bar_get_option_choice (search_bar);
-	text = e_search_bar_get_text (search_bar);
-
-	if (!text)
-		return; /* This is an error in the UTF8 conversion, not an empty string! */
-
-	switch (item) {
-	case SEARCH_ANY_FIELD_CONTAINS:
-		set_query_contains (gcal, "any", text);
-		break;
-
-	case SEARCH_SUMMARY_CONTAINS:
-		set_query_contains (gcal, "summary", text);
-		break;
-
-	case SEARCH_DESCRIPTION_CONTAINS:
-		set_query_contains (gcal, "description", text);
-		break;
-
-	case SEARCH_COMMENT_CONTAINS:
-		set_query_contains (gcal, "comment", text);
-		break;
-
-	case SEARCH_HAS_CATEGORY: {
-		char *sexp;
-
-		sexp = g_strdup_printf ("(has-categories? \"%s\")", text);
-		gnome_calendar_set_query (gcal, sexp);
-		g_free (sexp);
-		break;
-	}
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	g_free (text);
-}
-
-/* Callback used when a menu item is activated in the search bar */
-static void
-search_bar_menu_activated_cb (ESearchBar *search_bar, int item, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	switch (item) {
-	case E_FILTERBAR_RESET_ID:
-		gnome_calendar_set_query (gcal, "#t"); /* match all */
-		/* FIXME: should we change the rest of the search bar so that
-		 * the user sees that he selected "show all" instead of some
-		 * type/text search combination?
-		 */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* 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.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;
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-	gchar *filename;
-	CalendarModel *model;
-
-	priv = gcal->priv;
-
-	priv->search_bar = e_search_bar_new (search_menu_items, search_option_items);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "query_changed",
-			    GTK_SIGNAL_FUNC (search_bar_query_changed_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->search_bar), "menu_activated",
-			    GTK_SIGNAL_FUNC (search_bar_menu_activated_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);
-
-	/* The Day View. */
-	priv->day_view = e_day_view_new ();
-	e_day_view_set_calendar (E_DAY_VIEW (priv->day_view), gcal);
-	gtk_widget_show (priv->day_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->day_view, gtk_label_new (""));
-
-	/* The Work Week View. */
-	priv->work_week_view = e_day_view_new ();
-	e_day_view_set_work_week_view (E_DAY_VIEW (priv->work_week_view),
-				       TRUE);
-	e_day_view_set_days_shown (E_DAY_VIEW (priv->work_week_view), 5);
-	e_day_view_set_calendar (E_DAY_VIEW (priv->work_week_view), gcal);
-	gtk_widget_show (priv->work_week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->work_week_view, gtk_label_new (""));
-
-	/* The Week View. */
-	priv->week_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->week_view), gcal);
-	gtk_widget_show (priv->week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->week_view, gtk_label_new (""));
-
-	/* The Month View. */
-	priv->month_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->month_view), gcal);
-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE);
-	gtk_widget_show (priv->month_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->month_view, gtk_label_new (""));
-
-	gnome_calendar_update_config_settings (gcal, TRUE);
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-gnome_calendar_init (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = g_new0 (GnomeCalendarPrivate, 1);
-	gcal->priv = priv;
-
-	priv->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->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_collection = NULL;
-	priv->view_menus = NULL;
-}
-
-/* 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;
-
-	/* 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->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_collection) {
-		gtk_object_unref (GTK_OBJECT (priv->view_collection));
-		priv->view_collection = 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);
-}
-
-
-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);
-}
-
-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);
-
-	if (priv->day_button)
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->day_button), TRUE);
-	else
-		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;
-
-	priv = gcal->priv;
-
-	round_selection = FALSE;
-	focus_widget = NULL;
-
-	switch (view_type) {
-	case GNOME_CAL_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:
-		focus_widget = priv->work_week_view;
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		focus_widget = priv->week_view;
-		round_selection = TRUE;
-		break;
-
-	case GNOME_CAL_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);
-
-	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);
-}
-
-/* Callback used when the view collection asks us to display a particular view */
-static void
-display_view_cb (GalViewCollection *view_collection, 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;
-
-	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_collection == NULL);
-
-	g_assert (priv->view_collection == NULL);
-	g_assert (priv->view_menus == NULL);
-
-	/* Create the view collection */
-
-	priv->view_collection = gal_view_collection_new ();
-
-	path = gnome_util_prepend_user_home ("/evolution/views/calendar/");
-	gal_view_collection_set_storage_directories (priv->view_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 (priv->view_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 (priv->view_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 (priv->view_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 (priv->view_collection, GAL_VIEW_FACTORY (factory));
-	gtk_object_unref (GTK_OBJECT (factory));
-
-	/* Load the collection and create the menus */
-
-	gal_view_collection_load (priv->view_collection);
-
-	priv->view_menus = gal_view_menus_new (priv->view_collection);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->view_collection), "display_view",
-			    GTK_SIGNAL_FUNC (display_view_cb), 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_collection != NULL);
-
-	g_assert (priv->view_collection != NULL);
-	g_assert (priv->view_menus != NULL);
-
-	gtk_object_unref (GTK_OBJECT (priv->view_collection));
-	priv->view_collection = NULL;
-
-	gtk_object_unref (GTK_OBJECT (priv->view_menus));
-	priv->view_menus = NULL;
-}
-
-static void
-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint top_border, bottom_border, left_border, right_border;
-	gint col_width, row_height;
-	gfloat right_pane_width, top_pane_height;
-
-	priv = gcal->priv;
-
-	/* Get the size of the calendar month width & height. */
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	if (priv->current_view_type == 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);
-}
-
-/* Loads the initial data into the calendar; this should be called right after
- * the cal_opened signal from the client is invoked.
- */
-static void
-initial_load (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-/* 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
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (client == priv->client)
-			initial_load (gcal);
-
-		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;
-	}
-}
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-GtkWidget *
-gnome_calendar_construct (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GnomeCalendarViewType view_type;
-
-	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 (cal_opened_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), gcal);
-
-	e_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 (cal_opened_cb), gcal);
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->todo),
-					 priv->task_pad_client);
-
-	/* 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);
-}
-
-/**
- * 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 (ev._major != CORBA_NO_EXCEPTION) {
-		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 (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 ("add_calendar(): Invalid URI reported from the "
-				   "alarm notification service");
-		else if (strcmp (ex_id,
-				 ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError) == 0)
-			g_message ("add_calendar(): The alarm notification service could "
-				   "not contact the backend");
-	} else if (ev._major != CORBA_NO_EXCEPTION)
-		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 (ev._major != CORBA_NO_EXCEPTION)
-		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;
-
-	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);
-
-	if (!cal_client_open_calendar (priv->client, str_uri, FALSE)) {
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	add_alarms (str_uri);
-
-	/* Open the appropriate Tasks folder to show in the TaskPad.
-	   Currently we just show the folder named "Tasks", but it will be
-	   a per-calendar option in future. */
-
-	tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-	success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
-
-	add_alarms (tasks_uri);
-	g_free (tasks_uri);
-
-	if (!success) {
-		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);
-
-	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);
-}
-
-
-void
-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-					time_t	       start_time,
-					time_t	       end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-/**
- * gnome_calendar_get_selected_time_range:
- * @gcal: A calendar view.
- * @start_time: Return value for the start of the time selection.
- * @end_time: Return value for the end of the time selection.
- *
- * Queries the time selection range on the calendar view.
- **/
-void
-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-					time_t	 *start_time,
-					time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	if (start_time)
-		*start_time = priv->selection_start_time;
-
-	if (end_time)
-		*end_time = priv->selection_end_time;
-}
-
-
-/* Callback used when an event editor 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)
-{
-	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);
-	}
-
-	comp_editor_focus (COMP_EDITOR (ee));
-}
-
-/**
- * gnome_calendar_new_appointment:
- * @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.
- *
- * 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)
-{
-	GnomeCalendarPrivate *priv;
-	struct icaltimetype itt;
-	CalComponentDateTime dt;
-	CalComponent *comp;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (cal));
-
-	priv = cal->priv;
-
-	dt.value = &itt;
-	dt.tzid = icaltimezone_get_tzid (priv->zone);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	itt = icaltime_from_timet_with_zone (dtstart, FALSE, priv->zone);
-	if (all_day)
-		itt.hour = itt.minute = itt.second = 0;
-	cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet_with_zone (dtend, FALSE, priv->zone);
-	if (all_day) {
-		itt.hour = itt.minute = itt.second = 0;
-		icaltime_adjust (&itt, 1, 0, 0, 0);
-	}
-	cal_component_set_dtend (comp, &dt);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (cal, comp);
-	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);
-}
-
-/* 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 ();
-	}
-}
-
-
-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);
-	} 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);
-	} 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);
-	}
-
-	gnome_calendar_update_view_buttons (gcal);
-	focus_current_view (gcal);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-						     GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-
-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_set_view_buttons	(GnomeCalendar	*gcal,
-				 GtkWidget	*day_button,
-				 GtkWidget	*work_week_button,
-				 GtkWidget	*week_button,
-				 GtkWidget	*month_button)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (day_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (day_button));
-	g_return_if_fail (work_week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (work_week_button));
-	g_return_if_fail (week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (week_button));
-	g_return_if_fail (month_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (month_button));
-
-	priv = gcal->priv;
-
-	priv->day_button = day_button;
-	priv->work_week_button = work_week_button;
-	priv->week_button = week_button;
-	priv->month_button = month_button;
-}
-
-/* This makes the appropriate radio button in the toolbar active.  It blocks the
- * signals so that we can do a clean setup without affecting the views.
- */
-void
-gnome_calendar_update_view_buttons (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *button;
-
-	priv = gcal->priv;
-
-	switch (priv->current_view_type) {
-	case GNOME_CAL_DAY_VIEW:
-		button = priv->day_button;
-		break;
-
-	case GNOME_CAL_WORK_WEEK_VIEW:
-		button = priv->work_week_button;
-		break;
-
-	case GNOME_CAL_WEEK_VIEW:
-		button = priv->week_button;
-		break;
-
-	case GNOME_CAL_MONTH_VIEW:
-		button = priv->month_button;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (button), gcal);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (button), gcal);
-}
-
-void
-gnome_calendar_cut_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	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 ();
-	}
-}
-
-void
-gnome_calendar_copy_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	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 ();
-	}
-}
-
-void
-gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	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;
-	}
-}
-
-
-/* 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;
-}
-
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index 4b0dca84e3..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,150 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\
-					GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
-
-typedef struct _GnomeCalendar GnomeCalendar;
-typedef struct _GnomeCalendarClass GnomeCalendarClass;
-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;
-
-/* 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;
-};
-
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);
-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, 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);
-
-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-						   time_t	  start_time,
-						   time_t	  end_time);
-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-						   time_t	 *start_time,
-						   time_t	 *end_time);
-
-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,
-						 CalComponent  *comp);
-
-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);
-void       gnome_calendar_new_appointment_for   (GnomeCalendar *cal,
-						 time_t dtstart, time_t dtend,
-						 gboolean all_day);
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Tells the calendar to reload all config settings. initializing should be
-   TRUE when we are setting the config settings for the first time. */
-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-						  gboolean	 initializing);
-
-void	   gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-						 GtkWidget	*day_button,
-						 GtkWidget	*work_week_button,
-						 GtkWidget	*week_button,
-						 GtkWidget	*month_button);
-
-/* This makes the appropriate radio button in the toolbar active.
-   It sets the ignore_view_button_clicks flag so the "clicked" signal handlers
-   just return without doing anything. */
-void	   gnome_calendar_update_view_buttons	(GnomeCalendar	*gcal);
-
-/* 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);
-
-
-
-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 af5ceb4b1f..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 fded1caf80..0000000000
--- a/calendar/gui/goto.h
+++ /dev/null
@@ -1,32 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 9c8068bde0..0000000000
--- a/calendar/gui/itip-bonobo-control.c
+++ /dev/null
@@ -1,258 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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 (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-#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) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((text = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		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) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		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 799e65ca7a..0000000000
--- a/calendar/gui/itip-bonobo-control.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 9c8068bde0..0000000000
--- a/calendar/gui/itip-control-factory.c
+++ /dev/null
@@ -1,258 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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 (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-#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) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((text = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		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) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		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 799e65ca7a..0000000000
--- a/calendar/gui/itip-control-factory.h
+++ /dev/null
@@ -1,30 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 f755b13558..0000000000
--- a/calendar/gui/itip-utils.c
+++ /dev/null
@@ -1,350 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 <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 <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <gtk/gtkwidget.h>
-#include <gal/util/e-util.h>
-#include <ical.h>
-#include <Evolution-Composer.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 void
-error_dialog (gchar *str) 
-{
-	GtkWidget *dlg;
-	
-	dlg = gnome_error_dialog (str);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-}
-
-GList *
-itip_addresses_get (void)
-{
-	static Bonobo_ConfigDatabase db = NULL;
-	CORBA_Environment ev;
-	GList *addresses = NULL;
-	gboolean have_default = FALSE;
-	gint len, 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);
-
-	for (i = 0; i < len; i++) {
-		ItipAddress *a;
-		gchar *path;
-		
-		a = g_new0 (ItipAddress, 1);
-
-		/* get the identity info */
-		path = g_strdup_printf ("/Mail/Accounts/identity_name_%d", i);
-		a->name = bonobo_config_get_string (db, path, NULL);
-		g_free (path);
-
-		path = g_strdup_printf ("/Mail/Accounts/identity_address_%d", i);
-		a->address = bonobo_config_get_string (db, path, NULL);
-		g_free (path);
-
-		path = g_strdup_printf ("/Mail/Accounts/account_is_default_%d", i);
-		a->default_address = !have_default && bonobo_config_get_boolean (db, path, NULL);
-
-		if (a->default_address)
-			have_default = TRUE;
-		g_free (path);
-
-		a->full = g_strdup_printf ("%s <%s>", a->name, a->address);
-		addresses = g_list_append (addresses, a);
-	}
-
-	/* If nothing was marked as default */
-	if (!have_default && addresses != NULL) {
-		ItipAddress *a = addresses->data;
-		
-		a->default_address = TRUE;
-	}
-	
-	return addresses;
-}
-
-void
-itip_addresses_free (GList *addresses)
-{
-	GList *l;
-	
-	for (l = addresses; l != NULL; l = l->next) {
-		ItipAddress *a = l->data;
-
-		g_free (a->name);
-		g_free (a->address);
-		g_free (a->full);
-		g_free (a);
-	}
-	g_list_free (addresses);
-}
-
-const gchar *
-itip_strip_mailto (const gchar *address) 
-{
-	const gchar *text;
-	
-	if (address == NULL)
-		return NULL;
-	
-	text = e_strstrcase (address, "mailto:");
-	if (text != NULL && strlen (address) > 7)
-		address += 7;
-
-	return address;
-}
-
-void
-itip_send_comp (CalComponentItipMethod method, CalComponent *comp)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	GSList *attendees, *l;
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	CORBA_char *subject;
-	gint cntr;
-	gint len;
-	CalComponentText caltext;
-	CalComponentOrganizer organizer;
-	CORBA_char *content_type, *filename, *description;
-	GNOME_Evolution_Composer_AttachmentData *attach_data;
-	CORBA_boolean show_inline;
-	CORBA_char tempstr[200];
-	
-	CORBA_exception_init (&ev);
-
-	/* First, I obtain an object reference that represents 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);
-
-	switch (method) {
-	case CAL_COMPONENT_METHOD_REQUEST:
-	case CAL_COMPONENT_METHOD_CANCEL:
-		cal_component_get_attendee_list (comp, &attendees);
-		len = g_slist_length (attendees);
-		
-		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;
-			gchar *real;
-			
-			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));
-		}
-		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) {
-			error_dialog (_("An organizer must be set."));
-			return;
-		}
-		
-		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 (organizer.value);
-		break;
-
-	default:
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_list->_length = 0;
-		break;
-	}
-
-	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;
-	
-	cal_component_get_summary (comp, &caltext);
-	subject = CORBA_string_dup (caltext.value);
-
-	GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Unable to set composer headers while sending iTip message");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	sprintf (tempstr, "text/calendar;METHOD=%s", itip_methods[method]);
-	content_type = CORBA_string_dup (tempstr);
-	filename = CORBA_string_dup ("");
-	sprintf (tempstr, "Calendar attachment");
-	description = CORBA_string_dup (tempstr);
-	show_inline = FALSE;
-
-	/* Need to create an encapsulating iCalendar component, and
-	   stuff our component into it. */
-	{
-		icalcomponent *icomp, *clone;
-		icalproperty *prop;
-		icalvalue *value;
-		gchar *ical_string;
-
-		icomp = 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 (icomp, prop);
-
-		clone = icalcomponent_new_clone (cal_component_get_icalcomponent (comp));
-		icalcomponent_add_component (icomp, clone);
-
-		ical_string = icalcomponent_as_ical_string (icomp);
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();
-		attach_data->_maximum = attach_data->_length = strlen (ical_string);		
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);	
-		strcpy (attach_data->_buffer, ical_string);
-
-		icalcomponent_free (icomp);
-	}
-
-	GNOME_Evolution_Composer_attachData (composer_server, 
-					content_type, filename, description,
-					show_inline, attach_data,
-					&ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Unable to attach data to the composer while sending iTip message");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	if (method == CAL_COMPONENT_METHOD_PUBLISH)
-		GNOME_Evolution_Composer_show (composer_server, &ev);
-	else
-		GNOME_Evolution_Composer_send (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Unable to show the composer while sending iTip message");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	/* Let's free shit up. */
-
-	/* Beware--depending on whether CORBA_free is recursive, which I
-	   think is is, we might have memory leaks, in which case the code
-	   below is necessary. */
-#if 0
-	for (cntr = 0; cntr < priv->numentries; cntr++) {
-		recipient = &(to_list->_buffer[cntr]);
-		CORBA_free (recipient->name);
-		CORBA_free (recipient->address);
-		recipient->name = recipient->address = NULL;
-	}
-#endif
-
-	if (CORBA_sequence_get_release (to_list) != FALSE)
-		CORBA_free (to_list->_buffer);
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-
-	CORBA_free (subject);
-	CORBA_free (content_type);
-	CORBA_free (filename);
-	CORBA_free (description);
-	CORBA_free (attach_data);
-
-	/* bonobo_object_unref (BONOBO_OBJECT (bonobo_server));   */
-}
-
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
deleted file mode 100644
index 9a8fe330b6..0000000000
--- a/calendar/gui/itip-utils.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#ifndef ITIP_UTILS_HEADER
-#define ITIP_UTILS_HEADER
-
-#include <config.h>
-#include <ical.h>
-#include <string.h>
-#include <glib.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);
-void itip_addresses_free (GList *addresses);
-
-const gchar *itip_strip_mailto (const gchar *address);
-
-void itip_send_comp (CalComponentItipMethod method, CalComponent *comp);
-
-
-#endif
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index 8054bbb752..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,96 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <gal/widgets/e-cursors.h>
-
-#include "alarm-notify/alarm.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "component-factory.h"
-#include "control-factory.h"
-#include "itip-control-factory.h"
-#include "tasks-control-factory.h"
-
-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"));
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain(PACKAGE);
-
-	init_bonobo (argc, argv);
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	glade_gnome_init ();
-	alarm_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
-
-	control_factory_init ();
-	component_factory_init ();
-	itip_control_factory_init ();
-	tasks_control_factory_init ();
-
-	bonobo_main ();
-
-	alarm_done ();
-	calendar_config_write_on_exit ();
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/meeting-mockup.glade b/calendar/gui/meeting-mockup.glade
deleted file mode 100644
index 09f93af99f..0000000000
--- a/calendar/gui/meeting-mockup.glade
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>meeting-mockup</name>
-  <program_name>meeting-mockup</program_name>
-  <directory></directory>
-  <source_directory>.</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>GnomePropertyBox</class>
-  <name>meeting-dialog</name>
-  <visible>False</visible>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomeDock:contents</child_name>
-    <name>notebook1</name>
-    <border_width>2</border_width>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox51</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>6</spacing>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table11</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>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>
-
-      <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>3</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>
-	    <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>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>all-day-event</name>
-	    <can_focus>True</can_focus>
-	    <label>A_ll day event</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>2</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>start-time</name>
-	    <creation_function>make_date_edit</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>
-	    <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>
-      </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>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>False</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>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>_Confidential</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<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>GtkEntry</class>
-	  <name>contacts</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>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>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label61</name>
-      <label>_Meeting</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>vbox52</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-
-      <widget>
-	<class>GnomePixmap</class>
-	<name>pixmap1</name>
-	<filename>meeting_widget.png</filename>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label65</name>
-      <label>Atten_dees</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>
-
-</GTK-Interface>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index fcf3bcecfe..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,2413 +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>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/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 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
-
-
-/* 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;
-}
-
-
-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 >= 0.0) {
-		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 >= 0.0) {
-		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_string (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);
-
-	/* Calculate the top of where the text should be. */
-	y = (t + b + gnome_font_get_size (font)) / 2;
-
-	/* Now calculate the baseline. */
-	y -= gnome_font_get_ascender (font) + 1;
-
-	/* 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 bold font */
-static void
-print_text_size(GnomePrintContext *pc, double size, const char *text,
-		enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-	print_text(pc, font, text, align, l, r, t, b);
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-static void
-titled_box (GnomePrintContext *pc, const char *text, GnomeFont *font,
-	    enum align_box align, double *l, double *r, double *t, double *b,
-	    double linewidth)
-{
-	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;
-
-	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);
-	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 = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, FALSE,
-				       header_size * 0.8);
-	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 - header_size * 0.1, 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 * 0.9;
-
-	/* 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 = MIN (font_size, max_font_size);
-
-
-	/* 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 = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0,
-					      font_size);
-	font_bold = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0,
-					    font_size);
-
-	/* 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_string (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, _(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_string_n(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
-	return top;
-}
-
-
-/* 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], *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;
-	font_size = MIN (font_size, max_font_size);
-	font_hour    = gnome_font_new_closest ("Times", GNOME_FONT_BOLD,
-					       0, font_size);
-	hour_font_size = gnome_font_get_size (font_hour);
-
-	font_size = yinc * 0.33;
-	max_font_size = width * 0.25;
-	font_size = MIN (font_size, max_font_size);
-	font_minute  = gnome_font_new_closest ("Times", GNOME_FONT_BOOK,
-					       0, font_size);
-	minute_font_size = gnome_font_get_size (font_minute);
-
-	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 = _("am");
-		  else
-			  minute = _("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 = -1;
-	event.num_columns = -1;
-
-	/* 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.0, 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_string (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_string (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);
-
-	/* 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 = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, 12);
-	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 = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, font_size);
-	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 (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_string (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 (pc, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_string (font, buffer);
-	}
-
-	x1 += 4;
-	x2 -= 4;
-	print_text (pc, font, 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 (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-	x1 += gnome_font_get_width_string (font, buffer);
-
-	x1 += 4;
-	print_text (pc, font, 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];
-
-	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.0);
-			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);
-		print_text (pc, font, buffer, ALIGN_RIGHT,
-			    x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
-	}
-}
-
-
-
-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. */
-	psi.compress_weekend = calendar_config_get_compress_weekend ();
-	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 = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, font_size);
-
-	/* 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 = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0,
-				       MONTH_NORMAL_FONT_SIZE);
-	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++) {
-		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);
-		print_text (pc, font, buffer, ALIGN_CENTER, x1, x2, y1, y2);
-
-		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;
-	GList *uids;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-	struct icaltimetype *tt;
-
-	client = gnome_calendar_get_task_pad_cal_client (gcal);
-
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK,
-					       0, 10);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, _("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_TODO);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-		CalComponentText summary;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing: the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("print_todo_details(): Syntax error while getting object `%s'",
-				   uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		cal_component_get_summary (comp, &summary);
-
-		if (!summary.value)
-			continue;
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		/* Print the box to put the tick in. */
-		print_border (pc, x + 2, x + 8, y - 3, y - 11, 0.0, -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;
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	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), _("Current day (%a %b %d %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (NULL, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Week */
-
-	week_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 (week_start_day == 0)
-		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), _("Current week (%s - %s)"), str1, str2);
-
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Month */
-
-	strftime (text, sizeof (text), _("Current month (%b %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Year */
-
-	strftime (text, sizeof (text), _("Current year (%Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Select default */
-
-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);
-
-	gtk_widget_show_all (box);
-	return box;
-}
-
-
-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 (pc, 24, 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 (pc, 18, 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;
-
-	header = top - HEADER_HEIGHT;
-
-	/* FIXME: What is the name supposed to be for? */
-	gnome_print_beginpage (pc, "Calendar Week View");
-
-	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)
-		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 (pc, 24, 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 (pc, 24, 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 (pc, 24, 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 (pc, 24, 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 void
-print_date_label (GnomePrintContext *pc, CalComponent *comp,
-		  double left, double right, double top, double bottom)
-{
-	icaltimezone *zone = get_timezone ();
-	CalComponentDateTime datetime;
-	time_t start = 0, end = 0, complete = 0, due = 0;
-	static char buffer[1024];
-
-	cal_component_get_dtstart (comp, &datetime);
-	if (datetime.value)
-		start = icaltime_as_timet_with_zone (*datetime.value, zone);
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_dtend (comp, &datetime);
-	if (datetime.value)
-		end = icaltime_as_timet_with_zone (*datetime.value, zone);
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_due (comp, &datetime);
-	if (datetime.value)
-		due = icaltime_as_timet_with_zone (*datetime.value, zone);
-	cal_component_free_datetime (&datetime);
-
-	cal_component_get_completed (comp, &datetime.value);
-	if (datetime.value) {
-		complete = icaltime_as_timet_with_zone (*datetime.value, 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);
-	}
-
-	print_text_size (pc, 12, buffer, ALIGN_LEFT,
-			 left, right, top, top - 15);
-}
-
-static void
-print_comp_item (GnomePrintContext *pc, CalComponent *comp,
-		 double left, double right, double top, double bottom)
-{
-	GnomeFont *font;
-	CalComponentVType vtype;
-	CalComponentText text;
-	GSList *desc, *l;
-	
-	vtype = cal_component_get_vtype (comp);
-	
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-	case CAL_COMPONENT_TODO:
-		/* Summary */
-		cal_component_get_summary (comp, &text);
-		print_text_size (pc, 18, text.value, ALIGN_LEFT,
-				 left+3, right, top-3, top - 21);
-		top -= 21;
-	
-		/* Date information */
-		print_date_label (pc, comp, left+3, right, top-3, top - 15);
-		top -= 30;
-
-		/* Description */
-		font = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, FALSE, 12);
-		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, 3);
-		}
-		cal_component_free_text_list (desc);
-
-		break;
-	default:
-	}
-
-	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;
-
-		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_comp (CalComponent *comp, 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, 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 b2b537b063..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,44 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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, 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 8cdbac8462..0000000000
--- a/calendar/gui/tag-calendar.c
+++ /dev/null
@@ -1,172 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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;
-};
-
-/* 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)
-{
-	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;
-
-	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;
-
-	start_tt = icaltime_from_timet_with_zone (istart, FALSE, c->zone);
-	end_tt = icaltime_from_timet_with_zone (iend, 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))
-		return;
-
-#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);
-}
-
-/**
- * tag_calendar_by_comp:
- * @ecal: Calendar widget to tag.
- * @comp: A calendar component object.
- * 
- * Tags an #ECalendar widget with any occurrences of a specific calendar
- * component that occur within the calendar's current time range.
- **/
-void
-tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp, 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 (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))
-		return;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	cal_recur_generate_instances (comp, c.start_time, c.end_time,
-				      tag_calendar_cb, &c,
-				      cal_client_resolve_tzid_cb, client);
-}
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
deleted file mode 100644
index f9b11c1a5a..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-
-#endif
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
deleted file mode 100644
index 7435fbe740..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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-
-#include <liboaf/liboaf.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
-		return NULL;
-}
-
-
diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h
deleted file mode 100644
index e0ab93bac3..0000000000
--- a/calendar/gui/tasks-control-factory.h
+++ /dev/null
@@ -1,31 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 df3236fff0..0000000000
--- a/calendar/gui/tasks-control.c
+++ /dev/null
@@ -1,365 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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-util.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-util.h>
-#include "calendar-config.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);
-
-
-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) {
-		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)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-tasks_control_set_property		(BonoboPropertyBag	*bag,
-					 const BonoboArg	*arg,
-					 guint			 arg_id,
-					 CORBA_Environment      *ev,
-					 gpointer		 user_data)
-{
-	ETasks *tasks = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		filename = g_strdup_printf ("%s/tasks.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		e_tasks_open (tasks, filename);
-		g_free (filename);
-		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);
-}
-
-/* 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_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",	"evolution-tasks-mini.png"),
-	E_PIXMAP ("/menu/File/Print/Print",	"print.xpm"),
-	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);
-
-	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_tasks_setup_menus(tasks, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	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. */
-	calendar_config_check_timezone_set ();
-}
-
-
-static void
-tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	/* 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);
-}
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
deleted file mode 100644
index 39ecc8d1de..0000000000
--- a/calendar/gui/tasks-control.h
+++ /dev/null
@@ -1,32 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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 a658479cac..0000000000
--- a/calendar/gui/tasks-migrate.c
+++ /dev/null
@@ -1,308 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 01f124222b..0000000000
--- a/calendar/gui/tasks-migrate.h
+++ /dev/null
@@ -1,29 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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/topic.dat b/calendar/gui/topic.dat
deleted file mode 100644
index edc7813b26..0000000000
--- a/calendar/gui/topic.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-cal.html		Manual
-gnome-cal.html#cmdline  Command line options 
-\ No newline at end of file
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index 7eac5b6f80..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,575 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 c4cf9d774a..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,73 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 bbe828d2ea..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,285 +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;
-
-	/* A unique identifier for a calendar component */
-	typedef string CalObjUID;
-
-	/* 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;
-
-	/* 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;
-
-
-	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;
-
-		/* 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);
-
-		/* 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 */
-		CalObj getFreeBusy (in Time_t start, in Time_t end);
-
-		/* 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);
-
-
-		/* Updates a component by adding it if it does not exist or by
-		 * changing an existing one. This can be a simple VEVENT/VTODO
-		 * object if no timezone data is needed for the component or
-		 * it hasn't changed. To add or change the associated VTIMEZONE
-		 * data the calobj should be a VCALENDAR component with
-		 * VTIMEZONE and VEVENT/VTODO subcomponents. The VTIMEZONE data
-		 * will be merged into the calendar, possibly by renaming TZIDs
-		 * (though not for builtin VTIMEZONEs), 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 */
-		};
-
-		/* 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 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);
-	};
-
-	/* 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 {};
-
-		/* Open a calendar from an URI */
-		void open (in string uri, in boolean only_if_exists, in Listener listener)
-			raises (NilListener);
-	};
-
-	/* Interface to the alarm notification service */
-	interface AlarmNotify : Bonobo::Unknown {
-		exception InvalidURI {};
-		exception BackendContactError {};
-		exception NotFound {};
-
-		/* Adds a calendar to the alarm notification system */
-		void addCalendar (in string uri)
-			raises (InvalidURI, BackendContactError);
-
-		/* Removes a calendar from the alarm notification system */
-		void removeCalendar (in string uri)
-			raises (InvalidURI, NotFound);
-
-		/* Makes the alarm notification daemon unconditionally exit */
-		void die ();
-	};
-};
-
-};
-};
-
-#endif
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
deleted file mode 100644
index ac51a554db..0000000000
--- a/calendar/pcs/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-.pure
-*.la
-*.lo
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
deleted file mode 100644
index 9806c13fb3..0000000000
--- a/calendar/pcs/Makefile.am
+++ /dev/null
@@ -1,51 +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			\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = -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-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-db.c b/calendar/pcs/cal-backend-db.c
deleted file mode 100644
index 73aef5d054..0000000000
--- a/calendar/pcs/cal-backend-db.c
+++ /dev/null
@@ -1,1521 +0,0 @@
-/* Evolution calendar - iCalendar DB backend
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-util/cal-recur.h"
-#include "cal-backend-db.h"
-#include <db.h>
-#if DB_VERSION_MAJOR < 3
-#  error "You need libdb3 to compile the DB backend"
-#endif
-
-#define ENVIRONMENT_DIRECTORY "%s/evolution/local/Calendar/db.environment"
-
-/* structure to identify an open cursor */
-typedef struct {
-	gint ref;
-	DBC* dbc;
-	DB*  parent_db;
-	
-	/* data in the cursor */
-	GList *keys;
-	GList *data;
-} CalBackendDBCursor;
-
-/* private part of the CalBackendDB structure */
-struct _CalBackendDBPrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* Berkeley DB's library handles */
-	DB_ENV *environment;
-	DB *objects_db;
-	DB *history_db;
-
-	/* list of open cursors */
-	GList *cursors;
-
-	/* list of clients using this backend */
-	GList *clients;
-};
-
-static void cal_backend_db_class_init (CalBackendDBClass *klass);
-static void cal_backend_db_init (CalBackendDB *cbdb);
-static void cal_backend_db_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_db_get_uri (CalBackend *backend);
-static void cal_backend_db_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendOpenStatus cal_backend_db_open (CalBackend *backend,
-                                                 GnomeVFSURI *uri,
-                                                 gboolean only_if_exists);
-static gboolean cal_backend_db_is_loaded (CalBackend *backend);
-
-static int cal_backend_db_get_n_objects (CalBackend *backend, CalObjType type);
-static char *cal_backend_db_get_object (CalBackend *backend, const char *uid);
-static CalObjType cal_backend_db_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList* cal_backend_db_get_uids (CalBackend *backend, CalObjType type);
-static GList* cal_backend_db_get_objects_in_range (CalBackend *backend,
-                                                   CalObjType type,
-                                                   time_t start,
-                                                   time_t end);
-static char *cal_backend_db_get_free_busy (CalBackend *backend,
-					   time_t start,
-					   time_t end);
-static GNOME_Evolution_Calendar_CalObjChangeSeq *cal_backend_db_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_db_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end);
-
-static GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_db_get_alarms_for_object (
-	CalBackend *backend, const char *uid, time_t start, time_t end, gboolean *object_found);
-
-static gboolean cal_backend_db_update_object (CalBackend *backend,
-                                              const char *uid,
-                                              const char *calobj);
-static gboolean cal_backend_db_remove_object (CalBackend *backend, const char *uid);
-
-static void close_cursor (CalBackendDB *cbdb, CalBackendDBCursor *cursor);
-static CalBackendDBCursor *open_cursor (CalBackendDB *cbdb, DB *db);
-static CalBackendDBCursor *find_cursor_by_db (CalBackendDB *cbdb, DB *db);
-static DBT *find_record_by_id (CalBackendDBCursor *cursor, const gchar *id);
-
-static DB_TXN *begin_transaction (CalBackendDB *cbdb);
-static void commit_transaction (DB_TXN *tid);
-static void rollback_transaction (DB_TXN *tid);
-
-static CalBackendClass *parent_class;
-
-/**
- * cal_backend_db_get_type:
- * @void:
- *
- * Registers the #CalBackendDB class if necessary and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalBackendDB class.
- */
-GtkType
-cal_backend_db_get_type (void)
-{
-	static GtkType cal_backend_db_type = 0;
-
-	if (!cal_backend_db_type) {
-		static const GtkTypeInfo cal_backend_db_info = {
-			"CalBackendDB",
-			sizeof (CalBackendDB),
-			sizeof (CalBackendDBClass),
-			(GtkClassInitFunc) cal_backend_db_class_init,
-			(GtkObjectInitFunc) cal_backend_db_init,
-			NULL,
-			NULL,
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_db_type = gtk_type_unique(CAL_BACKEND_TYPE, &cal_backend_db_info);
-	}
-
-	return cal_backend_db_type;
-}
-
-/* class initialization function for the DB backend */
-static void
-cal_backend_db_class_init (CalBackendDBClass *klass)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) klass;
-	backend_class = (CalBackendClass *) klass;
-
-	parent_class = gtk_type_class(CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_db_destroy;
-
-	backend_class->get_uri = cal_backend_db_get_uri;
-	backend_class->add_cal = cal_backend_db_add_cal;
-	backend_class->open = cal_backend_db_open;
-	backend_class->is_loaded = cal_backend_db_is_loaded;
-	backend_class->get_n_objects = cal_backend_db_get_n_objects;
-	backend_class->get_object = cal_backend_db_get_object;
-	backend_class->get_type_by_uid = cal_backend_db_get_type_by_uid;
-	backend_class->get_uids = cal_backend_db_get_uids;
-	backend_class->get_objects_in_range = cal_backend_db_get_objects_in_range;
-	backend_class->get_free_busy = cal_backend_db_get_free_busy;
-	backend_class->get_changes = cal_backend_db_get_changes;
-	backend_class->get_alarms_in_range = cal_backend_db_get_alarms_in_range;
-	backend_class->get_alarms_for_object = cal_backend_db_get_alarms_for_object;
-	backend_class->update_object = cal_backend_db_update_object;
-	backend_class->remove_object = cal_backend_db_remove_object;
-}
-
-/* object initialization function for the DB backend */
-static void
-cal_backend_db_init (CalBackendDB *cbdb)
-{
-	CalBackendDBPrivate *priv;
-
-	priv = g_new0(CalBackendDBPrivate, 1);
-	cbdb->priv = priv;
-}
-
-/* Destroy handler for the DB backend */
-static void
-cal_backend_db_destroy (GtkObject *object)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBPrivate *priv;
-	GList *node;
-
-	g_return_if_fail(object != NULL);
-	g_return_if_fail(IS_CAL_BACKEND_DB(object));
-
-	cbdb = CAL_BACKEND_DB(object);
-	priv = cbdb->priv;
-
-	g_assert(cbdb->priv->clients == NULL);
-
-	/* clean up */
-	if (priv->uri) {
-		gnome_vfs_uri_unref(priv->uri);
-		priv->uri = NULL;
-	}
-
-	/* close open cursors */
-	while ((node = g_list_first(cbdb->priv->cursors))) {
-		close_cursor(cbdb, (CalBackendDBCursor *) node->data);
-	}
-
-	/* close open databases */
-	if (cbdb->priv->objects_db)
-		cbdb->priv->objects_db->close(cbdb->priv->objects_db, 0);
-	if (cbdb->priv->history_db)
-		cbdb->priv->history_db->close(cbdb->priv->history_db, 0);
-
-	/* close DB environment */
-	if (cbdb->priv->environment)
-		cbdb->priv->environment->close(cbdb->priv->environment, 0);
-	
-	g_free((gpointer) priv);
-	cbdb->priv = NULL;
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		(*GTK_OBJECT_CLASS(parent_class)->destroy)(object);
-}
-
-/*
- * Private functions
- */
-
-/* close an open cursor and frees all associated memory */
-static void
-close_cursor (CalBackendDB *cbdb, CalBackendDBCursor *cursor)
-{
-	GList *node;
-	DBT *dbt;
-
-	g_return_if_fail(cursor != NULL);
-
-	cursor->ref--;
-	if (cursor->ref > 0)
-		return;
-
-	/* free all keys and data */
-	while ((node = g_list_first(cursor->keys))) {
-		dbt = (DBT *) node->data;
-		cursor->keys = g_list_remove(cursor->keys, (gpointer) dbt);
-		g_free((gpointer) dbt);
-	}
-	while ((node = g_list_first(cursor->data))) {
-		dbt = (DBT *) node->data;
-		cursor->data = g_list_remove(cursor->data, (gpointer) dbt);
-		g_free((gpointer) dbt);
-	}
-
-	/* finally, close the cursor */
-	cursor->dbc->c_close(cursor->dbc);
-
-	cbdb->priv->cursors = g_list_remove(cbdb->priv->cursors, (gpointer) cursor);
-	g_free((gpointer) cursor);
-}
-
-/* open a cursor for the given database */
-static CalBackendDBCursor *
-open_cursor (CalBackendDB *cbdb, DB *db)
-{
-	CalBackendDBCursor *cursor;
-	gint ret;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(db != NULL, NULL);
-
-	/* search for the cursor in our list of cursors */
-	cursor = find_cursor_by_db(cbdb, db);
-	if (cursor) {
-		cursor->ref++;
-		return cursor;
-	}
-
-	/* create the cursor */
-	cursor = g_new0(CalBackendDBCursor, 1);
-	cursor->parent_db = db;
-	cursor->ref = 1;
-
-	ret = db->cursor(db, NULL, &cursor->dbc, 0);
-	if (ret == 0) {
-		DBT key;
-		DBT data;
-
-		/* read data */
-		memset(&key, 0, sizeof(key));
-		memset(&data, 0, sizeof(data));
-		
-		while ((ret = cursor->dbc->c_get(cursor->dbc, &key, &data, DB_NEXT)) == 0) {
-			cursor->keys = g_list_append(cursor->keys, g_memdup(&key, sizeof(key)));
-			cursor->data = g_list_append(cursor->data, g_memdup(&data, sizeof(data)));
-			
-			memset(&key, 0, sizeof(key));
-			memset(&data, 0, sizeof(data));
-		}
-		if (ret == DB_NOTFOUND) {
-			cbdb->priv->cursors = g_list_prepend(cbdb->priv->cursors, (gpointer) cursor);
-			return cursor;
-		}
-
-		/* close cursor on error */
-		close_cursor(cbdb, cursor);
-	}
-
-	return NULL;
-}
-
-/* search for a cursor in the given backend */
-static CalBackendDBCursor *
-find_cursor_by_db (CalBackendDB *cbdb, DB *db)
-{
-	GList *node;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(db != NULL, NULL);
-
-	for (node = g_list_first(cbdb->priv->cursors); node != NULL; node = g_list_next(node)) {
-		CalBackendDBCursor* cursor = (CalBackendDBCursor *) node->data;
-
-		if (cursor && cursor->parent_db == db)
-			return cursor;
-	}
-
-	return NULL; /* not found */
-}
-
-/* finds a record in a cursor by its ID */
-static DBT *
-find_record_by_id (CalBackendDBCursor *cursor, const gchar *id)
-{
-	GList *node;
-
-	g_return_val_if_fail(cursor != NULL, NULL);
-	g_return_val_if_fail(id != NULL, NULL);
-
-	
-	for (node = g_list_first(cursor->keys); node != NULL; node = g_list_next(node)) {
-		DBT *key;
-		
-		key = (DBT *) node->data;
-		if (key && !strcmp(key->data, id)) {
-			GList *tmp;
-			
-			tmp = g_list_nth(cursor->data, g_list_position(cursor->keys, node));
-			if (tmp)
-				return (DBT *) tmp->data;
-			return NULL; /* no data associated with this key */
-		}
-	}
-
-	return NULL; /* not found */
-}
-
-/* start a new transaction */
-static DB_TXN *
-begin_transaction (CalBackendDB *cbdb)
-{
-	DB_TXN *tid;
-	gint ret;
-	
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	
-	if ((ret = txn_begin(cbdb->priv->environment, NULL, &tid, 0)) != 0) {
-		/* TODO: error logging */
-		return NULL;
-	}
-	
-	return tid;
-}
-
-/* finish successfully a transaction */
-static void
-commit_transaction (DB_TXN *tid)
-{
-	gint ret;
-	
-	g_return_if_fail(tid != NULL);
-	
-	if ((ret = txn_commit(tid, 0)) != 0) {
-		/* TODO: error logging? */
-	}
-}
-
-/* abort a transaction */
-static void
-rollback_transaction (DB_TXN *tid)
-{
-	gint ret;
-	
-	g_return_if_fail(tid != NULL);
-	
-	if ((ret = txn_abort(tid)) != 0) {
-		/* TODO: error logging? */
-	}
-}
-
-/*
- * Calendar backend methods
- */
-
-/* get_uri handler for the DB backend */
-static GnomeVFSURI *
-cal_backend_db_get_uri (CalBackend *backend)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	return cbdb->priv->uri;
-}
-
-/* callback used when a Cal is destroyed */
-static void
-destroy_cal_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *tmp_cal;
-	CalBackendDB *cbdb;
-	GList *node;
-
-	cal = CAL(object);
-	cbdb = CAL_BACKEND_DB(data);
-	
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-
-	/* find the Cal in the list of clients */
-	for (node = cbdb->priv->clients; node != NULL; node = g_list_next(node)) {
-		tmp_cal = CAL(node->data);
-		if (tmp_cal == cal)
-			break;
-	}
-
-	if (node) {
-		/* disconnect this Cal */
-		cbdb->priv->clients = g_list_remove_link(cbdb->priv->clients, node);
-		g_list_free_1(node);
-
-		/* when all clients go away, notify the parent factory about it so that
-		 * it may decide to kill the backend or not.
-		 */
-		if (!cbdb->priv->clients)
-			cal_backend_last_client_gone(CAL_BACKEND(cbdb));
-	}
-}
-
-/* add_cal_handler for the DB backend */
-static void
-cal_backend_db_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-	g_return_if_fail(IS_CAL(cal));
-
-	/* we do not keep a reference to the Cal since the calendar user agent
-	 * owns it
-	 */
-	gtk_signal_connect(GTK_OBJECT(cal),
-	                   "destroy",
-	                   GTK_SIGNAL_FUNC(destroy_cal_cb),
-	                   backend);
-
-	cbdb->priv->clients = g_list_prepend(cbdb->priv->clients, (gpointer) cal);
-}
-
-/* database file initialization */
-static gboolean
-open_database_file (CalBackendDB *cbdb, const gchar *str_uri, gboolean only_if_exists)
-{
-	gint ret;
-	struct stat sb;
-	gchar *dir;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->history_db != NULL, FALSE);
-	g_return_val_if_fail(str_uri != NULL, FALSE);
-
-	/* initialize DB environment (for transactions) */
-	dir = g_strdup_printf(ENVIRONMENT_DIRECTORY, g_get_home_dir());
-	if (stat(dir, &sb) != 0) {
-
-		/* if the directory exists, we're done, since DB will fail if it's the
-		 * wrong one. If it does not exist, create the environment */
-		if (mkdir(dir, S_IRWXU) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-		
-		/* create the environment handle */
-		if ((ret = db_env_create(&cbdb->priv->environment, 0)) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-		
-		cbdb->priv->environment->set_errpfx(cbdb->priv->environment, "cal-backend-db");
-		
-		/* open the transactional environment */
-		if ((ret = cbdb->priv->environment->open(cbdb->priv->environment,
-		                                         ENVIRONMENT_DIRECTORY,
-		                                         DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG |
-		                                         DB_INIT_MPOOL | DB_INIT_TXN |
-		                                         DB_RECOVER | DB_THREAD,
-		                                         S_IRUSR | S_IWUSR)) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-	}
-	
-	g_free((gpointer) dir);
-	
-	/* open/create objects database into given file */
-	if ((ret = db_create(&cbdb->priv->objects_db, cbdb->priv->environment, 0)) != 0
-	    || (ret = db_create(&cbdb->priv->history_db, cbdb->priv->environment, 0)) != 0) {
-		return FALSE;
-	}
-
-	if (only_if_exists) {
-		ret = cbdb->priv->objects_db->open(cbdb->priv->objects_db,
-		                                   str_uri,
-		                                   "calendar_objects",
-		                                   DB_HASH,
-		                                   DB_THREAD,
-		                                   0644);
-	}
-	else {
-		ret = cbdb->priv->objects_db->open(cbdb->priv->objects_db,
-		                                   str_uri,
-		                                   "calendar_objects",
-		                                   DB_HASH,
-		                                   DB_CREATE | DB_THREAD,
-		                                   0644);
-	}
-	if (ret == 0) {
-		/* now, open the history database */
-		ret = cbdb->priv->history_db->open(cbdb->priv->history_db,
-		                                   str_uri,
-		                                   "calendar_history",
-		                                   DB_BTREE,
-		                                   DB_CREATE | DB_THREAD,
-		                                   0644);
-		if (ret == 0) return TRUE;
-
-		/* close objects database on error */
-		cbdb->priv->objects_db->close(cbdb->priv->objects_db, 0);
-	}
-
-	return FALSE;
-}
-
-/* open handler for the DB backend */
-static CalBackendOpenStatus
-cal_backend_db_open (CalBackend *backend, GnomeVFSURI *uri, gboolean only_if_exists)
-{
-	CalBackendDB *cbdb;
-	gchar *str_uri;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(cbdb->priv != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(uri != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(cbdb->priv->objects_db == NULL, CAL_BACKEND_OPEN_ERROR);
-
-	/* open the given URI */
-	if (!gnome_vfs_uri_is_local(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));
-
-	/* open database file */
-	if (!open_database_file(cbdb, (const gchar *) str_uri, only_if_exists)) {
-		g_free((gpointer) str_uri);
-		return CAL_BACKEND_OPEN_ERROR;
-	}
-
-	gnome_vfs_uri_ref(uri);
-	cbdb->priv->uri = uri;
-	g_free((gpointer) str_uri);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-/* is_loaded handler for the DB backend */
-static gboolean
-cal_backend_db_is_loaded (CalBackend *backend)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB (backend);
-
-	return (cbdb->priv->uri != NULL);
-}
-
-/* get_n_objects handler for the DB backend */
-static int
-cal_backend_db_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	int total_count = 0;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), -1);
-	g_return_val_if_fail(cbdb->priv != NULL, -1);
-
-	/* open the cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GList *node;
-
-		/* we traverse all data, to check for each object's type */
-		for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-			icalcomponent *icalcomp;
-			DBT *data = (DBT *) node->data;
-
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				switch (icalcomponent_isa(icalcomp)) {
-					case ICAL_VEVENT_COMPONENT :
-						if (type & CALOBJ_TYPE_EVENT)
-							total_count++;
-						break;
-					case ICAL_VTODO_COMPONENT :
-						if (type & CALOBJ_TYPE_TODO)
-							total_count++;
-						break;
-					case ICAL_VJOURNAL_COMPONENT :
-						if (type & CALOBJ_TYPE_JOURNAL)
-							total_count++;
-						break;
-					default :
-						break;
-				}
-				icalcomponent_free(icalcomp);
-			}
-		}
-		close_cursor(cbdb, cursor);
-	}
-
-	return total_count;
-}
-
-/* get_object handler for the DB backend */
-static char *
-cal_backend_db_get_object (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	gint ret;
-	DBT key;
-	DBT data;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, NULL);
-	g_return_val_if_fail(uid != NULL, NULL);
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-	
-	/* read record from database */
-	if ((ret = cbdb->priv->objects_db->get(cbdb->priv->objects_db,
-	                                       NULL,
-	                                       &key,
-	                                       &data,
-	                                       0)) == 0) {
-		gchar *str = g_strdup((gchar *) data.data);
-		return str;
-	}
-	
-	return NULL;
-}
-
-/* get_type_by_uid handler for the DB backend */
-static CalObjType
-cal_backend_db_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	DBT key;
-	DBT data;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(cbdb->priv != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(uid != NULL, CAL_COMPONENT_NO_TYPE);
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-	
-	/* read record from database */
-	if ((ret = cbdb->priv->objects_db->get(cbdb->priv->objects_db,
-	                                       NULL,
-	                                       &key,
-	                                       &data,
-	                                       0)) == 0) {
-		icalcomponent *icalcomp = icalparser_parse_string((char *) data.data);
-		if (icalcomp) {
-			CalObjType type;
-			
-			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);
-			return type;
-		}
-	}
-
-	return CAL_COMPONENT_NO_TYPE;
-}
-
-static GList *
-add_uid_if_match (GList *list, CalBackendDBCursor *cursor, GList *data_node, CalObjType type)
-{
-	DBT *data;
-
-	g_return_val_if_fail(cursor != NULL, list);
-	g_return_val_if_fail(data_node != NULL, list);
-	
-	data = (DBT *) data_node->data;
-	if (data) {
-		icalcomponent *icalcomp;
-		gchar *uid = NULL;
-
-		icalcomp = icalparser_parse_string(data->data);
-		if (!icalcomp) return list;
-
-		switch (icalcomponent_isa(icalcomp)) {
-			case ICAL_VEVENT_COMPONENT :
-				if (type & CALOBJ_TYPE_EVENT)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			case ICAL_VTODO_COMPONENT :
-				if (type & CALOBJ_TYPE_TODO)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			case ICAL_VJOURNAL_COMPONENT :
-				if (type & CALOBJ_TYPE_JOURNAL)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			default :
-				uid = NULL;
-		}
-
-		if (uid)
-			list = g_list_prepend(list, g_strdup(uid));
-		icalcomponent_free(icalcomp);
-	}
-
-	return list;
-}
-
-/* get_uids handler for the DB backend */
-static GList *
-cal_backend_db_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendDB *cbdb;
-	GList *list = NULL;
-	CalBackendDBCursor *cursor;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GList *node;
-
-		/* we traverse all data, to check for each object's type */
-		for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-			list = add_uid_if_match(list, cursor, node, type);
-		}
-		close_cursor(cbdb, cursor);
-	}
-
-	return list;
-}
-
-/* callback used from cal_recur_generate_instances(): adds the component's UID to
- * our hash table
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	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;
-}
-
-/* creates the list of UIDs in the given range */
-static void
-get_instances_in_range (GHashTable *uid_hash,
-                        CalBackendDBCursor *cursor,
-                        CalObjType type,
-                        time_t start,
-                        time_t end)
-{
-	GList *node;
-
-	g_return_if_fail(uid_hash != NULL);
-	g_return_if_fail(cursor != NULL);
-
-	for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-		DBT *data;
-		icalcomponent *icalcomp;
-
-		data = (DBT *) node->data;
-		if (data) {
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				CalComponent *comp = cal_component_new();
-				cal_component_set_icalcomponent(comp, icalcomp);
-
-				switch (icalcomponent_isa(icalcomp)) {
-					case ICAL_VEVENT_COMPONENT :
-						if (type & CALOBJ_TYPE_EVENT)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-							                             uid_hash);
-						break;
-					case ICAL_VTODO_COMPONENT :
-						if (type & CALOBJ_TYPE_TODO)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-						 	                            uid_hash);
-						break;
-					case ICAL_VJOURNAL_COMPONENT :
-						if (type & CALOBJ_TYPE_JOURNAL)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-						 	                            uid_hash);
-						break;
-					default :
-						break;
-				}
-
-				gtk_object_unref(GTK_OBJECT(comp));
-				icalcomponent_free(icalcomp);
-			}
-		}
-	}
-}
-
-/* callback 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;
-
-	list = (GList **) data;
-
-	uid = (const char *) key;
-	*list = g_list_prepend(*list, (gpointer) g_strdup(uid));
-}
-
-/* get_objects_in_range handler for the DB backend */
-static GList *
-cal_backend_db_get_objects_in_range (CalBackend *backend,
-                                     CalObjType type,
-                                     time_t start,
-                                     time_t end)
-{
-	CalBackendDB *cbdb;
-	GList *list = NULL;
-	CalBackendDBCursor *cursor;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GHashTable *uid_hash;
-
-		/* build the hash table */
-		uid_hash = g_hash_table_new(g_str_hash, g_str_equal);
-		get_instances_in_range(uid_hash, cursor, type, start, end);
-
-		/* build the list to be returned from the hash table */
-		g_hash_table_foreach(uid_hash, add_uid_to_list, &list);
-		g_hash_table_destroy(uid_hash);
-		
-		close_cursor(cbdb, cursor);
-	}
-	
-	return list;
-}
-
-/* get_free_busy handler for the DB backend */
-static char *
-cal_backend_db_get_free_busy (CalBackend *backend, time_t start, time_t end)
-{
-	return NULL;
-}
-
-/* get_changes handler for the DB backend */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_db_get_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	return NULL;
-}
-
-/* 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;
-
-	*alarm_start = start;
-	*alarm_end = end;
-
-	for (l = alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_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_free (alarm);
-
-		switch (trigger.type) {
-			case CAL_ALARM_TRIGGER_NONE:
-			case CAL_ALARM_TRIGGER_ABSOLUTE:
-				continue;
-			case CAL_ALARM_TRIGGER_RELATIVE_START:
-			case CAL_ALARM_TRIGGER_RELATIVE_END:
-				dur = &trigger.u.rel_duration;
-				dur_time = icaldurationtype_as_int (*dur);
-				
-				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 ();
-		}
-	}
-
-	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;
-};
-
-/* 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;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		time_t occur_time, trigger_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		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;
-
-		if (trigger_time < aod->start || trigger_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = trigger_time;
-		instance->occur = occur_time;
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-
-	return TRUE;
-}
-
-/* generates the absolute triggers for a component */
-static void
-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod)
-{
-	GList *l;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		time_t abs_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)
-			continue;
-
-		abs_time = icaltime_as_timet (trigger.u.abs_time);
-
-		if (abs_time < aod->start || abs_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = abs_time;
-		instance->occur = abs_time; /* No particular occurrence, so just use the same time */
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-}
-
-/* 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;
-}
-
-/* generates alarm instances for a calendar component.  Returns the instances
- * structure, or NULL if no alarm instances occurred in the specified time
- * range.
- */
-static CalComponentAlarms *
-generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
-{
-	CalComponentAlarms *alarms = NULL;
-	GList *alarm_uids;
-	time_t alarm_start, alarm_end;
-	struct alarm_occurrence_data aod;
-
-	g_return_val_if_fail(IS_CAL_COMPONENT(comp), NULL);
-
-	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);
-
-	/* we add the ABSOLUTE triggers separately */
-	generate_absolute_triggers(comp, &aod);
-
-	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;
-}
-
-/* retrieve list of alarms */
-static GSList *
-get_list_of_alarms (CalBackendDBCursor *cursor, time_t start, time_t end)
-{
-	GSList *list = NULL;
-	GList *node;
-
-	g_return_val_if_fail(cursor != NULL, NULL);
-	
-	for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		DBT *data;
-		
-		data = (DBT *) node->data;
-		if (data) {
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				/* per RFC 2445, only VEVENTs and VTODOs can have alarms */
-				kind = icalcomponent_isa(icalcomp);
-				if (kind == ICAL_VEVENT_COMPONENT || kind == ICAL_VTODO_COMPONENT) {
-					CalComponent *comp;
-					CalComponentAlarms *alarms;
-					
-					/* create the CalComponent to compute the alarms */
-					comp = cal_component_new();
-					cal_component_set_icalcomponent(comp, icalcomp);
-					
-					alarms = generate_alarms_for_comp(comp, start, end);
-					if (alarms)
-						list = g_slist_prepend(list, (gpointer) alarms);
-
-					gtk_object_unref(GTK_OBJECT(comp));
-				}
-				
-				icalcomponent_free(icalcomp);
-			}
-		}
-	}
-
-	return list;
-}
-
-/* fills a CORBA sequence of alarm instances */
-static void
-fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms)
-{
-	int n_alarms;
-	GSList *l;
-	int i;
-
-	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 != NULL; l = l->next, i++) {
-		CalAlarmInstance *instance;
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-
-		instance = (CalAlarmInstance *) l->data;
-		corba_instance = seq->_buffer + i;
-
-		corba_instance->auid = CORBA_string_dup(instance->auid);
-		corba_instance->trigger = (long) instance->trigger;
-		corba_instance->occur = (long) instance->occur;
-	}
-}
-
-/* get_alarms_in_range handler for the DB backend */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_db_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	gint number_of_alarms;
-	GSList *alarm_list;
-	GSList *node;
-	gint i;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq = NULL;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		alarm_list = get_list_of_alarms(cursor, start, end);
-		number_of_alarms = g_slist_length(alarm_list);
-		
-		/* create the CORBA sequence */
-		seq = GNOME_Evolution_Calendar_CalComponentAlarmsSeq__alloc();
-		CORBA_sequence_set_release(seq, TRUE);
-		seq->_length = number_of_alarms;
-		seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalComponentAlarms_allocbuf(
-			number_of_alarms);
-		
-		/* populate CORBA sequence */
-		for (node = alarm_list, i = 0; node != NULL; node = node->next, i++) {
-			CalComponentAlarms *alarms;
-			gchar *comp_str;
-			
-			alarms = (CalComponentAlarms *) node->data;
-			
-			comp_str = cal_component_get_as_string (alarms->comp);
-			seq->_buffer[i].calobj = CORBA_string_dup(comp_str);
-			g_free((gpointer) comp_str);
-
-			fill_alarm_instances_seq(&seq->_buffer[i].alarms, alarms->alarms);
-			
-			cal_component_alarms_free(alarms);
-		}
-		
-		g_slist_free(alarm_list);
-		close_cursor(cbdb, cursor);
-	}
-
-	return seq;
-}
-
-/* get_alarms_for_object handler for the DB backend */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_db_get_alarms_for_object (CalBackend *backend,
-                                      const char *uid,
-                                      time_t start,
-                                      time_t end,
-                                      gboolean *object_found)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms = NULL;
-	DBT *data;
-	gchar *comp_str;
-	CalComponentAlarms *alarms;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != 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);
-
-	*object_found = FALSE;
-
-	/* open the cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		data = find_record_by_id(cursor, uid);
-		if (data) {
-			icalcomponent *icalcomp;
-			CalComponent *comp;
-			
-			*object_found = TRUE;
-
-			comp_str = (gchar *) data->data;
-			
-			icalcomp = icalparser_parse_string(comp_str);
-			if (!icalcomp) {
-				close_cursor(cbdb, cursor);
-				return NULL;
-			}
-			
-			comp = cal_component_new();
-			cal_component_set_icalcomponent(comp, icalcomp);
-						
-			/* create the CORBA alarms */
-			corba_alarms = GNOME_Evolution_Calendar_CalComponentAlarms__alloc();
-			corba_alarms->calobj = CORBA_string_dup (comp_str);
-			
-			/* populate the CORBA sequence */
-			alarms = generate_alarms_for_comp(comp, start, end);
-			if (alarms) {
-				fill_alarm_instances_seq(&corba_alarms->alarms, alarms->alarms);
-				cal_component_alarms_free(alarms);
-			}
-			else
-				fill_alarm_instances_seq(&corba_alarms->alarms, NULL);
-
-			gtk_object_unref(GTK_OBJECT(comp));
-			icalcomponent_free(icalcomp);
-		}
-		
-		close_cursor(cbdb, cursor);
-	}
-
-	return corba_alarms;
-}
-
-/* do notifications to Cal clients */
-static void
-do_notify (CalBackendDB *cbdb, void (*notify_fn)(Cal *, gchar *), const gchar *uid)
-{
-	GList *node;
-
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-	g_return_if_fail(notify_fn != NULL);
-	g_return_if_fail(uid != NULL);
-	
-	/* FIXME: do notification asynchronously */
-	for (node = g_list_first(cbdb->priv->clients); node != NULL; node = g_list_next(node)) {
-		Cal *cal;
-		
-		cal = CAL(node->data);
-		(*notify_fn)(cal, (gpointer) uid);
-	}
-}
-
-/* adds a record to the history database */
-static gboolean
-add_history (CalBackendDB *cbdb, DB_TXN *tid, const gchar *uid, const gchar *calobj)
-{
-	DBT key;
-	DBT new_data;
-	gint ret;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	g_return_val_if_fail(calobj != NULL, FALSE);
-
-	/* fill in DBT structures */
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-
-	memset(&new_data, 0, sizeof(new_data));
-	new_data.data = (void *) calobj;
-	new_data.size = strlen(calobj); // + 1
-
-	/* add the new record to the database */
-	if ((ret = cbdb->priv->history_db->put(cbdb->priv->objects_db,
-	                                       tid,
-	                                       &key,
-	                                       &new_data,
-	                                       0)) != 0) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* update_object handler for the DB backend */
-static gboolean
-cal_backend_db_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalBackendDB *cbdb;
-	DB_TXN *tid;
-	DBT key;
-	DBT new_data;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	g_return_val_if_fail(calobj != NULL, FALSE);
-
-	/* start transaction */
-	tid = begin_transaction(cbdb);
-	if (!tid)
-		return FALSE;
-	
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-		
-	memset(&new_data, 0, sizeof(new_data));
-	new_data.data = (void *) calobj;
-	new_data.size = strlen(calobj); // + 1
-		
-	if ((ret = cbdb->priv->objects_db->put(cbdb->priv->objects_db,
-	                                       tid,
-	                                       &key,
-	                                       &new_data,
-	                                       0)) != 0) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-			
-	if (!add_history(cbdb, tid, uid, calobj)) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-	commit_transaction(tid);
-
-	cal_backend_obj_updated (CAL_BACKEND (cbdb), uid);
-	do_notify(cbdb, cal_notify_update, uid);
-	return TRUE;
-}
-
-/* remove_object handler for the DB backend */
-static gboolean
-cal_backend_db_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	DB_TXN *tid;
-	DBT key;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-
-	/* start transaction */
-	tid = begin_transaction(cbdb);
-	if (!tid)
-		return FALSE;
-
-	/* remove record from database */
-	if ((ret = cbdb->priv->objects_db->del(cbdb->priv->objects_db, tid, &key, 0)) != 0) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-			
-	/* TODO: update history database */
-	commit_transaction(tid);
-	
-	cal_backend_obj_removed (CAL_BACKEND (cbdb), uid);
-	do_notify(cbdb, cal_notify_remove, uid);
-			
-	return TRUE;
-}
diff --git a/calendar/pcs/cal-backend-db.h b/calendar/pcs/cal-backend-db.h
deleted file mode 100644
index c73dbb5a83..0000000000
--- a/calendar/pcs/cal-backend-db.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Evolution calendar - iCalendar DB backend
- *
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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_DB_H
-#define CAL_BACKEND_DB_H
-
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-#define CAL_BACKEND_DB_TYPE            (cal_backend_db_get_type ())
-#define CAL_BACKEND_DB(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_DB_TYPE,		\
-					  CalBackendDB))
-#define CAL_BACKEND_DB_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_DB_TYPE,	\
-					  CalBackendDBClass))
-#define IS_CAL_BACKEND_DB(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_DB_TYPE))
-#define IS_CAL_BACKEND_DB_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_DB_TYPE))
-
-typedef struct _CalBackendDB CalBackendDB;
-typedef struct _CalBackendDBClass CalBackendDBClass;
-
-typedef struct _CalBackendDBPrivate CalBackendDBPrivate;
-
-struct _CalBackendDB {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendDBPrivate *priv;
-};
-
-struct _CalBackendDBClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_db_get_type (void);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
deleted file mode 100644
index 028949aa1a..0000000000
--- a/calendar/pcs/cal-backend-file.c
+++ /dev/null
@@ -1,1782 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "e-util/e-dbhash.h"
-#include "cal-util/cal-recur.h"
-#include "cal-util/cal-util.h"
-#include "cal-backend-file.h"
-
-
-
-/* Private part of the CalBackendFile structure */
-struct _CalBackendFilePrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* List of Cal objects with their listeners */
-	GList *clients;
-
-	/* Toplevel VCALENDAR component */
-	icalcomponent *icalcomp;
-
-	/* All the CalComponent objects in the calendar, hashed by UID.  The
-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not
-	 * copied, so don't free it when you remove an object from the hash
-	 * table.
-	 */
-	GHashTable *comp_uid_hash;
-
-	/* All event, to-do, and journal components in the calendar; they are
-	 * here just for easy access (i.e. so that you don't have to iterate
-	 * over the comp_uid_hash).  If you need *all* the components in the
-	 * calendar, iterate over the hash instead.
-	 */
-	GList *events;
-	GList *todos;
-	GList *journals;
-
-	/* Idle handler for saving the calendar when it is dirty */
-	guint idle_id;
-};
-
-
-
-static void cal_backend_file_class_init (CalBackendFileClass *class);
-static void cal_backend_file_init (CalBackendFile *cbfile);
-static void cal_backend_file_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_file_get_uri (CalBackend *backend);
-static void cal_backend_file_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendOpenStatus cal_backend_file_open (CalBackend *backend, GnomeVFSURI *uri,
-						   gboolean only_if_exists);
-static gboolean cal_backend_file_is_loaded (CalBackend *backend);
-
-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 char *cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid);
-static CalObjType cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);
-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-						     time_t start, time_t end);
-static char *cal_backend_file_get_free_busy (CalBackend *backend, 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 CalBackendClass *parent_class;
-
-
-
-/**
- * cal_backend_file_get_type:
- * @void: 
- * 
- * Registers the #CalBackendFile class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalBackendFile class.
- **/
-GtkType
-cal_backend_file_get_type (void)
-{
-	static GtkType cal_backend_file_type = 0;
-
-	if (!cal_backend_file_type) {
-		static const GtkTypeInfo cal_backend_file_info = {
-			"CalBackendFile",
-			sizeof (CalBackendFile),
-			sizeof (CalBackendFileClass),
-			(GtkClassInitFunc) cal_backend_file_class_init,
-			(GtkObjectInitFunc) cal_backend_file_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &cal_backend_file_info);
-	}
-
-	return cal_backend_file_type;
-}
-
-/* Class initialization function for the file backend */
-static void
-cal_backend_file_class_init (CalBackendFileClass *class)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) class;
-	backend_class = (CalBackendClass *) class;
-
-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_file_destroy;
-
-	backend_class->get_uri = cal_backend_file_get_uri;
-	backend_class->add_cal = cal_backend_file_add_cal;
-	backend_class->open = cal_backend_file_open;
-	backend_class->is_loaded = cal_backend_file_is_loaded;
-	backend_class->get_n_objects = cal_backend_file_get_n_objects;
-	backend_class->get_object = cal_backend_file_get_object;
-	backend_class->get_timezone_object = cal_backend_file_get_timezone_object;
-	backend_class->get_type_by_uid = cal_backend_file_get_type_by_uid;
-	backend_class->get_uids = cal_backend_file_get_uids;
-	backend_class->get_objects_in_range = cal_backend_file_get_objects_in_range;
-	backend_class->get_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;
-}
-
-/* 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->clients = NULL;
-	priv->icalcomp = NULL;
-	priv->comp_uid_hash = NULL;
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = 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;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GnomeVFSFileSize out;
-	gchar *tmp;
-	char *buf;
-	
-	priv = cbfile->priv;
-	g_assert (priv->uri != NULL);
-	g_assert (priv->icalcomp != NULL);
-
-	/* Make a backup copy of the file if it exists */
-	tmp = gnome_vfs_uri_to_string (priv->uri, GNOME_VFS_URI_HIDE_NONE);
-	if (tmp) {
-		GnomeVFSURI *backup_uri;
-		gchar *backup_uristr;
-		
-		backup_uristr = g_strconcat (tmp, "~", NULL);
-		backup_uri = gnome_vfs_uri_new (backup_uristr);
-		
-		result = gnome_vfs_move_uri (priv->uri, backup_uri, TRUE);
-		gnome_vfs_uri_unref (backup_uri);
-		
-		g_free (tmp);
-		g_free (backup_uristr);
-	}
-	
-	/* Now write the new file out */
-	result = gnome_vfs_create_uri (&handle, priv->uri, 
-				       GNOME_VFS_OPEN_WRITE,
-				       FALSE, 0666);
-	
-	if (result != GNOME_VFS_OK)
-		goto error;
-	
-	buf = icalcomponent_as_ical_string (priv->icalcomp);
-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
-
-	if (result != GNOME_VFS_OK)
-		goto error;
-
-	gnome_vfs_close (handle);
-
-	return;
-	
- error:
-	g_warning ("Error writing calendar file.");
-	return;
-}
-
-/* Destroy handler for the file backend */
-static void
-cal_backend_file_destroy (GtkObject *object)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));
-
-	cbfile = CAL_BACKEND_FILE (object);
-	priv = cbfile->priv;
-
-	g_assert (priv->clients == NULL);
-
-	/* Save if necessary */
-
-	if (priv->idle_id != 0) {
-		save (cbfile);
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
-
-	/* Clean up */
-
-	if (priv->uri) {
-		gnome_vfs_uri_unref (priv->uri);
-		priv->uri = NULL;
-	}
-
-	if (priv->comp_uid_hash) {
-		g_hash_table_foreach (priv->comp_uid_hash, 
-				      free_cal_component, NULL);
-		g_hash_table_destroy (priv->comp_uid_hash);
-		priv->comp_uid_hash = NULL;
-	}
-
-	g_list_free (priv->events);
-	g_list_free (priv->todos);
-	g_list_free (priv->journals);
-
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = NULL;
-
-	if (priv->icalcomp) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-
-	g_free (priv);
-	cbfile->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Looks up a component by its UID on the backend's component hash table */
-static CalComponent *
-lookup_component (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	priv = cbfile->priv;
-
-	comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-
-	return comp;
-}
-
-
-
-/* Calendar backend methods */
-
-/* Get_uri handler for the file backend */
-static GnomeVFSURI *
-cal_backend_file_get_uri (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->uri != NULL);
-
-	return priv->uri;
-}
-
-/* Callback used when a Cal is destroyed */
-static void
-cal_destroy_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *lcal;
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	cal = CAL (object);
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	/* Find the cal in the list of clients */
-
-	for (l = priv->clients; l; l = l->next) {
-		lcal = CAL (l->data);
-
-		if (lcal == cal)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	priv->clients = g_list_remove_link (priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!priv->clients)
-		cal_backend_last_client_gone (CAL_BACKEND (cbfile));
-}
-
-/* Add_cal handler for the file backend */
-static void
-cal_backend_file_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp != NULL);
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	/* We do not keep a reference to the Cal since the calendar user agent
-	 * owns it.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (cal), "destroy",
-			    GTK_SIGNAL_FUNC (cal_destroy_cb),
-			    backend);
-
-	priv->clients = g_list_prepend (priv->clients, cal);
-}
-
-/* Idle handler; we save the calendar since it is dirty */
-static gboolean
-save_idle (gpointer data)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	save (cbfile);
-
-	priv->idle_id = 0;
-	return FALSE;
-}
-
-/* Marks the file backend as dirty and queues a save operation */
-static void
-mark_dirty (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	if (priv->idle_id != 0)
-		return;
-
-	priv->idle_id = g_idle_add (save_idle, cbfile);
-}
-
-/* Checks if the specified component has a duplicated UID and if so changes it */
-static void
-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *old_comp;
-	const char *uid;
-	char *new_uid;
-
-	priv = cbfile->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	old_comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-	if (!old_comp)
-		return; /* Everything is fine */
-
-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);
-
-	new_uid = cal_component_gen_uid ();
-	cal_component_set_uid (comp, new_uid);
-	g_free (new_uid);
-
-	/* FIXME: I think we need to reset the SEQUENCE property and reset the
-	 * CREATED/DTSTAMP/LAST-MODIFIED.
-	 */
-
-	mark_dirty (cbfile);
-}
-
-/* Tries to add an icalcomponent to the file backend.  We only store the objects
- * of the types we support; all others just remain in the toplevel component so
- * that we don't lose them.
- */
-static void
-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)
-{
-	CalBackendFilePrivate *priv;
-	GList **list;
-	const char *uid;
-	
-	priv = cbfile->priv;
-
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* Ensure that the UID is unique; some broken implementations spit
-	 * components with duplicated UIDs.
-	 */
-	check_dup_uid (cbfile, comp);
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_insert (priv->comp_uid_hash, (char *)uid, comp);
-
-	*list = g_list_prepend (*list, comp);
-
-	/* Put the object in the toplevel component if required */
-
-	if (add_to_toplevel) {
-		icalcomponent *icalcomp;
-
-		icalcomp = cal_component_get_icalcomponent (comp);
-		g_assert (icalcomp != NULL);
-
-		icalcomponent_add_component (priv->icalcomp, icalcomp);
-	}
-}
-
-/* Removes a component from the backend's hash and lists.  Does not perform
- * notification on the clients.  Also removes the component from the toplevel
- * icalcomponent.
- */
-static void
-remove_component (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	const char *uid;
-	GList **list, *l;
-
-	priv = cbfile->priv;
-
-	/* Remove the icalcomp from the toplevel */
-
-	icalcomp = cal_component_get_icalcomponent (comp);
-	g_assert (icalcomp != NULL);
-
-	icalcomponent_remove_component (priv->icalcomp, icalcomp);
-
-	/* Remove it from our mapping */
-
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_remove (priv->comp_uid_hash, uid);
-	
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-                /* Make the compiler shut up. */
-	        list = NULL;
-		g_assert_not_reached ();
-	}
-
-	l = g_list_find (*list, comp);
-	g_assert (l != NULL);
-
-	*list = g_list_remove_link (*list, l);
-	g_list_free_1 (l);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Scans the toplevel VCALENDAR component and stores the objects it finds */
-static void
-scan_vcalendar (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	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, GnomeVFSURI *uri, 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);
-
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-static CalBackendOpenStatus
-create_cal (CalBackendFile *cbfile, GnomeVFSURI *uri)
-{
-	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);
-
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	mark_dirty (cbfile);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-/* Open handler for the file backend */
-static CalBackendOpenStatus
-cal_backend_file_open (CalBackend *backend, GnomeVFSURI *uri, gboolean only_if_exists)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	char *str_uri;
-	FILE *file;
-
-	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 (uri != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (priv->uri == NULL);
-	g_assert (priv->comp_uid_hash == NULL);
-
-	if (!gnome_vfs_uri_is_local (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");
-	g_free (str_uri);
-
-	if (file)
-		return open_cal (cbfile, uri, file);
-	else {
-		if (only_if_exists)
-			return CAL_BACKEND_OPEN_NOT_FOUND;
-
-		return create_cal (cbfile, uri);
-	}
-}
-
-/* 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_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 char *
-cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icaltimezone *icaltz;
-	icalcomponent *icalcomp;
-	char *ical_string;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_print ("In cal_backend_file_get_timezone_object: %s\n", tzid);
-
-	g_return_val_if_fail (tzid != NULL, NULL);
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	g_print ("  getting icaltz\n");
-	icaltz = icalcomponent_get_timezone (priv->icalcomp, tzid);
-	if (!icaltz)
-		return NULL;
-
-	g_print ("  getting icalcomp\n");
-	icalcomp = icaltimezone_get_component (icaltz);
-	if (!icalcomp)
-		return NULL;
-
-	g_print ("  getting ical_string\n");
-	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;
-}
-
-static CalObjType
-cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	CalComponentVType type;
-	
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return CAL_COMPONENT_NO_TYPE;
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return CALOBJ_TYPE_EVENT;
-	case CAL_COMPONENT_TODO:
-		return CALOBJ_TYPE_TODO;
-	case CAL_COMPONENT_JOURNAL:
-		return CALOBJ_TYPE_JOURNAL;
-	default:
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/* Builds a list of UIDs from a list of CalComponent objects */
-static void
-build_uids_list (GList **list, GList *components)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		const char *uid;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_component_get_uid (comp, &uid);
-		*list = g_list_prepend (*list, g_strdup (uid));
-	}
-}
-
-/* Get_uids handler for the file backend */
-static GList *
-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *list;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	list = NULL;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		build_uids_list (&list, priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		build_uids_list (&list, priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		build_uids_list (&list, priv->journals);
-
-	return list;
-}
-
-/* Callback used from cal_recur_generate_instances(); adds the component's UID
- * to our hash table.
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	/* We only care that the component's UID is listed in the hash table;
-	 * that's why we only allow generation of one instance (i.e. return
-	 * FALSE every time).
-	 */
-
-	cal_component_get_uid (comp, &uid);
-
-	old_uid = g_hash_table_lookup (uid_hash, uid);
-	if (old_uid)
-		return FALSE;
-
-	g_hash_table_insert (uid_hash, (char *) uid, NULL);
-	return FALSE;
-}
-
-
-static icaltimezone*
-resolve_tzid (const char *tzid, gpointer data)
-{
-	icalcomponent *vcalendar_comp = data;
-
-	if (!tzid || !tzid[0])
-		return NULL;
-	else if (!strcmp (tzid, "UTC"))
-		return icaltimezone_get_utc_timezone ();
-	else
-		return icalcomponent_get_timezone (vcalendar_comp, tzid);
-}
-
-
-/* Populates a hash table with the UIDs of the components that occur or recur
- * within a specific time range.
- */
-static void
-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		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);
-	}
-}
-
-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */
-static void
-add_uid_to_list (gpointer key, gpointer value, gpointer data)
-{
-	GList **list;
-	const char *uid;
-	char *uid_copy;
-
-	list = data;
-
-	uid = key;
-	uid_copy = g_strdup (uid);
-
-	*list = g_list_prepend (*list, uid_copy);
-}
-
-/* Get_objects_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-				       time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *event_list;
-	GHashTable *uid_hash;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (type & CALOBJ_TYPE_EVENT)
-		get_instances_in_range (uid_hash, priv->events, start, end);
-
-	if (type & CALOBJ_TYPE_TODO)
-		get_instances_in_range (uid_hash, priv->todos, start, end);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		get_instances_in_range (uid_hash, priv->journals, start, end);
-
-	event_list = NULL;
-	g_hash_table_foreach (uid_hash, add_uid_to_list, &event_list);
-	g_hash_table_destroy (uid_hash);
-
-	return event_list;
-}
-
-/* Get_free_busy handler for the file backend */
-static char *
-cal_backend_file_get_free_busy (CalBackend *backend, time_t start, time_t end)
-{
-	return NULL;
-}
-
-typedef struct 
-{
-	CalBackend *backend;
-	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;
-
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, key);
-
-		coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-		coc->calobj =  CORBA_string_dup (cal_component_get_as_string (comp));
-		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, (gpointer) key);
- 	}
-}
-
-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, 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, uid);
-			break;
-		}
-	}
-
-	/* Calculate deletions */
-	be_data.backend = backend;
-	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);
-	}	
-  	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);
-}
-
-/* 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;
-
-	*alarm_start = start;
-	*alarm_end = end;
-
-	for (l = alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_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_free (alarm);
-
-		switch (trigger.type) {
-		case CAL_ALARM_TRIGGER_NONE:
-		case CAL_ALARM_TRIGGER_ABSOLUTE:
-			continue;
-
-		case CAL_ALARM_TRIGGER_RELATIVE_START:
-		case CAL_ALARM_TRIGGER_RELATIVE_END:
-			dur = &trigger.u.rel_duration;
-  			dur_time = icaldurationtype_as_int (*dur);
-
-			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 ();
-		}
-	}
-
-	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;
-};
-
-/* 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;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		time_t occur_time, trigger_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		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;
-
-		if (trigger_time < aod->start || trigger_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = trigger_time;
-		instance->occur_start = start;
-		instance->occur_end = end;
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-
-	return TRUE;
-}
-
-/* Generates the absolute triggers for a component */
-static void
-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod)
-{
-	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;
-		CalAlarmTrigger trigger;
-		time_t abs_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)
-			continue;
-
-		abs_time = icaltime_as_timet (trigger.u.abs_time);
-
-		if (abs_time < aod->start || abs_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = abs_time;
-
-		/* No particular occurrence, so just use the times from the component */
-
-		if (dt_start.value)
-			instance->occur_start = icaltime_as_timet (*dt_start.value);
-		else
-			instance->occur_start = -1;
-
-		if (dt_end.value)
-			instance->occur_end = icaltime_as_timet (*dt_end.value);
-		else
-			instance->occur_end = -1;
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-
-	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;
-}
-
-/* Generates alarm instances for a calendar component.  Returns the instances
- * structure, or NULL if no alarm instances occurred in the specified time
- * range.
- */
-static CalComponentAlarms *
-generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
-{
-	GList *alarm_uids;
-	time_t alarm_start, alarm_end;
-	struct alarm_occurrence_data aod;
-	CalComponentAlarms *alarms;
-	icalcomponent *icalcomp, *vcalendar_comp;
-
-	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;
-
-	/* 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, alarm_start, alarm_end,
-				      add_alarm_occurrences_cb, &aod,
-				      resolve_tzid, vcalendar_comp);
-
-	/* We add the ABSOLUTE triggers separately */
-	generate_absolute_triggers (comp, &aod);
-
-	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;
-}
-
-/* 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.
- */
-static int
-generate_alarms_for_list (GList *comps, time_t start, time_t end, GSList **comp_alarms)
-{
-	GList *l;
-	int n;
-
-	n = 0;
-
-	for (l = comps; l; l = l->next) {
-		CalComponent *comp;
-		CalComponentAlarms *alarms;
-
-		comp = CAL_COMPONENT (l->data);
-		alarms = generate_alarms_for_comp (comp, start, end);
-
-		if (alarms) {
-			*comp_alarms = g_slist_prepend (*comp_alarms, alarms);
-			n++;
-		}
-	}
-
-	return n;
-}
-
-/* Fills a CORBA sequence of alarm instances */
-static void
-fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms)
-{
-	int n_alarms;
-	GSList *l;
-	int i;
-
-	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;
-	}
-}
-
-/* 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 += generate_alarms_for_list (priv->events, start, end, &comp_alarms);
-	n_comp_alarms += generate_alarms_for_list (priv->todos, start, end, &comp_alarms);
-
-	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);
-
-		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 = generate_alarms_for_comp (comp, start, end);
-	if (alarms) {
-		fill_alarm_instances_seq (&corba_alarms->alarms, alarms->alarms);
-		cal_component_alarms_free (alarms);
-	} else
-		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 = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_update (cal, uid);
-	}
-}
-
-/* Notifies a backend's clients that an object was removed */
-static void
-notify_remove (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	cal_backend_obj_removed (CAL_BACKEND (cbfile), uid);
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_remove (cal, 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 *icalcomp, *vcalendar_comp = NULL;
-	icalcomponent_kind kind;
-	CalComponent *old_comp;
-	CalComponent *comp;
-	const char *comp_uid;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	/* Pull the component from the string and ensure that it is sane */
-
-	fprintf (stderr, "cal_backend_file: Parsing string:\n%s\n", calobj);
-	icalcomp = icalparser_parse_string ((char *) calobj);
-
-	if (!icalcomp)
-		return FALSE;
-
-	fprintf (stderr, "cal_backend_file: Parsed OK.\n");
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		int num_found = 0;
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-
-		fprintf (stderr, "cal_backend_file: VCALENDAR found\n");
-
-		/* We have a VCALENDAR containing the VEVENT/VTODO and the
-		   related timezone data, so we have to step through it to
-		   find the actual VEVENT/VTODO component. */
-		vcalendar_comp = icalcomp;
-
-		subcomp = icalcomponent_get_first_component (vcalendar_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) {
-				icalcomp = subcomp;
-				num_found++;
-			}
-			subcomp = icalcomponent_get_next_component (vcalendar_comp,
-								    ICAL_ANY_COMPONENT);
-		}
-
-		/* If we didn't find exactly 1 VEVENT/VTODO it is an error. */
-		if (num_found != 1) {
-			icalcomponent_free (icalcomp);
-			return FALSE;
-		}
-
-	} else if (!(kind == ICAL_VEVENT_COMPONENT
-		     || kind == ICAL_VTODO_COMPONENT
-		     || kind == ICAL_VJOURNAL_COMPONENT)) {
-		/* We don't support this type of component */
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	/* 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 FALSE;
-	}
-
-	/* Update the component */
-
-	old_comp = lookup_component (cbfile, comp_uid);
-
-	if (old_comp)
-		remove_component (cbfile, old_comp);
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		/* If we have a VCALENDAR component with child VTIMEZONEs and
-		   the VEVENT/VTODO, we have to merge it into the existing
-		   VCALENDAR, resolving any conflicting TZIDs. */
-		icalcomponent_merge_component (priv->icalcomp, vcalendar_comp);
-
-		/* Now we add the component to our local cache, but we pass
-		   FALSE as the last argument, since we have already added
-		   the libical component when merging above.*/
-		add_component (cbfile, comp, FALSE);
-	} else {
-		add_component (cbfile, comp, TRUE);
-	}
-
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_update (cbfile, comp_uid);
-
-	return TRUE;
-}
-
-/* Remove_object handler for the file backend */
-static gboolean
-cal_backend_file_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return FALSE;
-
-	remove_component (cbfile, comp);
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_remove (cbfile, uid);
-
-	return TRUE;
-}
-
-
-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);
-}
-
diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h
deleted file mode 100644
index 16ac6b4c64..0000000000
--- a/calendar/pcs/cal-backend-file.h
+++ /dev/null
@@ -1,63 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_FILE_H
-#define CAL_BACKEND_FILE_H
-
-#include <libgnome/gnome-defs.h>
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())
-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\
-					  CalBackendFile))
-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\
-					  CalBackendFileClass))
-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))
-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))
-
-typedef struct _CalBackendFile CalBackendFile;
-typedef struct _CalBackendFileClass CalBackendFileClass;
-
-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;
-
-struct _CalBackendFile {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendFilePrivate *priv;
-};
-
-struct _CalBackendFileClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_file_get_type (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
deleted file mode 100644
index ad56462565..0000000000
--- a/calendar/pcs/cal-backend.c
+++ /dev/null
@@ -1,613 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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,
-	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[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->add_cal = NULL;
-	class->open = NULL;
-	class->is_loaded = NULL;
-	class->get_n_objects = NULL;
-	class->get_object = NULL;
-	class->get_timezone_object = NULL;
-	class->get_type_by_uid = 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.
- **/
-GnomeVFSURI *
-cal_backend_get_uri (CalBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * 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_assert (CLASS (backend)->add_cal != NULL);
-	(* CLASS (backend)->add_cal) (backend, cal);
-}
-
-/**
- * cal_backend_open:
- * @backend: A calendar backend.
- * @uri: 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, GnomeVFSURI *uri, 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 (uri != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (CLASS (backend)->open != NULL);
-	result = (* CLASS (backend)->open) (backend, uri, 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_n_objects:
- * @backend: A calendar backend.
- * @type: Types of objects that will be included in the count.
- * 
- * Queries the number of calendar objects of a particular type.
- * 
- * Return value: Number of objects of the specified @type.
- **/
-int
-cal_backend_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, -1);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), -1);
-
-	g_assert (CLASS (backend)->get_n_objects != NULL);
-	return (* CLASS (backend)->get_n_objects) (backend, type);
-}
-
-/**
- * cal_backend_get_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- *
- * Queries a calendar backend for a calendar object based on its unique
- * identifier.
- *
- * Return value: The string representation of a complete calendar wrapping the
- * the sought object, or NULL if no object had the specified UID.  A complete
- * calendar is returned because you also need the timezone data.
- **/
-char *
-cal_backend_get_object (CalBackend *backend, const char *uid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_object != NULL);
-	return (* CLASS (backend)->get_object) (backend, uid);
-}
-
-/**
- * cal_backend_get_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_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.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Gets a free/busy object for the given time interval
- * 
- * Return value: a free/busy object
- **/
-char *
-cal_backend_get_free_busy (CalBackend *backend, time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_free_busy != NULL);
-	return (* CLASS (backend)->get_free_busy) (backend, 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.
- * 
- * Return value: TRUE on success, FALSE on being passed an UID for an object
- * that does not exist in the backend.
- **/
-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);
-}
-
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
deleted file mode 100644
index a1ba2af4c2..0000000000
--- a/calendar/pcs/cal-backend.h
+++ /dev/null
@@ -1,165 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_H
-#define CAL_BACKEND_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <cal-util/cal-util.h>
-#include <cal-util/cal-component.h>
-#include "evolution-calendar.h"
-#include "cal-common.h"
-#include "cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_TYPE            (cal_backend_get_type ())
-#define CAL_BACKEND(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_TYPE, CalBackend))
-#define CAL_BACKEND_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_TYPE,		\
-				     CalBackendClass))
-#define IS_CAL_BACKEND(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_TYPE))
-#define IS_CAL_BACKEND_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_TYPE))
-
-/* 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;
-};
-
-struct _CalBackendClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_client_gone) (CalBackend *backend);
-
-	void (* opened) (CalBackend *backend, CalBackendOpenStatus status);
-	void (* obj_updated) (CalBackend *backend, const char *uid);
-	void (* obj_removed) (CalBackend *backend, const char *uid);
-
-	/* Virtual methods */
-	GnomeVFSURI *(* get_uri) (CalBackend *backend);
-	void (* add_cal) (CalBackend *backend, Cal *cal);
-
-	CalBackendOpenStatus (* open) (CalBackend *backend, GnomeVFSURI *uri,
-				       gboolean only_if_exists);
-
-	gboolean (* is_loaded) (CalBackend *backend);
-
-	/* General object acquirement and information related virtual methods */
-	int (* get_n_objects) (CalBackend *backend, CalObjType type);
-	char *(* get_object) (CalBackend *backend, const char *uid);
-	char *(* get_timezone_object) (CalBackend *backend, const char *tzid);
-	CalObjType(* get_type_by_uid) (CalBackend *backend, const char *uid);
-	GList *(* get_uids) (CalBackend *backend, CalObjType type);
-
-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-	char *(* get_free_busy) (CalBackend *backend, 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);
-};
-
-GtkType cal_backend_get_type (void);
-
-GnomeVFSURI *cal_backend_get_uri (CalBackend *backend);
-
-void cal_backend_add_cal (CalBackend *backend, Cal *cal);
-
-CalBackendOpenStatus cal_backend_open (CalBackend *backend, GnomeVFSURI *uri,
-				       gboolean only_if_exists);
-
-gboolean cal_backend_is_loaded (CalBackend *backend);
-
-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);
-
-char *cal_backend_get_object (CalBackend *backend, const char *uid);
-
-char *cal_backend_get_timezone_object (CalBackend *backend, const char *tzid);
-
-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);
-
-char *cal_backend_get_free_busy (CalBackend *backend, 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);
-
-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 eaaab55cb2..0000000000
--- a/calendar/pcs/cal-common.h
+++ /dev/null
@@ -1,42 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 d01349fb8f..0000000000
--- a/calendar/pcs/cal-factory.c
+++ /dev/null
@@ -1,652 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cal.h"
-#include "cal-backend.h"
-#include "cal-factory.h"
-#include "job.h"
-
-#define PARENT_TYPE         BONOBO_X_OBJECT_TYPE
-#define 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;
-
-	/* Whether we have been registered with OAF yet */
-	guint registered : 1;
-};
-
-/* 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)
-{
-	GnomeVFSURI *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	gnome_vfs_uri_unref (uri);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-/* Opening calendars */
-
-/* Looks up a calendar backend in a factory's hash table of uri->cal */
-static CalBackend *
-lookup_backend (CalFactory *factory, GnomeVFSURI *uri)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = g_hash_table_lookup (priv->backends, uri);
-	return backend;
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (CalBackend *backend, gpointer data)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	GnomeVFSURI *uri;
-	gpointer orig_key;
-	gboolean result;
-	GnomeVFSURI *orig_uri;
-
-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");
-
-	factory = CAL_FACTORY (data);
-	priv = factory->priv;
-
-	/* Remove the backend from the hash table */
-
-	uri = cal_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (priv->backends, uri, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (priv->backends, orig_uri);
-	gnome_vfs_uri_unref (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (priv->backends) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), signals[LAST_CALENDAR_GONE]);
-}
-
-/* Adds a backend to the calendar factory's hash table */
-static void
-add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend)
-{
-	CalFactoryPrivate *priv;
-
-	priv = factory->priv;
-
-	gnome_vfs_uri_ref (uri);
-	g_hash_table_insert (priv->backends, uri, backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    GTK_SIGNAL_FUNC (backend_last_client_gone_cb),
-			    factory);
-}
-
-/* Tries to launch a backend for the method of the specified URI.  If there is
- * no such method registered in the factory, it sends the listener the
- * MethodNotSupported error code.
- */
-static CalBackend *
-launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	char *method;
-	GtkType *type;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	/* FIXME: add an accessor function to gnome-vfs */
-	method = uri->method_string;
-
-	type = g_hash_table_lookup (priv->methods, method);
-
-	if (!type) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		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, GnomeVFSURI *uri, 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, uri, listener);
-	if (!backend)
-		return NULL;
-
-	status = cal_backend_open (backend, uri, only_if_exists);
-
-	switch (status) {
-	case CAL_BACKEND_OPEN_SUCCESS:
-		add_backend (factory, uri, 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);
-}
-
-/* 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;
-	GnomeVFSURI *uri;
-	gboolean only_if_exists;
-	GNOME_Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	only_if_exists = jd->only_if_exists;
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		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);
-
-	if (!backend)
-		backend = open_backend (factory, uri, only_if_exists, listener);
-
-	gnome_vfs_uri_unref (uri);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("open_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-
-
-static void
-impl_CalFactory_open (PortableServer_Servant servant,
-		      const CORBA_char *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;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	CORBA_exception_init (&ev2);
-	result = CORBA_Object_is_nil (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION || result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_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);
-
-	jd = g_new (OpenJobData, 1);
-	jd->factory = factory;
-	jd->uri = g_strdup (uri);
-	jd->only_if_exists = only_if_exists;
-	jd->listener = listener_copy;
-
-	job_add (open_fn, jd);
-}
-
-
-
-/**
- * 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 (CAL_FACTORY_OAF_ID, BONOBO_OBJREF (factory));
-		priv->registered = FALSE;
-	}
-
-	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;
-}
-
-/* Object initialization function for the calendar factory */
-static void
-cal_factory_init (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	priv = g_new0 (CalFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->methods = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->backends = g_hash_table_new (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-	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.
- * 
- * 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)
-{
-	CalFactoryPrivate *priv;
-	OAF_RegistrationResult result;
-
-	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);
-
-	result = oaf_active_server_register (CAL_FACTORY_OAF_ID, BONOBO_OBJREF (factory));
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		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;
-	}
-
-	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);
-}
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
deleted file mode 100644
index 008fc2c36d..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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);
-void        cal_factory_register_method (CalFactory *factory,
-					 const char *method,
-					 GtkType     backend_type);
-int         cal_factory_get_n_backends  (CalFactory *factory);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
deleted file mode 100644
index f89d5c820f..0000000000
--- a/calendar/pcs/cal.c
+++ /dev/null
@@ -1,752 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 "cal.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;
-
-	/* and 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;
-	GnomeVFSURI *uri;
-	char *str_uri;
-	CORBA_char *str_uri_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	uri = cal_backend_get_uri (priv->backend);
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	str_uri_copy = CORBA_string_dup (str_uri);
-	g_free (str_uri);
-
-	return str_uri_copy;
-}
-
-/* Converts a calendar object type from its CORBA representation to our own
- * representation.
- */
-static CalObjType
-uncorba_obj_type (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));
-}
-
-/* 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 {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		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) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	uids = cal_backend_get_objects_in_range (priv->backend, t, t_start, t_end);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-/* Cal::get_free_busy method */
-static GNOME_Evolution_Calendar_CalObj
-impl_Cal_get_free_busy (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;
-	char *calobj;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	calobj = cal_backend_get_free_busy (priv->backend, t_start, t_end);
-        if (calobj) {
-		CORBA_char *calobj_copy;
-
-		calobj_copy = CORBA_string_dup (calobj);
-		g_free (calobj);
-		return calobj_copy;
-	}
-
-	CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-			     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-			     NULL);
-
-	return NULL;
-}
-
-/* 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) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		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:
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-
-	case CAL_BACKEND_GET_ALARMS_INVALID_RANGE:
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		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))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidObject,
-				     NULL);
-}
-
-/* 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))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-}
-
-/* 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 = query_new (priv->backend, ql, sexp);
-	if (!query) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_init (&ev2);
-	query_copy = CORBA_Object_duplicate (BONOBO_OBJREF (query), &ev2);
-	if (ev2._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev2);
-		g_message ("Cal_get_query(): Could not duplicate the query reference");
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev2);
-
-	return query_copy;
-}
-
-/* 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 {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_construct: could not duplicate the listener");
-		priv->listener = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	/* obtain the WombatClient interface */
-	priv->wombat_client = Bonobo_Unknown_queryInterface (
-		priv->listener,
-		"IDL:GNOME/Evolution/WombatClient:1.0",
-		&ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		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);
-	CORBA_Object_release (priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_destroy(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* 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 (BONOBO_OBJECT_TYPE);
-
-	/* Class method overrides */
-	object_class->destroy = cal_destroy;
-
-	/* Epv methods */
-	epv->_get_uri = impl_Cal_get_uri;
-	epv->countObjects = impl_Cal_get_n_objects;
-	epv->getObject = impl_Cal_get_object;
-	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_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 (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_update(): could not notify the listener "
-			   "about an updated object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_notify_remove:
- * @cal: A calendar client interface.
- * @uid: UID of object that was removed.
- * 
- * Notifies a listener attached to a calendar client interface object about a
- * calendar object that was removed.
- **/
-void
-cal_notify_remove (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_remove(): could not notify the listener "
-			   "about a removed object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * 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 (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_get_password: could not get password from associated WombatClient");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	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 (ev._major != CORBA_NO_EXCEPTION) {
-		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 35e870739c..0000000000
--- a/calendar/pcs/cal.h
+++ /dev/null
@@ -1,75 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_TYPE            (cal_get_type ())
-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))
-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
-
-typedef struct _CalPrivate CalPrivate;
-
-struct _Cal {
-	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_update (Cal *cal, const char *uid);
-void cal_notify_remove (Cal *cal, const char *uid);
-
-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 6519db8d4a..0000000000
--- a/calendar/pcs/job.c
+++ /dev/null
@@ -1,99 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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 4e5eadad4e..0000000000
--- a/calendar/pcs/job.h
+++ /dev/null
@@ -1,36 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 f96b74b88e..0000000000
--- a/calendar/pcs/query.c
+++ /dev/null
@@ -1,1238 +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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtksignal.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 "query.h"
-
-
-
-/* Private part of the Query structure */
-struct _QueryPrivate {
-	/* The backend we are monitoring */
-	CalBackend *backend;
-
-	/* Listener to which we report changes in the live query */
-	GNOME_Evolution_Calendar_QueryListener ql;
-
-	/* Sexp that defines the query */
-	char *sexp;
-	ESExp *esexp;
-
-	/* Idle handler ID for asynchronous queries */
-	guint idle_id;
-
-	/* 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->ql = CORBA_OBJECT_NIL;
-	priv->sexp = NULL;
-
-	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) {
-		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 (ev._major != CORBA_NO_EXCEPTION)
-			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->idle_id) {
-		g_source_remove (priv->idle_id);
-		priv->idle_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);
-
-	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+)
- *
- * STR - At least one string specifying a category
- *
- * 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;
-	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;
-	}
-
-	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"));
-			return NULL;
-		}
-
-	/* Search categories */
-
-	cal_component_get_categories_list (comp, &categories);
-	if (!categories) {
-		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;
-}
-
-
-
-/* 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 (ev._major != CORBA_NO_EXCEPTION)
-		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 (ev._major != CORBA_NO_EXCEPTION)
-		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 }
-};
-
-/* 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;
-}
-
-/* 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;
-	char *comp_str;
-	CalComponent *comp;
-	icalcomponent *icalcomp;
-	gboolean set_succeeded;
-	ESExpResult *result;
-
-	priv = query->priv;
-
-	comp_str = cal_backend_get_object (priv->backend, uid);
-	g_assert (comp_str != NULL);
-
-	icalcomp = icalparser_parse_string (comp_str);
-	g_assert (icalcomp != NULL);
-
-	g_free (comp_str);
-
-	comp = cal_component_new ();
-	set_succeeded = cal_component_set_icalcomponent (comp, icalcomp);
-	g_assert (set_succeeded);
-
-	/* Eval the sexp */
-
-	g_assert (priv->next_comp == NULL);
-
-	priv->next_comp = comp;
-	result = e_sexp_eval (priv->esexp);
-	gtk_object_unref (GTK_OBJECT (comp));
-	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 (ev._major != CORBA_NO_EXCEPTION)
-			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 (ev._major != CORBA_NO_EXCEPTION)
-			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 a single component that is queued in the list */
-static gboolean
-process_component_cb (gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	char *uid;
-	GList *l;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	/* No more components? */
-
-	if (!priv->pending_uids) {
-		g_assert (priv->n_pending == 0);
-
-		priv->idle_id = 0;
-		return FALSE;
-	}
-
-	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);
-
-	return TRUE;
-}
-
-/* Populates the query with pending UIDs so that they can be processed
- * asynchronously.
- */
-static void
-populate_query (Query *query)
-{
-	QueryPrivate *priv;
-
-	priv = query->priv;
-	g_assert (priv->idle_id == 0);
-
-	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;
-
-	priv->idle_id = g_idle_add (process_component_cb, query);
-}
-
-/* Idle handler for starting a query */
-static gboolean
-start_query_cb (gpointer data)
-{
-	Query *query;
-	QueryPrivate *priv;
-	CORBA_Environment ev;
-
-	query = QUERY (data);
-	priv = query->priv;
-
-	priv->idle_id = 0;
-
-	priv->esexp = create_sexp (query);
-
-	/* Compile the query string */
-
-	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;
-
-		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 (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("start_query_cb(): Could not notify the listener of "
-				   "a parse error");
-
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	/* Populate the query with UIDs so that we can process them asynchronously */
-
-	populate_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;
-
-	if (status == CAL_BACKEND_OPEN_SUCCESS) {
-		g_assert (cal_backend_is_loaded (backend));
-		g_assert (priv->idle_id == 0);
-
-		priv->idle_id = g_idle_add (start_query_cb, query);
-	}
-}
-
-/* Callback used when a component changes in the backend */
-static void
-backend_obj_updated_cb (CalBackend *backend, const char *uid, gpointer data)
-{
-	Query *query;
-
-	query = QUERY (data);
-
-	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;
-
-	bonobo_object_ref (BONOBO_OBJECT (query));
-
-	remove_component (query, uid);
-	remove_from_pending (query, uid);
-
-	bonobo_object_unref (BONOBO_OBJECT (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 (ev._major != CORBA_NO_EXCEPTION) {
-		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));
-
-	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->sexp = g_strdup (sexp);
-
-	/* Queue the query to be started asynchronously */
-
-	if (cal_backend_is_loaded (priv->backend)) {
-		g_assert (priv->idle_id == 0);
-		priv->idle_id = g_idle_add (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 bd10351fcb..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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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-backend.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/camel/.cvsignore b/camel/.cvsignore
deleted file mode 100644
index e332b20150..0000000000
--- a/camel/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
-camel-lock-helper
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 549841417e..0000000000
--- a/camel/ChangeLog
+++ /dev/null
@@ -1,13800 +0,0 @@
-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
author	mat <mat@FreeBSD.org>	2013-08-03 02:52:07 +0800
committer	mat <mat@FreeBSD.org>	2013-08-03 02:52:07 +0800
commit	f47f83f9c8923b3b0f740482331aab0d0aa669e9 (patch)
tree	a4a613f80a0e443c044c2319e43ce75e14c50813 /archivers/p5-Compress-LZW
parent	16bdaae92136c316b9043fffbf5fb4438dce004e (diff)
download	freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.tar.gz freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.tar.zst freebsd-ports-gnome-f47f83f9c8923b3b0f740482331aab0d0aa669e9.zip