2432 files changed, 0 insertions, 1901098 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e06716e16f..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,30 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-autom4te*.cache
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-install-sh
-intl
-libtool
-ltconfig
-ltmain.sh
-m4
-missing
-mkinstalldirs
-stamp-h
-stamp-h.in
-stamp.h
-xml-i18n-*
-xlibtool
-xltmain.sh
-intltool-*
-*.pc
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 75e6a26764..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,85 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Chris Toshok <toshok@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@ximian.com>
-	Jakub Steiner <jimmac@ximian.com>
-
-Calendar
-	Seth Alves <seth@ximian.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Rodrigo Moya <rodrigo@ximian.com>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <mrproper@ximian.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Radek Doulik <rodo@ximian.com>
-	Larry Ewing <lewing@ximian.com>
-	Bertrand Guiheneuf <bertrand@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Matt Loper <matt@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-	Jeffrey Stedfast <fejj@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-	Peter Williams <peterw@ximian.com>
-	Dan Winship <danw@ximian.com>
-	Michael Zucchi <notzed@ximian.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Pilot
-	JP Rosevear <jpr@ximian.com>
-
-Shell
-	Miguel de Icaza <miguel@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-
-Translations
-	Akira TAGOH <tagoh@gnome.gr.jp>
-	Andraz Tori <andraz.tori1@guest.arnes.si>
-	Andreas Hyden <a.hyden@cyberpoint.se>
-	Arjan Scherpenisse <acscherp@wins.uva.nl>
-	Clara Tattoni <clara.tattoni@libero.it>
-	Fatih Demir <kabalak@gmx.net>
-	Gediminas Paulauskas <menesis@delfi.lt>
-	GNOME PL Team <translators@gnome.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	Héctor García Alvarez <hector@scouts-es.org>
-	Jesús Bravo Álvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	Kjartan Maraas <kmaraas@gnome.org>
-	Matthias Warkus <mawa@iname.com>
-	Spiros Papadimitriou <spapadim+@cs.cmu.edu>
-	Sung-Hyun Nam <namsh@kldp.org>
-	Szabolcs BAN <shooby@gnome.hu>
-	Tiago Antão <tiagoantao@bigfoot.com>
-	Duarte Loreto <happyguy_pt@hotmail.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 48617b5247..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,349 +0,0 @@
-2003-12-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update version reliance
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Remove hard coded disable deprecated flags
-
-2003-12-05  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml 3.1.3 (new gtk_html_flush method
-	to be used in mailer)
-
-2003-12-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the Junk folder
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Install evolution.desktop as
-	evolution-$(BASE_VERSION).desktop
-	* data/evolution.desktop.in: Remove generated file
-	* data/evolution.desktop.in.in: Add (Unstable) to name
-	Fix comment to be more correct and have correct capitalization
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use BASE_VERSION for repo_ids and OAFIIDs,
-	Update gnome-spell repo_id to correct version,
-	Update gtkhtml editor OAFIID to GtkHTML 3.1
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: define privconduitdir
-
-2003-11-28  Anders Carlsson  <andersca@gnome.org>
-
-	* configure.in: Look for mozilla-nss.pc, not mozilla.pc.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure the mozilla .pc file exists before
-	checking for it
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill Evo 2.0's alarm daemon, not 1.4's.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-	
-	* MAINTAINERS: Update
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: remove db3 check
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* tools/killev.c (main): kill the alarm notification service, not
-	the factory, which no longer exists.
-
-2003-11-17  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: make sure server.mk is disted
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): do the right thing for disting
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: use the server.mk file to get rules for building
-	versioned .server files
-
-	* */Makefile.am: use simplified rule subst
-	
-2003-11-17 JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: Install versioned package config files
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: make source selector flags/libs
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* MAINTAINERS: Update
-
-2003-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove libversit from the build.
-
-	* configure.in (CERT_UI): change the libraries we link.
-	(AC_OUTPUT): remove libversit/Makefile
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: determine the e-d-s version, version the gettext
-	files properly
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_OUTPUT): Remove e-util/ename/Makefile
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: we don't have to configure the libical subdir now
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: pull in evolution-data-server stuff and remove
-	backends from output
-
-2003-10-31  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: set up vars and rules for versioning the .server
-	files
-
-	* Makefile.am's: use rules for versioning .server file, ensure
-	built files are removed before disting
-	
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: (AC_OUTPUT): remove smime/tests for now.
-
-2003-10-30  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: set enable_smime=yes wherever nss would be
-	enabled..  fixes manually specifying the nss libs and enabling the
-	smime ui.  Also, add a section for generating the correct SMIME UI
-	flags.  gross, but necessary.  it should probably be wrapped in
-	with all the other nss library crap.
-	(AC_OUTPUT): add smime/tests
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): use $SMIME_DIR. instead of explicitly
-	including smime.
-
-	* configure.in: add some smime foo - a status message, an
-	AM_CONDITIONAL (ENABLE_SMIME)
-
-2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: added a configure check for AI_ADDRCONFIG
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Change YFLAGS to AM_YFLAGS to stop an
-	automake 1.7 warning
-
-2003-10-23  Rodney Dawes  <dobey@ximian.com>
-
-	* confiugre.in: Remove mail/importers/Makefile from AC_OUTPUT
-	yet again
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add smime/* dirs. to AC_OUTPUT.
-
-	* Makefile.am (SUBDIRS): add smime/.
-
-2003-10-23  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence 
-	(really committed this time).
-	
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set $ACLOCAL to have the $ACLOCAL_FLAGS in it, so
-	it doesn't fail to regenerate the files if you run make without a
-	manual autogen after making changes to configure.in and friends.
-	[Many thanks to Marco Pesenti Gritti for pointing out the fix to
-	me.]
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.8.0 or newer for threading
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Revert broken previous commit and actually remove
-	mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed mail/importers/Makefile from AC_OUTPUT
-
-2003-10-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Removed addressbook/tools/Makefile from AC_OUTPUT
-
-2003-10-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed pedantic pgp/mime configure flag.
-
-2003-10-22  Dan Winship  <danw@ximian.com>
-
-	* executive-summary/*: Removed; this code has not been used since
-	pre-1.0.
-
-	* importers/*: Removed; the actual importers were moved to
-	{mail,calendar}/importers long ago.
-
-	* my-evolution/*: Removed; gone in evolution 2.0.
-
-	* notes/*: Removed; never finished and no one is working on it.
-
-	* omf-install/*: Removed; part of old doc system
-
-	* tests/*: Removed; these are ancient. Camel regression tests are
-	in camel/tests now.
-
-	* configure.in (E_UTIL_{CFLAGS,LIBS}): Remove soup-2.0 since
-	e-proxy is gone.
-	(EVOLUTION_MAIL_{CFLAGS,LIBS}): Remove soup-2.0 since the mailer
-	uses CamelHTTPStream now.
-	(EVOLUTION_EXECUTIVE_SUMMARY_{CFLAGS,LIBS}): Gone
-	(AC_OUTPUT): Remove my-evolution/Makefile
-
-	* README: evolution no longer depends on soup
-
-2003-10-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in (GNOME_COMPILE_WARNINGS): Turn off the annoying
-	"comparison between signed and unsigned" warning in gcc 3.3
-
-	* evolution-calendar.pc.in (Cflags): add
-	-I${privincludedir}/libical
-
-2003-10-08  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* configure.in: Check for gnome-thumbnail.h existence.
-
-2003-09-04  Dan Winship  <danw@ximian.com>
-
-	* camel.pc.in (Requires): 
-	* evolution-addressbook.pc.in (Requires): 
-	* evolution-calendar.pc.in (Requires): 
-	* evolution-shell.pc.in (Requires): Require gal-2.2
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: add a11y/widgets/Makefile
-	* Makefile.am: move a11y directory before widgets directory.
-
-2003-08-21  Not Zed  <NotZed@Ximian.com>
-
-	* HACKING: Wrote one.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-
-	* configure.in: Add a11y checking, and a11y Makefiles
-	* Makefile.am: add a11y subdirectory
-
-2003-08-13  Mike Kestner  <mkestner@ximian.com>
-
-	* configure.in: don't make 1.5 the default version (ie LN_S)
-	update to use gal-2.2
-
-2003-08-01  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Add option for '--enable-imapp', for 'new' imap
-	code.
-
-2003-07-26  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: use libgtkhtml-3.1 for linking.
-
-2003-07-26  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Bump version to "1.5", so that we end up being
-	parallel installable with 1.4 again, but we can still release
-	a "1.5.0" tarball when we get to that point in 6 months
-	
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define EVO_MARSHAL_RULE, which creates glib
-	marshaller .c and .h files that don't cause gcc warnings
-
-	* marshal.mk: The Makefile fragment used by EVO_MARSHAL_RULE.
-	(Can't include newlines in an AC_SUBST, so we have to use
-	AC_SUBST_FILE)
-
-	* Makefile.am (EXTRA_DIST): add marshal.mk
-
-2003-07-20 Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	*configure.in: Added 'ms' (Malay) to ALL_LINGUAS.
-
-2003-07-10  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Change version to 1.4.99 since HEAD is not the
-	stable 1.4 branch, as evolution-1-4-branch was created post-1.4.1
-	
-2003-07-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check for gnome-icon-lookup.h (which could mean
-	either plain GNOME 2.2 or Sun GNOME 2.0)
-
-2003-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: removed libwombat from the build.
-
-	* evolution-calendar.pc.in: removed -lwombat.
-
-	* libwombat/*: removed unused directory.
-
-== Version 1.4.1 ==
-
-2003-06-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Depend on GtkHTML 3.0.6, gal 1.99.8.
-
-	* README: Update
-
-2003-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Added implicity rule to subst @BASE_VERSION@
-	in evolution.desktop.in.in to generate evolution.desktop.in.
-	(desktop_in_file): Removed.
-	(desktop_in_in_file): New.
-	(kdedesktop_file): Update substitution to use
-	$(desktop_in_in_file) instead of $(desktop_in_file).
-	(noinst_DATA): Add $(desktop_file).
-	(install-data-local): Depend on $(mime_file) and $(keys_file).
-	(EXTRA_DIST): Remove $(desktop_file), replace $(desktop_in_file)
-	with $(desktop_in_in_file).
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* tools/killev.c (kill_component): clean this up a little and make
-	it deal with "evolution" vs "evolution-1.4"
-
-2003-06-19  Danilo Å egan  <dsegan@gmx.net>
-
-	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
-
-2003-06-17  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for current mail stuff.
-
-2003-06-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Remove evolution-launch-composer since it's
-	no longer needed.
-
-
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
deleted file mode 100644
index 944140f011..0000000000
--- a/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,8530 +0,0 @@
-== Version 1.4.0 ==
-
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.4.0.
-	(VERSION_COMMENT): Set to an empty string.
-	(GAL_REQUIRED): Require 1.99.7.
-
-2003-05-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: AC_SUBST() for GAL_REQUIRED and GTKHTML_REQUIRED
-	
-2003-05-27  Not Zed  <NotZed@Ximian.com>
-
-	* camel.pc.in: make libs/cflags point to privlibdir/includedir,
-	otherwise this just doesn't work.
-
-== Version 1.3.92 ==
-
-2003-05-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.92.
-
-2003-05-22  Rodney Dawes  <dobey@ximian.com>
-
-	* camel.pc.in:
-	* evolution-addressbook.pc.in:
-	* evolution-calendar.pc.in:
-	* evolution-shell.pc.in: s/GAL_VERSION/GAL_REQUIRED/
-	
-2003-05-22  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* configure.in: Added Belarusian to ALL_LINGUAS.
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 1.3.91.99.
-
-== Version 1.3.91 ==
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Renamed GAL_VERSION to GAL_REQUIRED; also, made it
-	not AC_SUBST() it anymore since it's only used in configure.
-	Added GTKHTML_REQUIRED and made all the libgtkhtml-3.0 checks use
-	it.
-
-2003-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove GNOME_PREFIX stuff.  Add
-	--disable-default-binary command line option, with corresponding
-	DEFAULT_BINARY Automake conditional.
-
-2003-05-19  Not Zed  <notzed@lostzed.mmc.com.au>
-
-	* NEWS: Updated for mail/ camel/ filter/ and e-util/
-
-2003-04-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 1.3.3.99.
-
-== Version 1.3.3 ==
-
-2003-04-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.3.
-
-2003-04-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated for mailer fixes
-
-2003-04-28  Rodney Dawes  <dobey@ximian.com>
-
-	* data/cde_app_root/: Use $(privdatadir) instead of
-	$(prefix)/share/evolution-$(BASE_VERSION) for the cde stuff
-	
-2003-04-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KDE_APPLNK_DIR to not install to a diff prefix,
-	and disable installing the file to the KDE applnk path by default
-	
-2003-04-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.3.2.99.
-
-== Version 1.3.2 ==
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Fix
-
-2003-04-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Oops, don't use a == when comparing strings in
-	shell.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am (privlibexec_PROGRAMS): remove
-	evolution-addressbook-export.
-
-	* tools/evolution-addressbook-export.c: nuke.
-	
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/tools/Makefile to AC_OUTPUT.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (privlibexec_SCRIPTS, privlibexec_PROGRAMS):
-	Install these in privlibexecdir, not privdatadir. Move killev from
-	SCRIPTS to PROGRAMS.
-	(killev_SOURCES, killev_LDADD): Add
-
-	* tools/killev.c: New C port of killev, since
-	"bonobo-activation-query" does not return as much information as
-	"oaf-client" did. Also has prettier output. (Still shells out to
-	killall/pkill to do the actual killing.)
-
-	* tools/killev: Gone
-
-	* tools/evolution-move-tasks: Removed since the evolution-calendar
-	code that called it is also gone now.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
-
-	* NEWS: Updated for mail/camel/composer/filter for 1.3.2
-	
-2003-04-06  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* data/Makefile.am: Create $(DESTDIR)$(kdedeskdopdir).
-
-2003-04-04  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): bleah, add "" in for the "no"
-	case in with_static_ldap.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* acinclude.m4 (EVO_LDAP_CHECK): the existence of libldap.la
-	should have no bearing on whether or not we try to statically link
-	ldap.
-
-2003-03-29  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * AUTHORS: Added myself as new Portuguese translator.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ported check for "killall" vs. "killp" back from
-	1.2.
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: Fix installation of the .desktop file.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add gal-2.0 to the list of packages to determine
-	WOMBAT_CFLAGS and WOMBAT_LIBS.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Autogen help/Makefile.
-
-	* Makefile.am (SUBDIRS): Add help.  [#38234]
-
-2003-03-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed Heimdal include path.
-
-2003-03-25  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in: Fix 39901 and 40233
-	
-2003-03-21  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix the mit krb5+krb4 check to work with --without-kr5
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated considerably.
-
-2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fixed a type-o in the krb5 checks.
-
-2003-03-19  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (CAMEL_*, E_UTIL_*, ): Add gthread-2.0, to get any
-	thread-specific flags (like -D_REENTRANT).  Duh.  For #39886.
-	(LIBIBEX*): Removed old libibex stuff.
-
-2003-03-14  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-export.c (save_cards): use
-	bonobo_main_quit, and clean this up a bit.
-
-2003-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added AC_C_INLINE - this should fix bug #39171.
-
-2003-03-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix kerberos include paths.
-
-2003-03-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.3.1.99.
-
-== Version 1.3.1 ==
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_launch_composer_LDADD): Fix
-	dependencies
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* configure.in: Add calendar/importers/Makefile to output.
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* tools/.cvsignore: ignore some stuff, yo.
-	
-	* tools/Makefile.am: add in the evolution-launch-composer stuff.
-
-	* tools/evolution-launch-composer.c: port this from the 1.2 branch.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: export gnome-pilot cflags
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Make this a shared library to prevent
-	linking portability problems
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD): cleanup
-
-2003-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (ENABLE_IPv6): AC_DEFINE() ENABLE_IPv6 if it should
-	be enabled.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Fix installation of desktop/mime files
-	
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add fr to ALL_LINGUAS again.
-
-2003-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Fix KRB4_CFLAGS to work correctly
-	* data/Makefile.am: Fix desktop file installation path
-	* data/evolution.desktop.in: Use correct binary and categories, add
-	StartupNotify=1 also, for startup-notification-enabled systems
-	
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in: export priv*dir for libical's configure to use.
-
-	* evolution-addressbook.pc.in (Libs): Remove -L${libdir}.
-	(CFlags): s/includedir/privincludedir/
-
-	* evolution-calendar.pc.in: Likewise
-
-	* evolution-shell.pc.in: Likewise. Also change iconsdir to
-	imagesdir
-
-	* sounds/Makefile.am: remove soundsdir def
-
-	* tools/Makefile.am: subst in $(toolsdir) instead of $(bindir)
-
-	* tools/evolution-addressbook-clean.in:
-	s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/
-
-	* tools/evolution-addressbook-abuse.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext init
-	* tools/evolution-addressbook-export.c (main): Likewise
-	* tools/evolution-addressbook-import.c (main): Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Define and AC_SUBST privlibexecdir, privdatadir,
-	privincludedir, serverdir, evolutionuidir, imagesdir, buttonsdir,
-	soundsdir, gladedir, etspecdir, and viewsdir.
-
-	* data/Makefile.am (dtappintegrate, dtappunintegrate): use
-	privdatadir
-
-2003-02-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Update AC_DEFINEs to use the new syntax to make
-	acconfig.h unnecessary. (Remove unneeded HAVE_KDE_APPLNK define).
-	Call GNOME_COMPILE_WARNINGS and add $WARN_CFLAGS to CFLAGS to get
-	back to the evo 1.2 behavior of defaulting to -Wall everywhere.
-	Fix up privlibdir definition to avoid undefined variables in
-	evolution-shell.pc.
-
-	* acinclude.m4: Update AC_DEFINE
-
-	* acconfig.h: Gone
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): add gnome-vfs-module-2.0 to the
-	deps so we pick up the right include path.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: remove the --enable-shlib-components stuff.
-
-2003-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (HAVE_KRB5): Updated to add gssapi libs, since this
-	is what we use krb5 for :-)
-
-2003-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): s/bin_SCRIPTS/tools_SCRIPTS/
-	
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/evolution-addressbook-export.c: #include bonobo-activation
-	instead of oaf.
-	(main): Initialize using gnome_program_init().
-	(save_cards): Use g_main_loop_quit() instead of gtk_exit().
-
-	* tools/evolution-addressbook-import.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(unref_executable): Use g_main_loop_quit() instead of gtk_exit().
-	(add_cb): Likewise.
-
-	* tools/evolution-addressbook-abuse.c: Update include list for
-	GNOME 2.
-	(main): Initialize using gnome_program_init().
-	(use_addressbook): Use g_object_unref() instead of
-	gtk_object_unref().
-	(main): Use g_timeout_add() instead of gtk_timeout_add().
-	(add_cb): Use g_main_loop_quit() instead of gtk_exit().
-
-	* configure.in (AC_SUBST): Add tools/Makefile.
-
-	* Makefile.am (SUBDIRS): Add tools/ back into the list.
-
-	* tools/Makefile.am: Install everything in
-	$(datadir)/evolution-$(BASE_VERSION)/tools.
-	(INCLUDES): Add the defines that gnome_program_init() likes and
-	also add the _DISABLE_DEPRECATED stuff.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): add in the conduit Makefile's.
-	
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: only do the CONDUIT_CFLAGS/LIBS stuff if pilot
-	conduits have been enabled.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: in the --enable-pilot-conduits stanza, use
-	PKG_CHECK_MODULES to get the gnome-pilot-2.0 (and therefore
-	pilot-link) cflags/libs before doing our utf-8 check.  also,
-	enable the addressbook/calendar CONDUIT_{CFLAGS/LIBS} variables.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (evolutionuidir): Define iconsdir.
-
-2003-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (FULL_GNOME_DEPS): Doh. Use the
-	MANUAL_[NSPR,NSS]_[CFLAGS,LIBS] variables where appropriate.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (idldir): Define componentdir instead of
-	COMPONENT_DIR.  Set it to $privlibdir/components instead of
-	$libdir/evolution-$(BASE_VERSION)/components.
-
-2003-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (MOZILLA_NSS): Simplify the whole process into
-	about 8 lines by using pkg-config.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am: For now, do not install the evolution.1
-	manpage.  Install all the other files with a -$(BASE_VERSION)
-	suffix.
-	(dtappintegrate): Update for the new location of cde_app_root.
-	(dtappunintegrate): Likewise.
-
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
-	(cdeappmanagerdir): Version using $(BASE_VERSION).
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am
-	(cdetypesdir): Likewise.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am
-	(cdeiconsdir): Likewise.
-
-	* sounds/Makefile.am (soundsdir): Version using $(BASE_VERSION).
-
-	* configure.in: Define BASE_VERSION.  Set idldir to
-	$datadir/idl/evolution-$BASE_VERSION instead of just
-	$datadir/idl/evolution.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in (ALL_LINGUAS): Remove fr for now, since it doesn't
-	seem to work.
-	(AC_OUTPUT): Remove calendar/importers/Makefile for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): intltool, not xml-i18n-tools
-	
-2003-01-07  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (SUBDIRS): add po
-
-	* configure.in: Move ALL_LINGUAS definition to before
-	AM_GLIB_GNU_GETTEXT, or else no linguas for you!
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* configure.in (AC_INIT): Use "Evolution", not "evolution", since
-	that becomes the value of the PACKAGE variable
-	(privlibdir): parse $VERSION by hand since.
-	EVOLUTION_MAJOR_VERSION, etc aren't defined any more (and trying
-	to pass a variable to AC_INIT won't work). This and the above
-	change fix the problem that privlibdir was being defined as
-	"${libdir}/Evolution/." instead of "${libdir}/evolution/1.3"
-	(GAL_VERSION): AC_SUBST this since it's needed in the .pc files
-	(idldir): define this here rather than in each Makefile.am that
-	needs it.
-	(AC_OUTPUT): Add .pc files
-
-	* Makefile.am (pkgconfig_DATA): Add pc files.
-	(confexec_DATA): Remove this (fooConf.sh files)
-	(SUBDIRS): Move filter earlier in the build. (I think it was
-	calendar that depends on it now?)
-	(%Conf.sh): Remove this. The .pc files are output by configure.in
-	now.
-
-	* camel.pc.in, evolution-addressbook.pc.in,
-	evolution-calendar.pc.in, evolution-shell.pc.in: Replace the
-	*Conf.sh files with these. In addition to the basic variables,
-	include camel_providerdir (in camel.pc) and idldir, IDL_INCLUDES
-	and privlibdir (in the others).
-
-2002-12-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define COMPONENT_DIR.
-
-2002-11-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add NSPR CFLAGS and LDFLAGS to the E_UTIL build
-	flags.
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(my-evolution/Makefile).
-
-2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (changelogs): Add my-evolution.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* libibex/*: cvs removed it all.  Not much use having it around
-	anymore.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for gconftool-2, and added
-	AM_GCONF_SOURCE_2.
-
-2002-11-18  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added back IMPORTERS_CFLAGS and
-	mail/importers/Makefile
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: we require >= 0.0.9.99 of gal.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Set up the my-evolution flags properly, do not
-	AC_SUBST GNOME_Evolution_Mail.server.in.
-
-2002-11-13  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (SUBDIRS): re-added filter, mail, composer
-
-	* configure.in: Added EVOLUTION_MAIL settings, and mail/makefile.
-
-2002-11-11  Joe Shaw  <joe@ximian.com>
-
-	* Makefile.am (SUBDIRS): remove tools for now, it's not in
-	configure.in.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add addressbook.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook paths.
-
-2002-11-08  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added composer/Makefile & gtkhtml-3.0 deps.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (AC_OUTPUT): GNOME_Evolution_Summary.oaf.in = >
-	GNOME_Evolution_Summary.server.in
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: update e-util and calendar compile flags
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added libgnome-2.0 to camel requirements.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add some more addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Re-enable the filter cflags/libs stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add wombat.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add wombat and addressbook compile flags, and add
-	wombat and some addressbook dirs to AC_OUTPUT.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* configure.in: change the commented-out soup check to refer to
-	the new soup 2.0 in the libsoup module
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: use correct libgtkhtml-3.0 for calendar and added
-	generation of calendar GUI's directories.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: enabled libwombat.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: added libversit directory to build.
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add shell.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/idl/Makefile to AC_OUTPUT
-
-2002-11-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add an AM_GLIB_GNU_GETTEXT.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in:
-	* Makefile.am: re-added calendar component (only non-UI stuff).
-
-	* data/Makefile.am: use intltools instead of xml-i18n-tools.
-
-2002-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_PROG_INTLTOOL instead of
-	AM_PROG_XML_I18N_TOOLS.
-
-2002-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update to use Autoconf 2.53.  Remove checks for
-	scrollkeeper.  Remove intl/Makefile and macros/Makefile from
-	AC_OUTPUT list.  Set up GETTEXT_PACKAGE.  Removed
-	AM_ACLOCAL_INCLUDE(macros).  Added AM_PATH_ORBIT2.
-	(EVO_SET_COMPILE_FLAGS): Use PKG_CHECK_MODULES.
-	(IDL_INCLUDES): New, -I params to pass to $(ORBIT_IDL) when
-	compiling IDL files into stubs.
-
-	* autogen.sh: Changed to use gnome-autogen.sh.
-
-2002-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.90.99.
-
-== Version 1.1.90 (Release Candidate 1) ==
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: gal 0.21, GtkHTML 1.1.5.
-
-2002-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: Update dep for GAL to 0.21.0.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version number to 1.1.2.99.
-
-== Version 1.1.2 ==
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.2.  Update deps for GAL and GtkHTML.
-
-2002-09-27  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add m4.
-	(ACLOCAL_AMFLAGS): New variable.
-	(EXTRA_DIST): Add config.rpath.
-	* configure.in (AC_OUTPUT): Add po/Makefile.in, m4/Makefile.
-
-2002-09-23  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: use pkg-config for gtkhtml
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: fix kde applnk test to not test for things if
-	disabled
-
-	* configure.in: Fix up mozilla tests and allow static linking of
-	nss/nspr (Frank Belew <frb@ximian.com>)
-	
-2002-09-23  Aaron Weber  <aaron@ximian.com>
-
-	* README: Update URLs for mailing lists, Evolution application
-	page, help information. Remove note that Evolution is beta. In
-	general, changes to the "soft" data.  Also, jeff's commit to this
-	file from 2001-11-21 seems to have been lost, so I re-removed the
-	stuff he took out. And changed libnspr to mozilla-nspr, and
-	libnss3 to mozilla-nss.
-
-	* data/evolution.1: Update with information about where the real
-	help is. Clarify example formatting.
-
-2002-09-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/cde_app_root/Makefile.am: New.
-	* data/cde_app_root/dt/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/icons/C/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/Makefile.am: New.
-	* data/cde_app_root/dt/appconfig/types/C/Makefile.am: New.
-
-	* configure.in: Add a `--with-cde-path' option.  Check for
-	dtappintegrate in that path.  Define HAVE_DTAPPINTEGRATE and
-	GNOME_PREFIX.  Also, generate
-	data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in and
-	shell/evolution-nognome.
-
-2002-09-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.99.
-
-2002-09-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Put po on the top.
-
-== Version 1.1.1 ==
-
-2002-09-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 1.1.1.  Also bump some requirements.
-
-	* README: Update according to the new requirements.
-
-2002-09-06  Larry Ewing  <lewing@ximian.com>
-
-	* NEWS: update with some gtkhtml features.
-
-2002-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated with the new 1.2 features (unfinished).
-
-	* NEWS-1.0: New, contains the changes up to version 1.0.8.
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4 (EVO_CHECK_TIMEZONE): Remove this from here.
-
-	* configure.in: Put it here. (Connector no longer needs to share
-	it). Also, check "tm_gmtoff" before "timezone", and if we have
-	"timezone", check for "altzone" too.
-
-	* acconfig.h: Add HAVE_ALTZONE
-
-2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: e-util now requires soup and gconf flags.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* tools/evolution-addressbook-import.c (main): Use default book,
-	not local one.
-
-	* tools/evolution-addressbook-export.c (main): Likewise.
-
-	* tools/evolution-addressbook-abuse.c (abuse_timeout): Likewise.
-
-2002-08-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Update required gal and gtkhtml dependency information.
-
-2002-08-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (THREADS_CFLAGS): Need to check for gal 0.19.99.18
-	for e_xml_save_file().
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Update Soup information and remove hard spaces.
-
-	* configure.in: Check for Soup 0.7 or later.  [Hm, we should make
-	sure that it's actually a 0.7.x version.]
-
-2002-07-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for IPv6 support.
-
-2002-07-30  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (EVOLUTION_MAIL): added soup to compile flags.
-
-2002-07-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Frank Belew <frb@ximian.com>.]
-
-	* configure.in: If no --with-kde-applnk-path is given, try to
-	detect the directory using `kde-config'.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* acinclude.m4: Move EVO_CHECK_LIB into here, and also create
-	EVO_PURIFY_SUPPORT, EVO_TIMEZONE_CHECK, and EVO_LDAP_CHECK from
-	stuff in configure.in. (This stuff is also used by Connector.)
-
-	* configure.in: Remove the stuff that was moved to acinclude.m4.
-
-	* evolution_addressbookConf.sh.in: Remove db3 and ldap references
-	since pas-backend-file and pas-backend-ldap are no longer in
-	libpas, and those flags weren't doing anything useful here before
-	anyway. (Our attempts to force static linking to those libraries
-	end up getting mangled when passed through gnome-config.)
-
-	* evolution_calendarConf.sh.in: Likewise, remove db3 references.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check if we're trying to build with the old
-	libversit module borrowed from gnome-pim instead of our own new
-	one, and refuse to build if so.
-
-	* libversit/Makefile.am: Remove libversit.la stuff since we don't
-	want it and it messes up the build slightly.
-
-2002-07-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Prepend "$(WERROR)" to all the *_CFLAGS variables
-	so you can do `make WERROR=-Werror' to turn all compiler warnings
-	into errors.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-
-	* libversit/Makefile.am (privlib_LIBRARIES): Install libversit.a so
-	that people compiling against the addressbook can do so successfully.
-
-	* Makefile.am: create our *Conf.sh files and dist them and install
-	them.
-
-	* configure.in: Define and subst some variables that the Conf.sh
-	file need.
-	
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (privlibdir): Define a versioned library directory
-	that we can use for things that are ABI-sensitive: camel
-	providers, importers... Define camel_providerder in terms of this,
-	resulting in a new location for the providers. Camel will have to
-	be rebuilt for it to get the new -D flag.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (E_UTIL_LIBS): e-util relies on bonobo-conf
-	in e-passwords.c and e-categories-master-list-wombat.c, so
-	reflect that here. And the e-port code needs THREADS_LIBS.
-
-2002-07-09  Peter Williams  <peterw@ximian.com>
-	
-	* tools/Makefile.am (INCLUDES): Add include lines to get
-	ebook headers relative to <ebook/foo.h>, not "foo.h".
-
-2002-07-09    <jpr@ximian.com>
-
-	* configure.in: re-order nss and nspr flags
-
-2002-07-03  Peter Williams  <peterw@ximian.com>
-
-	* README: Fix the URL for the DB 3.1.17 package; it's moved.
-
-2002-06-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	[As suggested by #24466.]
-
-	* data/evolution.desktop.in (Categories): Added.
-
-2002-06-27  Dan Winship  <danw@ximian.com>
-
-	* libversit/Makefile.am: Hack around a libtool/make problem that
-	was causing libversit.a to be rebuilt at "make install" time,
-	causing further relinking down the line.
-
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: check for libsoftokn3 if we couldn't link the
-	first time
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (unUseStr): fix a braindead typo that caused
-	us to leak strings in certain circumstances (when the string being
-	freed was second in the list, the head of the list would get
-	lost.)
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.17.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal to 0.19.99.16.
-
-2002-06-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.1 aka multicite branch.
-
-2002-05-14  Dan Winship  <danw@ximian.com>
-
-	* data/evolution.1: Document "evolution default:mail"
-
-2002-05-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Add an explanation/warning about why we want Berkeley DB
-	3.1.17 and nothing else.
-
-2002-04-28  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: require gtkhtml-1.1.1.
-
-2002-04-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (EVO_CHECK_LIB): Bumped the required version number
-	of gal to 0.19.99.15.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't generate libibex/Makefile anymore.
-
-	* Makefile.am: Removed libibex from SUBDIRS.
-
-	* tools/Makefile.am: Don't link with libibex.
-
-	* tests/Makefile.am: Same here.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.19.99.14.
-
-2002-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.19.99.13.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.12.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required gal version number to 0.19.99.11.
-
-2002-04-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add checks for gethostbyaddr_r
-
-2002-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for socklen_t and if it doesn't exist,
-	define it as unsigned int.
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Fix static linking on solaris which doesn't have a
-	static libresolv.
-
-2002-04-01  Chris Toshok  <toshok@ximian.com>
-
-	* libversit/vobject.c (newStrItem): only include if USE_STRTBL is
-	defined.
-	(deleteStrItem): same.
-	(hashStr): same.
-	(lookupStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just dup the string.
-	(unUseStr): if USE_STRTBL is defined, use existing behavior.  if
-	not defined, just free the string.
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	Darwin/OS X portability from Max Horn <max@quendi.de>
-
-	* libversit/vcc.y: Remove #include <malloc.h>.
-
-	* libversit/vobject.c: Likewise, and #include <stdlib.h>
-
-2002-03-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add argument `--enable-shlib-components'.  New
-	substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,
-	OAF_SHLIB_SUFFIX.
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Check for GConf.  Add gthreads to LIBIBEX_CFLAGS
-	and LIBIBEX_LIBS.
-
-2002-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.19.99.10.
-
-2002-03-24  Peter Williams  <peterw@ximian.com>
-
-	* tools/killev: Change the OAFIID for the GtkHTML editor to
-	have :1.1 at the end.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (evolution_addressbook_import_LDADD):
-	s/libversit.la/libversit.a/
-
-2002-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in (EVOLUTION_ADDRESSBOOK_DEPS): add gal.
-
-2002-03-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-03-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Allow the user to enable OpenSSL over Mozilla NSS
-	using --enable-openssl or --disable-nss.
-
-2002-02-24  jacob berkman  <jacob@ximian.com>
-
-	* sounds/Makefile.am (EXTRA_DIST): add $(sounds_DATA)
-
-2002-02-22  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: add libglade the to the E_UTIL flags.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-02-12  Tõivo Leedjärv  <leedjarv@interest.ee>
-
-	* configure.in: Added et to ALL_LINGUAS.
-
-2002-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: make sure PISOCK cflags are added where
-	appropriate
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (SUBDIRS): added sounds.
-
-	* configure.in (AC_OUTPUT): added sounds/Makefile.
-
-	* sounds/Makefile.am: new file.
-	* sounds/default_alarm.wav: default alarm sound, currently only used
-	when vCalendar files are imported with audio alarms. We need a better
-	sound.
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal.
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: added bonobo to filter flags to avoid compile
-	error
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.
-
-	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using
-	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},
-	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},
-	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and
-	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove
-	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all
-	this stuff after OpenSSL check so they benefit from all the
-	cflags/ldflags discoveries for the support libraries.
-
-2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
- 
-	* configure.in: Require gal 0.19.99.1.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS.  Define
-	EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,
-	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,
-	EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,
-	EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it.  Remove SOUP_CFLAGS
-	and SOUP_LIBS.
-
-2002-01-15  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and 
-	SOUP_LIBS
-
-	* README: Update to include the SOUP dependancy.
-
-2002-01-04  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-        * configure.in: Added "eu" to ALL_LINGUAS
-
-2001-12-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in (camel_providerdir): Define this here, using only
-	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO
-	and NANO).
-
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: check for alloca.h.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16358, No man page for Evolution.]
-
-	* data/Makefile.am (man_MANS): Install the man page.
-
-	* data/evolution.1: New man page for Evolution.
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
- 
-	* configure.in: use UTF-8 as the char set when testing pilot link
- 
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not
-	"Evolution".
-
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up VERSION to 1.1.0.99.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
-	string that will be appended to the X-Mailer header.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
- 
-	* README: Updated. Don't say that the user needs to copy their
-	mozilla database files into ~/evolution, since Evolution now
-	builds it's own default database files if they don't exist and
-	also remove instructions for building with OpenSSL.
- 
-	* acconfig.h: Remove HAVE_OPENSSL define
- 
-	* configure.in: Remove checks for OpenSSL libraries.
- 
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked 
-	against gettext 0.10.40 and 0.10.35 without any problem. 
-	Please contact me if anyone wants to disable it (AGAIN).
-
-2001-11-19  Abel Cheung  <maddog@linuxhall.org>
-
-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
-	  somebody is willing to tell me why it is deleted without
-	  reason. It was checked against newest gettext (0.10.40) and
-	  older gettext (0.10.35) without any problem. A few
-	  translations are not removed from ALL_LINGUAS even though
-	  they failed in msgfmt checking.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated.
-
-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Redone with the bug #s from Bugzilla.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS: Calendar/tasks NEWS.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: restore cflags and ldflags properly
-
-2001-11-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: save the ldflags properly
-
-2001-11-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check to make sure pilot-link has the charset
-	conversion stuff enabled
-
-2001-11-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/killev: Chop the output from `uname -s'.  Thanks to
-	Michael Gerdts for suggesting the fix.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep
-	  complaining to me, and waste a month before discovering it was
-	  disabled while I know nothing about it. Please at least complain
-	  to me if it's gettext problem.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up to 0.99.1 for snapshot purposes.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML
-	0.16 and GAL 0.18.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Small update
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (Icon): evolution.png instead of
-	evolution-icon.png.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version to 0.17.100.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS (Conduits): update
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.
-
-2001-10-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mailer): Updated mailer NEWS.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): My mailer news.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,
-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,
-	BONOBO_HTML_GNOME_CFLAGS.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Require GAL version 0.15.99.10.  I know you all
-	love this.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.2
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.15.99.9.
-
-2001-10-30  <notzed@ximian.com>
-
-	* configure.in: Move the configure version number check down
-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual
-	patch i have every bloody time the version changes.
-
-2001-10-29  Joe Shaw  <joe@ximian.com>
-
-	* configure.in: Require gal 0.15.99.8
-
-	* addressbook/backend/ebook/e-card-simple.c,
-	addressbook/gui/component/addressbook-storage.c,
-	addressbook/gui/widgets/e-addressbook-view.c,
-	calendar/gui/e-calendar-table.c,
-	calendar/gui/e-itip-control.c,
-	calendar/gui/e-meeting-model.c,
-	calendar/gui/itip-utils.c,
-	calendar/gui/print.c,
-	calendar/gui/alarm-notify/alarm-notify-dialog.c,
-	filter/rule-editor.c,
-	mail/mail-config.c,
-	mail/mail-folder-cache.c,
-	mail/mail-format.c,
-	mail/mail-local.c,
-	mail/mail-ops.c,
-	mail/mail-vfolder.c,
-	shell/e-local-storage.c,
-	shell/e-summary-storage.c: Change includes of
-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h
-
-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added my addressbook changes.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* AUTHORS: Add Larry and Radek.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.1
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/importers/Makefile
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.7.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: no need to use destdir
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.6.
-
-2001-10-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change the help string on "--enable-nntp" to
-	mention the fact that NNTP support is incomplete and unsupported.
-	If the user doesn't pass --enable-nntp, don't mention NNTP at all
-	in the summary at the end. Also, mention which SSL library is
-	being used when SSL support is enabled, and don't mention anything
-	about S/MIME since it doesn't work.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: GAL 0.15.99.5.
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* AUTHORS: Updated my email address.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* configure.in: Bump gal requirement.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: and add a way to get some more spew about the
-	commands we're executing.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use eq instead of ==.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's
-	"draw_button" argument can be used in
-	addressbook/gui/component/select-names/e-select-names.c.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in: bumped required GAL to 0.15.99.2.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: HAVE_KDE_APPLNK.
-
-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the
-	case in which the kde applnk dir is found.  Also fix the logic
-	with the checking so it doesn't get fooled.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: include destdir in the path of the kde desktop
-	installation dir
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
-	in the `KDE_APPLNK_DIR'.
-
-	* configure.in: New option `--with-kde-applnk-path'.  Define the
-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
-	value.
-
-2001-10-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
-	declarations together so they both happen.
-
-2001-10-18  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use a new fangled perl script that queries oaf for
-	interfaces we want to kill.
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.15.99.1
-	for use in evolution-addressbook-export.
-
-	* tools/.cvsignore: Added evolution-addressbook-clean,
-	evolution-addressbook-export, evolution-addressbook-import, and
-	.libs.
-
-	* tools/Makefile.am: Added evolution-addressbook-clean,
-	evolution-addressbook-export, and evolution-addressbook-import.
-
-	* tools/evolution-addressbook-clean.in: Main script to clean up
-	the local contact database.
-
-	* tools/evolution-addressbook-export.c: Exports the local
-	addressbook to the specified file
-	(--output-file).  If no --output-file is given, writes out to a
-	unique file in the /tmp directory.  In either case, prints the
-	filename to stdout.
-
-	* tools/evolution-addressbook-import.c: Imports the specified file
-	(--input-file) to the local addressbook.
-
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Wrote Addressbook news.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: kill evolution-ldif-importer.
-
-2001-10-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.
-	These must be sorted as a preorder walk for a tree!
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.99.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14
-	or later.  Also, make $with_nspr_includes default to
-	`/usr/include/nspr' instead of `/usr/include/mozilla' and
-	$with_nss_includes to `/usr/include/moznss' instead of
-	`/usr/include/mozilla'.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell, plus some minor fixes for
-	consistency.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated.
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): Updated for beta 6.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: add libart to list of libraries to use in
-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions
-
-2001-10-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before
-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix
-	pointed out by Dmitry G. Mastrukov <dmitry@fitmark.net>.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove movemail check, since it's not relevant any
-	more.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.13.99.1.
-
-2001-10-01  Aaron Weber <aaron@ximian.com>
-
-	* help/C/Makefile.am: removed an extraneous tab.
-	
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.99.
-
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
-
-2001-10-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more news.
-
-2001-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (nspr_libs): Order the linkline to be the same as
-	the order in Mozilla (it is suggested that they be in this order).
-	(nss_libs): Same.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove references to the "compose" program, since
-	that functionality went into the shell.
-	(AC_OUTPUT): Sort and remove duplicates.
-
-	* cmdline/*: gone
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is
-	not recommended for end-users. It is mostly meant for testing
-	purposes.
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: make sure the solaris network libs get added to
-	the LDAP link line before we test for openldap.  Thanks to Frank
-	Belew for finding this.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.12.99.0.
-
-2001-09-21  Nat Friedman  <nat@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.
-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.
-
-2001-09-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 0.14.  Depend on gal >= 0.12,
-	gtkhtml >= 0.13.
-
-2001-09-21  Michael Zucchi  <NotZed@Ximian.com>
-
-	* NEWS (Mail): Updated.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more NEWS items here.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Remove dead directory from AC_OUTPUT
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated required version of gal to 0.11.99.4.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove unneeded conditionals
-
-2001-09-13  Yanko Kaneti  <yaneti@declera.com>
-
-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf
-	as text/x-vcard.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: temporarily disable zh_TW
-
-2001-09-10  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: one-line OpenSSL fix from Yanko Kaneti
-	<yaneti@declera.com>
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated slightly.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes by Neil Conway <neilconway@home.com, as per #8090.]
-
-	* configure.in: Fix the error message if scrollkeeper is not found.
-
-	* README: A bunch of minor fixes, tweaks and cleanups.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8089, Undocumented Scrollkeeper dependency.]
-
-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Only check for OpenSSL if we were not able to find
-	Mozilla's NSS libraries.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* omf-install/Makefile.am (install-data-local): Don't put
-	$(srcdir) in the file path twice.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.11.99.2.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* configure.in: Bumped required version of GAL to 0.11.3
-	(for g_utf8_collate)
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Nike Gerdts <michael.gerdts@usa.alcatel.com> for
-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and
-	LDFLAGS.]
-
-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS
-	instead of after them; likewise, put DB3_LDADD before the already
-	defined LDADD.
-
-2001-08-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: We don't need to check for both bonobo-conf 0.11
-	AND bonobo-conf 0.2.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.13.99.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,
-	GtkHTML 0.12.  Don't autogen
-	`doc/devel/executive-summary/Makefile'.  Bump version number to
-	0.13.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS (Global): Added.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* NEWS (Mail): Updated some more.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.5.
-
-2001-08-19  Aaron Weber  <aaron@ximian.com>
-
-	*Makefile.am: added "help" to subdirs.
-	
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
-	evolution's local state dir.  this should fix the core dumps
-	during install on freebsd and solaris.
-
-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
-	otherwise default to glib-config.  a cheap solution to get this
-	working on freebsd (where they have glib12-config, but not
-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
-	this out, and AC_SUBST so omf-install/Makefile.am can use it.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Move the libical compile order.
-
-2001-08-16  "Big Iain" Holmes  <iain@ximian.com>
-
-	* configure.in: Add widgets/e-timezone-dialog/Makefile
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* AUTHORS: I know what you did last summer!
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.3.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Some info on adding --localstatedir to the configure
-	options.
-	* Makefile.am: Added omf-install to the build.
-	* configure.in: Adjust for the move of the user docs.
-	
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Addded missing dirs to the build. Add checks for
-	scrollkeeper and jw to get the docs building on later Red Hat's.
-	* omf-install/*: Added this for integration with scrollkeeper.
-	
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by
-	Miles
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Be truthful about the versions of libs we need.
-	
-2001-08-10  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: if libldap.la is there, default to static linking
-	of openldap.  if it's not, default to dynamic.  also, provide
-	--with-static-ldap for users that want to override these defaults.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: link statically with OpenLDAP.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require GAL 0.10.99.2.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* tools/killev: Added #!/bin/sh
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't link to libnssckbi3 when linking to nss.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot information
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require gal 0.10.99.1 or greater.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #5594, "killev doesn't kill all evolution processes".]
-
-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor
-	and gnome-spell-component.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.99.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ooops.  We want GAL >= 0.10.0 and GtkHTML >=
-	0.11.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.
-	(EVO_CHECK_LIB): 
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell changes and slightly changed
-	the formatting for the addressbook ones.
-
-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.
-
-2001-07-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-07-31  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: bump required version of gtkhtml to 0.10.99.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Bump to 0.11.99
-
-2001-07-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB
-
-2001-07-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Changed to use test -h instead of -L for checking
-	/var/mail vs /var/spool/mail
-
-2001-07-13  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: more updates
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mail): Merged mine and Peter's entries.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Start new entry
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (have_nss_includes): Fix nss include check to work.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added option --with-broken-spool for solaris mbox
-	spool format.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail
-	isn't a symbolic link such as on Red Hat 7.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the required version of gal.
-
-2001-07-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *: use bonobo-conf everywhere
-	
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (MAILER_LIBS):
-	(MAILER_CFLAGS): added bonobo_conf.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Made evolution depend on bonobo-conf 0.2.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Check for gtkhtml 0.9.99.1. 
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for libGal 0.8.99.7.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED
-	to make these not totally useless.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
-	as it needs some CORBA stuff from the latter.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* tools/killev: Added evolution-alarm-notify.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.8.99.6.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (gal): Bump required gal version for new accessors
-	in ETree.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/gui/contact-list-editor, and
-	correct path of contact-editor.
-
-2001-06-21  Rodrigo Moya <rodrigo@gnome-db.org>
-
-	* libwombat/: added new directory for the libwombat library, which
-	will contain the implementation of all CORBA interfaces defined
-	in the wombat.idl file
-
-2001-06-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix the OpenLDAP check to default to "no" if you
-	don't specify anything.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* docs/C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-20  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change --enable-ldap to --with-openldap, allow a
-	path prefix as an argument. Add some libtooly goodness to the
-	libldap check in case it depends on ssl libraries.
-
-2001-06-19  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Tweak the db3 header check to like our RH7 build
-	machine again.
-
-2001-06-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y (LexBuf): Changed buf to an int here.
-	(lexGetQuotedPrintable): Changed cur to an int here.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Add "--with-db3" to fill in both
-	--with-db3-includes and --with-db3-libs. Make them get cached
-	properly so you don't need to specify it every time. Simplify some
-	code.
-
-	* acconfig.h: Add #defines for the current supported db3 version
-	so that when we change it we don't have to hunt all of them down
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check the modes on $system_mail_dir and set up
-	variables for camel/Makefile to make camel-lock-helper
-	setuid/setgid.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: One slight db3 check correction
-
-2001-06-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: fix typo in -ldb3 check.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Update db3 configure checks for RedHat. /me beats
-	a sleeping cat to death
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.8.99.2.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added addressbook/gui/merging/Makefile.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Byebye executive-summary, hello my-evolution
-
-	* configure.in: Remove all the executive-summary Makefiles. Add the
-	my-evolution.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: Vanity, thy name is trow.
-
-2001-06-05  JP Rosevear  <jpr@ximian.com>
-
-	* config.log: Bump version to 0.10.99
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* README: Included information about db3.
-
-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.
-
-	* configure.in: Added various checks for db3 libraries and
-	includes.  Of note are the new configure options
-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify
-	the location for your db3 library.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal dependency to 0.8.99.1
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* README: update version requirements
-
-2001-05-23  Dan Winship  <danw@ximian.com>
-
-	* README: Remove reference to verify-evolution-install.sh since it
-	doesn't work any more.
-
-	* configure.in (EVO_CHECK_LIB): allow this to take a max version
-	too, mostly so we can bound the allowable gal versions for
-	releases, but also to require libxml < 2.0.
-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).
-
-2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer
-	
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we
-	don't have the same libs multiple times in the libtool
-	command-line.
-
-2001-05-20  Duncan Mak  <duncan@ximian.com>
-
-	* tools/killev (sysname): Add in evolution-vcard-importer as part
-	of the list of processes to kill in killev.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook
-	gets built before mail.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we
-	don't have to link in all sorts of unnecessary garbage from GNOME
-	that we don't need.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: add the importers.
-
-2001-05-14  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/evolution-C.omf: added file for Scrollkeeper
-
-2001-05-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add the nspr includes to the list of includes used
-	to test for NSS headers, and don't assume -lpthread in the
-	nss/nspr libs - use PTHREAD_LIB.
-
-2001-05-09  Iain Holmes  <iain@ximian.com>
-
-	* tools/killev: Added rdf-summary killing stuff from R Burton
-	(r.burton@180sw.com)
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the importers subdir.
-
-	* configure.in: Make the importers/Makefile
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped check for gal to 0.7.99.3.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
-
-	* configure.in: Check for OpenSSL.
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: upped required gtkhtml version to 0.9.3, even that is
-	not enough for idl changes.
-	* README: you need LIB_XML_1_BRANCH. updated all version requirements
-	from configure.in
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen
-	`executive-summary/widgets/Makefile', as that subdir doesn't get
-	distributed anymore.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* README: We no longer depend on libunicode.
-
-	* configure.in: Remove check for libunicode. Remove unicode cflags
-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for
-	things that need to depend on just gal (for gunicode).
-
-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r
-	will DTRT.
-	
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump up the gal requirement
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen the the Makefile for the importer
-	docs.
-
-	* Makefile.am (SUBDIRS): Build the docs last.
-
-2001-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (have_nspr_libs): We need to link in more than just
-	libnspr4, we also need libpthread.
-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added in composer-message.png.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: `mail/importers/Makefile' must come after
-	`mail/Makefile'.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add `doc'.
-
-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated the required version of gal to 0.6.99.0.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check if gethostbyname_r take five params
-
-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS 
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* AUTHORS: /me is a translator.
-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &&
-	exit 1.
-
-2001-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): create the makefile in
-	camel/tests/smime
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev (sysname): add some more 16 character versions for
-	freebsd.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* AUTHORS: Brag.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,
-	removed the latter.
-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for
-	trash folder, one converted from deleted_message.xpm, another from mc.
-	* art/Makefile.am: install.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README (SSL): Remind users that they will currently have to copy
-	their cert database from their mozilla directory into ~/evolution.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/Makefile.am: added missing (new) files.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
-	forgot to do this before branching *again*...)
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* README: add a bit mentioning that if configure claims you don't
-	have something installed when you think you do, that it's probably
-	because you installed it in the wrong prefix, or because you need
-	a -devel package.
-
-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a
-	gnome-config-based library of a given version or later, correctly,
-	and if doesn't find it, suggests that you consult the README. Fix
-	the various library checks to use this. Meanwhile, remove a bunch
-	of old cruft and reorganize a little.
-
-	* acconfig.h: Remove cruft
-
-2001-03-28  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: In a burst of egomania, added myself.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: create camel/misc/Makefile
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* README: Update xml-i18n-tools version
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/new-message.xpm: file->new->mail message
-	* art/folder.xpm: file->new->folder
-	* art/new_appointment.xpm: file->new->appontment
-	* art/print-preview.xpm: file->print preview
-	* art/configure_16_calendar.xpm: for the tools menu
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/splash.png: move it a bit up so the icons fit better
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.11.
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/configure_16_folder.xpm, configure_16_mail.xpm,
-	copy_16_message.xpm, edit.xpm, encrypt.xpm,
-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,
-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,
-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,
-	send-receive.xpm, work_offline.xpm, find_contact.xpm,
-	send-24-receive.png, evo-48-calendar-conduit.png,
-	evo-48-todo-conduit.png, import.png, send-48-receive.png,
-	move_message.xpm, all_contacts.xpm, forward.xpm,
-	configure_16_addressbook.xpm, Makefile.am,
-	evo-48-address-conduit.png: renamed icons to make Miguel's
-	speedups possible
-	* art/evolution-inbox.png: color coded one
-	* art/envelope.png: reverted back to the non-color coded one
-	* art/evolution-contacts-plain.png: non-color coded one for
-	the "new contact" dialogue
-	
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Require bison, not yacc (for vcc.y)
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added all the new icons to the
-	distribution.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: More fixes for NSPR and NSS checks - use fixed it
-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it
-	not default the nspr lib path to /usr/lib/mozilla which may not be
-	in the user's library path when checking for nspr libs.
-
-2001-03-20  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_send-receive.png: send-receive for the s/r dialog
-	* art/24_send-receive.png: send-receive to replace the
-	fetch-mail-doggie
-	* art/16_send-receive.xpm: send-receive for (future) menu
-	item
-	* art/16_import.xpm: for the file menu
-	* art/16_work_offline.xpm: for the file menu
-	* AUTHORS: so I can show off
-	* art/splash.png: making radek famous ;)
-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, 
-	evolution-tasks.png, evolution-today.png: 
-	 new concept of color coded apps:
-	    - mailer: 		#efb43e
-	    - calendar:		#bab5ab
-	    - contacts: 	#9794ab
-	    - tasks:		#6e9e6e
-	    - exec. summary:	#c4757e
-	
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix ettore's fix ;-)
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.8.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Make sure we never define `NSPR_CFLAGS' or
-	`NSS_CFLAGS' as just "-I".
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: pulled from the 0.9 release.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Added directions on how to build with SSL support.
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_import.png: for the import druid
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal requirement to 0.5.99.7
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: create doc/devel/executive-summary/Makefile
-	* evolution.png: moved to art/.
-	* evolution.desktop: moved to data/.
-	* Makefile.am: reflect those moves.
-	* art/*.xpm: moved 8 files from calendar/gui here.
-	* art/Makefile.am: added moved files.
-	distribute *.xpm, install *.png and *view.xpm.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.
-
-2001-03-14  Dan Winship  <danw@ximian.com>
-
-	* README: Pull up some of the clarifications from the 0.9 branch
-
-2001-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add -lresolv to LDAP_LIBS if it's there.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Added the mail/importers dir.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Rearranged some of the dependencies to try to get them
-	into a more correct order (needed for people building all of these
-	packages by hand).
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be
-	clever to be calling this 0.9 rather than 0.8, since it's almost
-	0.10.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y: Changed int to char when returning a character
-	from a stream (since it needs to be able to hold EOF.)
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed --enable-assbarn-security and replaced it
-	with the real options:
-	--with-nspr-includes=PREFIX
-	--with-nspr-libs=PREFIX
-	--with-nss=PREFIX
-
-	* acconfig.h: #undef HAVE_NSS
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.5.99.6 or later.
-
-2001-03-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* shell/main: /* xgettext:no-c-format */ before the welcome
-	message.
-	* configure.in: Don't try to generate a Makefile in
-	camel/providers/vee as it's empty.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot instructions
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.4.
-
-2001-03-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Reorganize a bit to get rid of warnings about
-	AC_TRY_COMPILE being used before AC_ISC_POSIX
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added views/addressbook/Makefile.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install conduit icons
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add logic to make sure we're building against OpenLDAP >= 2
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  Héctor García Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/HACKING b/HACKING
deleted file mode 100644
index ce31d66dac..0000000000
--- a/HACKING
+++ /dev/null
@@ -1,277 +0,0 @@
-
-1 Patch guidelines
-
-This section lists some guidelines for writing a good patch which is
-more likely to be accepted.
-
-Any new features or large scale work should first be discussed on the
-evolution-hackers list first.  This will ensure the idea fits in the
-direction we wish to take Evolution, and also that the effort is not
-duplicated.  See section 3 for details on the mailing lists.
-
-1.1 Patch basics
-
-o The patch should apply cleanly at the time it is made.
-
-o It must compile once applied.
-
-o It must not generate any more compile time warnings than were
-  already there.  This may be platform dependent so simply do your
-  best.
-
-o It must conform to C89/C90 (ANSI/ISO C), and build with gcc using
-  the default compile flags.
-
-  The primary trap is that in C99 you may define variables anywhere in
-  the code, in C89 they must be declared in a declaration block which
-  follows any block start '{'.
-
-  If you wish to ensure the code is C89, try the following.
-
-  From the gcc manual page:
-                                                           "To select
-  this standard in GCC, use one of the options `-ansi', `-std=c89' or
-   `-std=iso9899:1990'; to obtain all the diagnostics required by the
-  standard, you should also specify `-pedantic'" ...
-
-  You may actually have to use '-std=gnu89' if libraries have taken
-  advantage of gcc extensions and where not compiled similarly, as the
-  above options will disable all gnu extensions.
-
-  [FIXME: Add the same option for Forte here]
-
-o It should not add any extra debug printing by default, unless the
-  patch is specifically to add extra debug printing.
-
-o It should not use any gcc extensions, except where they are properly
-  checked for and not used with other compilers.  glib provides some
-  of these features as portable macros and should be used when they
-  cover the required functionality.
-
-1.1 GUI changes
-
-If the change requires non-trivial user interface changes, then they
-will have to be discussed and approved on the evolution-hackers list
-first.  This is highly recommended before embarking on any UI work, or
-large scale work in general.  The Gnome HIG document is the place to
-start on any UI changes or additions.
-
-1.2 Translated string changes
-
-Any changes to translated strings in a stable release must be
-discussed on the hackers list (see section 3), and/or as part of the
-patch submission.  There must be very good reasons for changing the
-strings in this case.
-
-1.3 Coding style
-
-Generally the coding style employed matches the "Linux Kernel" style,
-that is, basically K&R style indenting with 8 space tabs.  Tabs should
-be used rather than space characters.  Reformatting of otherwise
-unchanged code is not acceptable.  Editors should have any automatic
-reformatting features disabled.
-
-K&R style indenting puts braces on the same line.  The opening
-parenthesis of a function call or conditional statement should be on
-the same line as the function.  "else" "} else" and "} else {" must
-always occur on lines by themselves.
-
-A single blank line should follow {} blocks (if not immediately
-followed by the close of another block), and conditional statements,
-and be used to separate logical groups of statements in the same
-block.
-
-A single blank line only should separate functions, and other
-structures at the top level of the file (i.e. outside functions).  The
-same rule applies to variable declarations at the start of a block.
-
-An example of the most-developer-preferred formatting:
-
-TheType
-the_function (int frank)
-{
-        int a = 1;
-
-        if (a == frank) {
-                a = foo (a);
-        } else {
-                do {
-                        a = bob (frank) + a;
-        	} until (a == frank);
-
-                frank = a;
-        }
-
-        return (TheType) a;
-}
-
-Where there are slight stylistic differences, the style in the
-surrounding code should be followed.
-
-1.3.1 Object casts
-
-You can either use C style casts, or Gtk style casts.  Note that Gtk
-style casts can add significant execution overhead, which is not
-adding any extra checking.  e.g. if arguments have already been
-type-checked by preconditions.  Putting a space between a cast and a
-variable is optional, but preferred by most of the developers.
-
-1.3.2 Preconditions
-
-External api entry points should have preconditions (g_return_if_fail,
-etc), although their use varies from case to case.  Internal entry
-points and/or when you are guaranteed the type has already been
-checked, are unecessary.  Object initialisation and other virtual
-method invocations are considered internal entry points.
-
-1.3.3 Line lengths
-
-Do not expend effort and resort to unreadable formatting merely to fit
-any long lines into 80 column widths.  We use 8 space tabs, and
-because of the lack of namespacing other than extending the function
-name, many of the function and type names are too long for this to be
-practical.  We now all uses high resolution displays, and not
-circa-80's VT100 terminals!
-
-On the other hand, lines should generally not exceed 100 characters,
-and absolutely not exceed 160 characters.  If your tab nesting is too
-deep you probably have a poor design that needs rethinking.
-
-1.4 Design
-
-This is a tricky issue to document, but the design of new code should
-`fit' with the existing design of the relevent module.  It should at
-the very least, be no worse.
-
-Code should not cross existing abstraction boundaries or attempt
-to remove or work around them, if required the existing design may
-need adjustment.
-
-Type and method names should follow the existing practice in the
-surrounding code.  Method arguments should follow the same order as
-related methods, and should use the same names for matching
-parameters.
-
-Per file, static class globals are ok, true globals may be ok, but
-should be used sparingly.  Use 'i' for a loop variable, if that's all
-it is, don't use 'the_current_index'.  etc.
-
-If in doubt, ask on the lists.
-
-2. Patch submission guidelines
-
-This section outlines procedures that should be followed when
-submitting patches to evolution, via the evolution-patches mailing
-list.
-
-You must subcribe to the list at
-`http://lists.ximian.com/mailman/listinfo/evolution-patches' before you
-can submit patches to it.
-
-Also note that if you attach a patch to a bug report, it should always
-be sent to the list for attention.
-
-Any non-trival patches (patches of more than 1 or 2 changed lines in
-more than 5 isolated locations) also require copyright assignment.
-See http://developer.ximian.com/projects/evolution/copyright.html for
-details.
-
-If you follow the guidelines listed here, you should generally expect
-a response within 2 working days.  If you re-send the same patch
-repeatedly, you will more likely receive less attention.  Do not
-re-send the same patch repeatedly.
-
-2.1 Subject Lines
-
-If the patch addresses a specific bug in bugzilla.ximian.com, then the
-bug number must be included in the subject line, preferably near the
-beginning of the subject line.  A concise summary of the bug(s) being
-addressed, should be the remainder of the subject.
-
-It is unnecessary to add "[PATCH]", "patch" or similar to the subject
-line, unless it is being cross-posted to other non-patch lists.
-
-It is absolutely unnecessary to add "please consider", "please review",
-or "seeking review", or similar, to the subject line.  Please do not do
-this.
-
-Where the patch does not address a specific bug number, then the subject
-line should simply be a concise summary of the problem/feature it
-addresses.
-
-In all cases the subject line should include the module(s) to which the
-patch applies, and would generally match the component on the bug or
-the top-level module directory (e.g. camel, mail, addressbook, use 'all'
-for more than 3 or 4 modules).
-
-2.2 Message Body
-
-Patches should be attached as attachments, preferably as a single
-diff, when possible, and the changes are related.  The diff must be in
-unified diff format, "-up" is a suitable argument to give to "cvs
-diff" (-p may be dropped if not supported by your diff).  If you have
-added files, then -N should also be used, but if you are using cvs,
-"cvs add" is needed, and requires write access to the repository.
-
-If the patch does not address a specific bug, then the patch email
-should describe which feature or problem it addresses.  If it does
-address a specific bug, then further explanation beyond the bug
-commentary is optional, although often convenient.
-
-It would also be helpful to summarise the module to which it applies
-in the message body.
-
-In all cases you should include which branch, or branches, the patch
-is intended to apply to.  If this is not given it will be assumed to
-be the trunk (HEAD), and such patches will and must not be applied to
-any stable branch without further approval.
-
-2.3 ChangeLogs
-
-All patches must include appropriate ChangeLog diff's, to the
-appropriate ChangeLog(s) for the given change (emacs will automatically
-find the correct one, and format the entry appropriately).  All but
-the most trivial of patches will not be considered or discussed
-without this.  It is ok to contain extra ChangeLog entries for other
-pending patches, but they should not be excessively long - it isn't
-that hard to isolate patch diffs.  If the patch addresses a bug in
-bugzilla.ximian.com, then the ChangeLog entry must include some
-reference to that bug number (either the number, or #number, or 'bug
-xxx').  If it addresses a bug in another bug system, it must also
-indicate which bug system ('gnome bugzilla' 'red-hat bugzilla', etc).
-
-2.4 Stable branches
-
-Generally, any patch to the stable branch from non-core developers
-must address a specific bug in bugzilla.ximian.com.  The patch should
-also be attached to the bug in question, with the keyword 'patch' set
-on the bug report.  The patch email must identify which stable branch
-and version it is to apply to.
-
-3 Mailing lists
-
-3.1 Evolution Hackers
-
-If you wish to discuss patches before they are submitted, or ideas
-before you start to work on them, do it on the evolution-hackers list,
-which may be subscribed and viewed at
-`http://lists.ximian.com/mailman/listinfo/evolution-hackers'.
-
-This is a low-volume list (5-10 posts per day on average).
-
-Some patches may be discussed here to get a wider audience, although
-once a patch has been made it should generally be discussed on
-evolution-patches.
-
-Feature requests, bug reports, and other user related discussions,
-without the intention to write code to address them, will be ignored.
-
-3.2 Evolution Patches
-
-The patch submission list evolution-patches may be subscribed and
-viewed at
-`http://lists.ximian.com/mailman/listinfo/evolution-patches'.  Once a
-patch has been written, it may be submitted here for discussion, as
-well as final approval.
-
-Any non-patch related postings to this list will be ignored.
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 c23ea2e96e..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,20 +0,0 @@
-Overall Maintainers:
-Ettore Perazzoli <ettore@ximian.com>
-JP Rosevear <jpr@ximian.com>
-
-Mail:
-Jeff Steadfast <fejj@ximian.com>
-Michael Zucchi <notzed@ximian.com>
-
-Addressbook:
-Chris Toshok <toshok@ximian.com>
-Hans Petter Jansson <hpj@ximian.com>
-
-Calendar
-Rodrigo Moya <rodrigo@ximian.com>
-Hans Petter Jansson <hpj@ximian.com>
-
-Composer:
-Larry Ewing <lewing@ximian.com>
-Radek Doulik <rodo@ximian.com>
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 82425329dd..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-changelogs =				\
-	ChangeLog			\
-	ChangeLog.pre-1-4
-
-%-$(BASE_VERSION).pc: %.pc
-	 mv $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 				\
-	camel-$(BASE_VERSION).pc		\
-	evolution-shell-$(BASE_VERSION).pc
-
-EXTRA_DIST = 			\
-	AUTHORS			\
-	$(changelogs)		\
-	COPYING-DOCS		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	NEWS-1.0		\
-	marshal.mk		\
-	server.mk		\
-	intltool-merge.in	\
-	intltool-update.in	\
-	intltool-extract.in	\
-	$(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
-
-if ENABLE_SMIME
-SMIME_DIR=smime
-endif
-
-SUBDIRS = 			\
-        data                    \
-        e-util                  \
-	a11y			\
-        widgets                 \
-        shell                   \
-	camel			\
-	filter			\
-	$(SMIME_DIR)		\
-	addressbook		\
-	calendar		\
-        art                     \
-	composer		\
-	mail			\
-	ui			\
-        default_user            \
-	views			\
-	tools			\
-	help			\
-	po
-
-
-# CDE Stuff
-
-if HAVE_DTAPPINTEGRATE
-
-# This installs Evolution into the Application Manager on CDE
-dtappintegrate:
-	( cd data && make dtappintegrate )
-
-# ...And this uninstalls it
-dtappunintegrate:
-	( cd data ; make dtappunintegrate )
-
-# Install/uninstall for CDE
-cde-install: install dtappintegrate
-cde-uninstall: dtappunintegrate uninstall
-
-endif
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 0591b22d48..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,780 +0,0 @@
-Evolution 1.4.1, 2003-06-25
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #41826 - Focus the first minicard when focusing the view for the
-             first time (gilbert.fang@sun.com)
-    #43841 - Contact editor will not save Web Page address (Toshok)
-    #44477 - Make sure the master category list is upgraded (Toshok)
-
-  * Calendar
-
-    #41582 - Display incorrect after switching between week and day
-             view (Rodrigo)
-    #43585 - Ugly tasks printout (Hans Petter)
-    #45273 - Tab through events in day view (Bolian Yin)
-    #45275 - Shift+F10 to activate Popup menu in ToDo List (Bolian Yin)
-    #45423 - Provide shortcus for "Go to today" and "Go to date" (Bolian Yin)
-
-  * Mail
-
-    #22542 - Creating a folder in the vFolder store fails with a
-             meaningless message (Michael)
-    #31745 - Cannot view mails under '#mh' namespace.  Temporary
-             workaround, strip #'s (Michael)
-    #33593 - Message remains displayed after last message removed from
-             list (Michael)
-    #40788 - Broken POP3 server causing evolution to hang/crash (Jeff)
-    #42630 - collapsed thread always shows as unread (Jeff)
-    #43917 - ECharsetPicker doesn't save user-specified charset strings
-             properly (Jeff)
-    #43972 - Invert selection doesn't work (Jeff)
-    #43974 - Cannot retrieve "Local Delivery" mail (Michael)
-    #44121 - Invalid multipart/signed message showing empty (Michael)
-    #44139 - Composer spacing is not HIG compliant (Jeff)
-    #44322 - Evolution crash with weird IMAP foldername (Michael)
-    #44344 - Dont use quoted-printable encoding on anything but text/*
-             parts, interoperation with Lookout and others (Jeff)
-    #44457 - Crash viewing video content as inline-text (Jeff)
-    #44519 - Popup message view redraws when new mail arrives (Michael)
-    #44609 - HIG issue with vFolder properties editor (Michael)
-    #44991 - Cannot send mail in GB-2312 (Jeff)
-    #45082 - GB18030 BIG5HKSCS and EUC-TW charsets not supported in
-             evolution mail (suresh.chandrasekharan@sun.com)
-    #45063 - Message display refreshes when new mail arrives,
-    	     introducted by #33593 (Michael)
-    #45386 - Warnings when sending mail (Michael)
-    #45368 - Crash when closing the folder browser
-
-  * Summary
-
-    #44111 - Crash on exit (Ettore)
-    #44798 - Crash when closing print preview dialog (Ettore)
-
-  * All
-
-    #42691 - Build, make clean doesn't rebuild bonobo-activation
-             .server files (Michael)
-    #44717 - Tarball cointains generated files (Frederic Crozat)
-
-Other bugs
-
-  * Calendar
-
-    - Fix invalid shared use of list of calendar factories (Rodrigo)
-    - Make the calendar editor window title reflect the summary contents (Rodrigo)
-
-  * Mail
-
-    - Fix bug in indexer string normalisation (they weren't) (Larry)
-    - Major memory leak in message-threading (Larry)
-    - Only try to snoop a content-type if its application/octet-stream
-      when displaying mail parts (Jeff)
-    - Major memory leak in filter-file based filters (Jeff)
-    - Try to make asynchronous dns lookup more asynchronously
-      cancellable (Michael)
-    - Fix a degenerate algorithm case in vFolder shutdown which could
-      cause excessive exit cpu usage (Michael)
-
-  * Shell
-
-    - Wrong version number used for configuration upgrade (Michael)
-
-  * All
-
-    - Lots of miscellaneous memory leaks
-
-Updated translations:
-
-  - cs (Miloslav Trmac, Stanislav Brabec)
-  - el (Kostas Papadimas)
-  - es (Francisco Javier F. Serrador)
-  - hu (Andras Timar)
-  - it (Marco Ciampa)
-  - ko (Kan Jeong-Hee)
-  - mk (Ivan Stojmirov)
-  - nl (Vincent van Adrighem)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-  - sr, sr@Latn (prevod.org)
-  - sv (Christian Rose)
-  - tr (Gorkem Cetin)
-  - zh_CN (Wang Li, Funda Wang)
-
-
-Evolution 1.4, 2003-06-02
--------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Calendar
-  
-    #43388 - Problems importing appointments  (Rodrigo)
-    #43455 - Crash on exit  (Rodrigo)
-    #43763 - 2 right mouse menus appear in Week & Month views  (Rodrigo)
-    #43775 - Crash under Chinese locale  (JP)
-
-  * Mail
-
-    #42854 - Copying files from one IMAP folder to another makes
-             multiple copies of file  (Jeff)
-    #43862 - First run imap account won't load folders until account
-             is disabled and re-enabled  (Jeff, Michael)
-    #42691 - Server files not regenerated after distclean  (Michael)
-    #43805 - Evolution locked while editing reply to an mail  (Jeff)
-    #43410 - Flag for Followup dialog opens up too small in Evo  (Michael)
-    #43688 - Can't save signatures  (Michael)
-
-  * Summary
-
-    #43506 - Spontaneous crash  (Ettore)
-
-  * Misc
-
-    #43596 - Symlink icon file so it doesn't break existing panel
-             setups  (Ettore)
-
-Other bugs fixed:
-
-  * Addressbook
-
-    - Removed conflicting shortcut for the Print Preview menu item
-      (Rodney)
-
-  * Misc
-
-    - Corrected some problems in the pkgconfig files  (Rodney)
-    - Fixed an issue with GConf schema file installation  (Joe Marcus
-      Clarke)
-
-Updated translations:
-
-  - nl (Vincent van Adrighem)
-  - ru (GNOME Russian Team)
-  - be (GNOME Belarusian Team)
-  - es (Francisco Javier F. Serrador)
-
-
-Evolution 1.3.92, 2003-05-22
-----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #38084 - Rename local folder issue in contacts  (sean.gao@sun.com)
-    #41130 - HIG compliance  (Anna)
-    #41137 - HIG compliance  (Anna)
-    #41140 - HIG compliance  (Anna)
-    #41144 - Use stock buttons in the ldap config page  (Toshok)
-    #41211 - Add icon to "Add" button in "Add to Contacts" dialog  (Toshok)
-    #41229 - HIG compliance  (Anna)
-    #41231 - HIG compliance  (Anna)
-    #41232 - HIG compliance  (Anna)
-    #41245 - HIG compliance  (Toshok)
-    #41248 - HIG compliance  (Anna)
-    #41249 - HIG compliance  (Anna)
-    #41250 - HIG compliance  (Anna)
-    #41251 - HIG compliance  (Anna)
-    #41254 - HIG compliance  (Anna)
-    #41255 - Use stock Add/Remove icons in the contact list editor  (Toshok)
-    #41910 - Crash when deleting addresses from long contact lists  (Toshok)
-    #42048 - "Print" not hooked up in etable view  (Toshok)
-    #42177 - Cannot tab out of date edit widgets in contact editor  (Toshok)
-    #42472 - Selecting a field in a contact highlights entire row  (Toshok)
-    #42596 - Selecting text in a contact address field selects all
-             rows of text (Toshok)
-    #42604 - Display not shifted when cursor moved to next address
-             line (Toshok)
-    #42606 - Not saving information entered in Notes field of Contact
-             editor (Toshok)
-    #42620 - Crash related to mailing address checkbox  (Toshok)
-    #42625 - Clicking in white space of contact brings up empty
-             contact editor  (Toshok)
-    #42780 - Crash on solaris due to missing NULL in g_guild_filename.
-             (sean.gao@sun.com)
-    #42825 - clicking on letters in LDAP address card view does not
-             load selected letter (Dan, Toshok)
-    #43005 - Crash on reply  (Toshok)
-    #43016 - Crash when adding duplicate contact  (Toshok)
-    #43023 - All contacts have disappeared  (Toshok)
-    #43090 - GalView menu missing from the addressbook  (Toshok)
-    #43175 - Evolution crashed pasting large amount of text into
-             address field  (Toshok)
-    #43213 - auto-completion folder list wasn't populated correctly on
-             fresh install  (Toshok)
-
-  * Calendar
-
-    #40972 - connector crashed while evolution was idle  (Rodrigo)
-    #41234 - button order of "Enter Delegate" dialog (Rodrigo)
-    #41329 - Changing Options in scheduling tab causes display time to shift
-    #41579 - Double clicked on meeting in Exchange calendar, Evo
-             crashed  (Rodrigo)
-    #41760 - Alarm dialog does not reappear after snoozing Exchange
-             alarm  (Rodrigo)
-    #41811 - Calendar update failing and crashing  (JP)
-    #41930 - Warning while running gdb includes: "Some clown returned
-             undeclared exception"  (JP)
-    #41935 - day view ignores scroll wheel  (JP)
-    #42056 - Accelerators in meeting selector not working/looks bad
-             (Hans Petter)
-    #42220 - calendar not refreshing correctly after changing meeting
-             times  (Rodrigo)
-    #43029 - When running under valgrind Evolution crashed while
-             exiting  (JP)
-    #43308 - scheduling page alignment (JP)
-
-  * Mail
-
-    #40074 - Thread expansion state not remembered  (Jeff)
-    #41748 - Send/Recv not sending mail in connector Outbox  (Michael)
-    #42000 - Crash selecting a non-selectable folder  (Michael)
-    #42045 - Another workaround for mailers sending out invalid date
-	     formats  (Jeff)
-    #42118 - Edit->Mark as unread doesn't behave the same as right
-	     click->mark as unread  (Jeff)
-    #42170 - Thread expansion state lost on deleting messages  (Jeff)
-    #42212 - Crash entering address in composer  (Rodrigo)
-    #42294 - Custom fixed font setting not applying to composer
-              (Michael)
-    #42333 - Crash opening a mail again that was still being opened
-              (Jeff)
-    #42356 - Adding colour from not working properly  (Jeff)
-    #42456 - Spelling preferences Enable/Disable button inconsisency
-              (Michael)
-    #42540 - Crash when pressing send/recv too quickly  (Michael)
-    #42710 - Invalid 8 bit header data getting to the UI layer
-             generating warnings  (Michael)
-    #42763 - Crash deleting local folder with indexing turned off
-              (Jeff)
-    #42838 - Crash setting up local mail account  (Michael)
-    #42854 - Copying many messages between IMAP folders results in
-             several duplicates  (Jeff)
-    #43214 - changing server settings enables the account  (Jeff)
-    #43234 - crash reading mail  (Michael)
-    #42748 - Check spelling while I type - broken (Larry)
-    #42749 - Composer ignores color for misspelled words (Larry)
-    #43392 - Reproducible crash after searching mail w/ attachment and
-             closing (Jeff)
-    #43406 - Evo crashed during POP download/filtering  (Jeff)
-
-  * Shell
-
-    #36956 - Window title too long  (Ettore)
-    #40391 - Updated contributor list in the about box  (Michael)
-    #42038 - Crash hitting escape or closing window on rename box
-              (Michael, Ettore)
-    #42342 - Send/receive sensitive when startedi in offline mode
-              (Ettore)
-    #42465 - Unread count problem in the shortcut bar  (Ettore)
-    #42491 - Compilation problems on Forte  (Antonio Xu)
-    #42518 - Folder bar selection lost on folder delete  (Ettore)
-    #43079 - Don't crash when an invalid "default:" URI is given on
-    	     the command-line  (Ettore)
-    #43119 - Memory corruption problem in settings dialog  (Ettore)
-    #43216 - Crash on exit  (Ettore)
-    #43322 - Crash on exit  (Ettore)
-
-  * Summary
-
-    #41131 - HIG compliance  (Anna)
-    #41133 - HIG compliance  (Anna)
-    #41849 - Charsets not respected in news feed display  (Michael)
-    #43101 - Crash on exit  (JP)
-    #43117 - Crash on exit  (Ettore)
-
-Other bugs:
-
-  * Addressbook
-
-    - 64bit cleanup and warning fixes  (Jeremy Katz)
-    - Fixed some probable memory corruption (Toshok, Sean Gao)
-
-  * Calendar
-
-    - Fixed crash in cal_client_discard_alarm  (Rodrigo)
-    - Fixed Bonobo unrefing problems on components  (JP)
-    - Fixed multiple initialization in calendar factory  (Rodrigo)
-
-  * Mail
-
-    - Crash on exit if password dialog was open  (Ettore)
-    - Make Ok the default response on the password dialog  (Ettore)
-    - Crash in SMTP if unable to resolve the remote host name  (Jeff)
-    - Fix an automake 1.6 issues with camel-lock-helper  (Dan)
-    - Reload page if citation color changes (Larry)
-    - Made all the composer preferences work (Larry)
-    - Made newly created HTML signatures work again (Radek)
-
-  * Shell
-
-    - HIGified config settings dialog a bit more  (Anna)
-    - Fixed a bunch of reference count problems  (JP)
-    - Improved the look of the "open other user's folder" dialog
-      (Dan)
-
-  * Summary
-
-    - Fixed a typo that caused the summary to not see the default
-      calendar folder  (Ettore)
-    - Made the print dialog close properly  (Ettore)
-    - Reference count fixes  (JP)
-
-  * All
-
-    - Various container referencing issues  (JPR)
-    - 64 bit and portability fixups  (Jeremy Katz)
-    - Cleaned up lots of compile time warnings and run-time debugging
-      output  (everyone)
-
-Updated translations:
-
-  - cs (Miloslav Trmac)
-  - da (Kenneth Rode Christiansen)
-  - de (Christian Neumair)
-  - es (Francisco Javier Fernandez)
-  - fr (Christophe Fergeau)
-  - it (Marco Ciampa)
-  - ja (Takuo Kitame)
-  - no (Kjartan Maraas)
-  - pt (Duarte Loreto)
-  - pt_BR (Gustavo Maciel Das Vieira)
-  - ru (GNOME Russian Team)
-  - sv (Christian Rose, Anders Carlsson)
-
-  - Fixed encoding of the ca, en_AU, en_CB, et, eu, ro catalogs (Abel
-    Cheung)
-
-
-Evolution 1.3.3, 2003-04-29
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #37351 - Contact List drag-n-drop broken from sorted list view  (Toshok)
-    #40954 - Wombat crashes when opening an appointment  (Toshok)
-    #41843 - Don't use localized field names in the csv exporter  (Gilbert Fang)
-    #41779 - Fix crash when adding emails to existing contacts  (Toshok)
-
-  * Calendar
-
-    #21499 - No docs in snaps (Rodney)
-    #22444 - Deleting recurring meetings menu option (Rodrigo)
-    #34498 - alarm-notify not noticing meetings canceled by organizer (Rodrigo)
-    #35814 - same mnemonic for File:New:Mail Message and :Meeting (Rodney)
-    #37552 - GUI doesn't notice Connector failed to delete task (JP)
-    #39735 - Calendar View settings not persistent between sessions (JP)
-    #40257 - selecting day from calendar control causes window resize (JP)
-    #41129, #41215, #41221, #41256, #41148, #41216, #41235 - gui spacing (Rodrigo, Anna)
-    #41230 - forwarded tasks blank when viewed in a separate window (JP)
-    #41458 - Crash sending meeting invite (Dan)
-    #41459 - remove "Delegate to..." from right click menu in meeting dialog (JP)
-    #41641 - crash opening calendar for the first time (Hans)
-    #41661 - Only one popup dialog for repeated message alarm (Rodrigo)
-    #41671 - audio alarms pop up message dialog instead of playing tune (Rodrigo)
-
-  * Mail
-
-    #21499 - No docs in snaps  (Rodney)
-    #38927 - Signature editor help brings up composer help
-    #40694 - Focus not in To field of new message when From field is
-             visible. (Toshok)
-    #40989 - Deleted sub-folders hang around  (Michael)
-    #41043 - Send/receive accelerators broken  (Michael)
-    #41142 - Message search dialog has questionable button order  (Jeff)
-    #41149 - Spacing/padding of "Filters" dialog  (Jeff)
-    #41150 - Use stock buttons in "Filters" dialog  (Jeff)
-    #41151 - Spacing/padding of "Add/Edit Filters" window  (Jeff)
-    #41152 - Spacing/padding of "Vfolders" dialog  (Jeff)
-    #41153 - Use stock buttons in "VFolders" window  (Jeff)
-    #41155 - Spacing/padding in "Add/Edit Vfolders" dialog  (Jeff)
-    #41156 - Use stock** buttons in "add/edit vfolders" dialog  (Jeff)
-    #41163 - Forwarding HTML mail with inline images results in 
-             misformatted mail  (Michael)
-    #41164 - Can't import mails at all  (Michael)
-    #41190 - Crash cursor navigating Inbox  (Michael)
-    #41199 - Subscribe dialog's toolbar -- why? :)  (Michael)
-    #41205 - Use icons on Add/Edit/Delete buttons in "Search Editor"  (Jeff)
-    #41208 - Spacing/padding in "advanced search" dialog  (Jeff)
-    #41209 - Spacing/padding of "Create VFolder from Search" dialog  (Jeff)
-    #41238 - Crash when opening "attachment properties"  (Jeff)
-    #41239 - Spacing/padding of "attachment properties"  (Jeff)
-    #41241 - Title capitalisation of "Attachment Properties"  (Jeff)
-    #41244 - Spacing/padding of "Reformat Mailbox" dialog  (Jeff)
-    #41389 - Crash creating new Exchange acct  (Jeff)
-    #41398 - vFolder Sources IMAP folder names not being unencoded 
-             correctly  (Michael)
-    #41419 - Variable font key has trailing slash  (katzj@redhat.com)
-    #41448 - Crash on startup  (Michael)
-    #41461 - camel_text_to_html doesn't do as good a job with URLs as 
-             e_text_to_html  (Jeff)
-    #41513 - Plain text attachments not showing up in the composer  (Jeff)
-    #41578 - Up/down buttons broken in vfolder list  (Jeff)
-    #41648 - 1.2 -> 1.3 vfolder conversion  (Michael)
-    #41730 - Empty "Organization" headers  (Jeff)
-    #41789 - Bonobo components can pause/freeze the gui  (Jeff)
-    #41972 - Searching on labels is broken  (Michael)
-    #42024 - Improper use of Error dialog  (Jeff)
-
-  * Shell
-
-    #21499 - Documentation not working in the snapshots  (Rodney)
-    #33919 - Crash when opening other user's folder  (Dan)
-    #41002 - Default folder bar size too narrow  (Ettore)
-    #41008 - HIG compliance  (Anna)
-    #41010 - HIG compliance  (Anna)
-    #41022 - HIG compliance  (Anna)
-    #41024 - HIG compliance  (Anna)
-    #41025 - HIG compliance  (Anna)
-    #41036 - HIG compliance  (Anna)
-    #41059 - Crash connecting to other user's folder  (Ettore)
-    #41013 - Startup wizard display problems  (Michael)
-    #41128 - HIG compliance  (Anna)
-    #41145 - HIG compliance  (Anna)
-    #41146 - HIG compliance  (Anna)
-    #41147 - HIG compliance  (Anna)
-    #41225 - HIG compliance  (Anna)
-    #41227 - HIG compliance  (Anna)
-    #41242 - HIG compliance  (Anna)
-    #41304 - Missing dialog title  (Michael)
-    #41392 - HIG compliance  (Anna)
-    #41413 - Creating folder needs to make sure parent folder is
-             expanded  (Dan)
-    #41468 - New Exchange public folders do not follow type of parent
-             folder  (Dan)
-    #41469 - Upgrade routine crashing on Solaris  (Jeff)
-    #41484 - Make proxies work  (Sanshao Jiang)
-    #41567 - HIG compliance  (Anna)
-    #41569 - HIG compliance  (Anna)
-    #41648 - Vfolder upgrade problem  (Michael)
-    #41916 - Memory corruption in Storage interface  (Rodrigo)
-
-  * Summary
-
-    #39693 - Summary weather settings annoyances  (Ettore)
-    #40902 - HIG compliance  (Ettore)
-
-Other bugs:
-
-  * Addressbook
-
-    - Mostly, if not completely, fixed 33708  (Dan, Toshok)
-    - Fix duplicate entry in exported CSV  (Gilbert Fang)
-    - Use stock buttons  (Rodney)
-
-  * Misc
-
-    - Made Solaris/CDE integration work again  (Rodney)
-    - Removed some debugging spewage  (everyone)
-    - Don't crash on malformed GConf folder settings  (Toshok)
-    - Don't error out if the directory already exists when creating a
-      new folder  (Ettore)
-    - Fixed various memory leaks all over the place  (Hans)
-
-Updated translations:
-
-  - cs (Miloslav Trmac)
-  - de (Christian Neumair)
-  - es (Francisco Javier Fernandez)
-  - it (Marco Ciampa)
-  - nl (Vincent van Adrighem)
-  - no (Kjartan Maraas)
-  - pt (Duarte Loreto)
-  - sv (Christian Rose)
-  - zh_CN (Wang Jian)
-
-
-Evolution 1.3.2, 2003-04-11
----------------------------
-
-Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #7103  - Addressbook doesn't play nice with dark themes.  (Toshok)
-    #19178 - importers only target default contact folder.  (Toshok)
-    #20210 - Cannot save changes when invoked from mailer.  (Toshok)
-    #23036 - Export Contact Data to CSV, XLS, etc.  (for mail merge,
-             etc.) (Gilbert Fang)
-    #25148 - Selected contacts fields are not scrolling properly.
-             (Toshok)
-    #31786 - LDAP config dialog not properly internationalized.
-             (Toshok)
-    #32113 - Problem with UTF8 and contact list.  (Toshok)
-    #34085 - drag+drop not finalizing.  (Toshok)
-    #34651 - Searches with 8bit ascii char. not working in Select
-             Contacts.  (Toshok)
-    #37204 - Ximian, Inc. contact info update.  (Michael)
-    #38202 - Evolution crashed when I clicked the send button.  (Michael)
-    #39170 - void function should not has a 'return' keyword.  (Philip
-             Zhao)
-    #39256 - "Forward Contact", "Send Message to Contact" don't
-             work.  (Michael)
-    #39381 - crash when adding an address from an email to addressbook.
-             (Toshok)
-    #39507 - Select-names search broken.  (Toshok)
-    #39730 - Search Base Callback Not Working.  (Toshok).
-    #39763 - Pasting text into "To:" field doesn't work.  (Toshok)
-    #39788 - Can't add email address to contact.  (Toshok)
-    #40026 - Using pulldown to view multiple emails changes email to
-             random characters.  (Toshok)
-    #40046 - To: and Cc: fields not accepting accented letters.
-             (Toshok)
-    #40403 - can't edit contact lists.  (Toshok)
-    #40715 - Merge email address dialog non functional when adding
-             contact that already exists. .  (Toshok)
-    #40727 - email autocompletion not listing all names.  (Toshok)
-    #40841 - Ctrl-v was being used for both "Save As VCard" and
-             "Paste".  (Toshok)
-    #40901 - HIG-ify the LDAP server editor dialog's button
-             layout.   (Toshok)
-
-  * Calendar
-
-    #17231 - Private settings not retained.  (JP)
-    #31382 - Free/busy retrieval didn't work for http source.  (Rodrigo)
-    #31660 - Appointments with "for" recurrence synced with no end date.
-             (JP)
-    #32248 - Todo items imported from pilot have time set to 00:00.  (JP)
-    #34095 - Memory leaks.  (Hans Petter)
-    #34505 - Duplicate alarm dialogs for appts in exchange calendar.
-             (Rodrigo)
-    #35926 - Contacts entry in appointment editor to be removed.
-             (Hans Petter, Dan)
-    #37935 - Drawing problems in mini-calendar.  (Hans Petter)
-    #39262 - Crash when importing an ics file to local calendar.  (Rodrigo)
-    #39356 - New evo users didn't get calendar.  (Rodrigo)
-    #39692 - File type names should not be OAF component types.  (Ettore)
-    #39735 - View settings not persistent between sessions.  (Jeff)
-    #39736 - Times in day view too large.  (Hans Petter)
-    #39740 - Crash clicking in Attendees field when creating new
-             meeting.  (Rodrigo)
-    #39757 - Couldn't delete reminder for appointment.  (Hans Petter)
-    #39770 - Not meeting request sent.  (Rodrigo)
-    #39803 - Bottom part of text cut off in month view.  (Hans Petter)
-    #39895 - Selection vanishes when day view loses focus.  (Michael/Hans)
-    #39954 - Crash when setting recurrence rule for an appointment.
-             (Hans Petter)
-    #39955 - Crash when forwarding an appointment as icalendar.  (JP)
-    #39961 - Appointment schedule autopick menu displays under File.
-             (Rodrigo)
-    #40133 - wombat startup error. (Toshok)
-    #40195 - Cannot create new calendar folders (JP)
-    #40252 - LOG(e...) syntax error (Michael)
-    #40258 - Recurring event displayed truncated description.  (Hans Petter)
-    #40578 - Event summaries cut off in month view.  (Hans Petter)
-    #40655 - Mini-calendar always showed January 1970.  (Hans Petter)
-    #40661 - Missing header for Forte compilation.  (Rodrigo)
-    #40722 - Crash when closing a meeting.  (JP)
-    #40789 - Didn't remember reminder text.  (JP)
-    #40790 - Didn't launch programs added as reminders.  (JP)
-    #40792 - Buttons in Select File dialog for sound reminder didn't
-             work.  (Ettore)
-    #40876 - Cannot create a meeting with a resource in Exchange 
-	     calendar (JP)
-    #40894 - calendar switching weeks selected in small right subcalendars 
-	     (JP)
-    #41127 - Evolution crashed when sending new meeting invitation (JP)
-
-  * Mail
-
-    #29564 - Message list loses focus when you expunge.  (Michael)
-    #33786 - Crash when invalid expression fed to vFolder.  (Michael)
-    #36245 - Translation string context problem.  (Dan)
-    #37084 - Mailer forgets message list pane size on startup.
-             (Michael)
-    #38227 - Button spacing issues.  (Ettore)
-    #38461 - Mail importers cannot import to non-local folders.
-             (Michael)
-    #38659 - RFC2047 word encoding errors.  (Jeff)
-    #38926 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39165 - Losing all vFolder rules after editing them, until
-             restart.  (Michael)
-    #39168 - compiler compatability, empty structs.  (Jeff)
-    #39170 - Compiler compatibility, returning a void return value.
-             (Jeff)
-    #39173 - prototype mismatch.  (Jeff)
-    #39204 - Charset handling problems with broken mails.  (Jeff)
-    #39256 - Send message to contact/forward contact doesn't work.
-             (Michael)
-    #39325 - Allow user to enable/disable account from account list.
-             (Jeff)
-    #39382 - Signature editor dialog buttons messed up.  (Jeff)
-    #39464 - Trying to remove a duplicate vfolder crashes.  (Michael)
-    #39486 - Cancelling send/receive could cause a crash.  (Michael)
-    #39654 - vFolder source remove button doesn't work.  (Jeff)
-    #39696 - Default composer window title is meaningless. (Jeff)
-    #39741 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39744 - Sending 8 bit mime to a smtp server which doesn't say it
-             supports it. (Jeff)
-    #39759 - Crash using search dialog.  (Michael)
-    #39800 - Make To: have focus on a new message.  (Jeff)
-    #39809 - Dialog's don't match gnome 2 layout.  (Jeff)
-    #39813 - Crash/noop adding signature script.  (Jeff)
-    #39870 - Message browser button sensitivity not correct.  (Jeff)
-    #39914 - Configuration dialogs overlap each other. (Ettore, Jeff)
-    #39924, and many others - Subject entry box didn't work
-             properly/support i18n very well.  (Jeff)
-    #40043 - A warning dialog wont go away.  (Jeff)
-    #40074 - Threads always open expanded.  (Jeff)
-    #40083 - Search box doesn't work on subscription dialog - it was
-             removed.  (Jeff)
-    #40103 - Deadlock at startup.  (Michael)
-    #40124 - Cannot unsubscribe from folders that aren't selectable.
-             (Jeff)
-    #40188 - Context menu on addresses crashes.  (Michael)
-    #40300 - Files are only detected for recovery when you start an
-             editor.  (Michael)
-    #40314 - Some folders not expandable in subscriptions dialog.
-             (Jeff)
-    #40472 - Crash after entering password.  (Michael)
-    #40522 - Two passphrase dialogues viewing encrypted mail.  (Michael)
-    #40536 - Send/receive dialogue should transient for parent.
-             (Michael)
-    #40608 - Crash saving attachment.  (Jeff)
-    #40679 - Composer crash browsing files to attach.  (Jeff)
-    #40728 - Crash while scrolling.  (Jeff)
-    #40764 - Composer backs up drafts too often.  (Jeff)
-    #40778 - incorrect IMAP BODY parsing/display  (Jeff)
-    #40900 - vfolder creation dialog has wrong button order.  (Michael)
-    #40904 - Spontaneous crash.  (Jeff)
-    #40921 - Cancel subscription dialogue while busy -> crash.  (Michael)
-    #41004 - HIG compliance.  (Jeff)
-
-  * Shell
-
-    #17034 - Use UTF-8 in about box.  (Michael)
-    #34371 - Tries to open other user's folder with blank user field.
-    	     (Ettore)
-    #38775 - Version number hardcoded in warning dialog text.  (Michael)
-    #38974 - Xlib dependency causing linking error on Solaris.  (Ettore)
-    #39096 - Start-up crash on Solaris.  (Ettore) 
-    #39467 - Crash when splash image not found.  (Michael)
-    #39599 - Crash when folder icons missing.  (Ettore)
-    #39692 - OAFIIDs being shown in the importer dialog.  (Ettore)
-    #39706 - Settings window too big.  (Michael)
-    #40377 - Old stale wombat servers not being killed.  (Ettore)
-    #40413 - Problem with closing the folder selector dialog.  (Ettore)
-    #40474 - Summary settings not imported from 1.2.  (Michael)
-    #40590 - Signature settings upgrade problem.  (Michael)    
-    #40652 - Folder bar not resizing after resizing Evolution window.
-            (Michael)
-    #40748 - Cannot resize icons in the shortcut bar.  (Ettore)
-    #40854 - Problem with selecting other user's folder.  (Dan)
-    #40888 - Crash when selecting other user's folder.  (Dan)
-
-  * Summary
-
-     #5344  - Missing weather locations.  (Marten Woxberg)
-     #7153  - Stock folder names not translated.  (Ettore)
-     #12066 - Missing weather locations.  (Dan)
-     #15740 - Missing weather locations.  (Dan)
-     #18015 - Missing weather locations.  (Dan)
-     #19957 - AM/PM setting not being honoured.  (Ettore)
-     #40358 - Summary page not showing properly in non-C locales.
-              (Ettore)
-     #40141 - Preferences settings inconsistency when clicking "Close".
-              (Michael)
-     #32027 - Missing locations.  (Dan)
-
-Other bugs:
-
-  * Addressbook
-
-    - HIG'ify the e-address-popup's buttons layout.  (Toshok)
-    - Add input method support to the minicard view.  (Toshok)
-    - Make the minicard view listen for style changes.  (Toshok)
-    - Fix the select names component to be more friendly to non-shlib
-      components.  (Dan)
-    - Fix various errors in the contact editor caused by parsing
-      addresses when we don't need to - especially after the user has
-      explicitly entered the elements of the address
-      themselves.  (Toshok)
-    - Replace GtkImage based arrow buttons in the contact editor with
-      GtkArrow.  (Toshok)
-
-  * Calendar
-
-    - Replaced all references to GdkFont deprecatedness with Pango.
-      (Hans Petter)
-    - Alarm notification fixes.  (Rodrigo)
-    - Timezone dialog fix.  (Dan)
-    - Use weak refs instead of destroy signal.  (Rodrigo, Hans Petter)
-    - Use GtkMessageDialogs for meeting-related questions.  (Rodrigo)
-    - GtkObject -> GObject fixes.  (Everyone)
-    - Connector-related fixes.  (Dan)
-    - Made meeting/scheduling work correctly.  (JP)
-    - Only remove alarms for backends that request it (Rodrigo)
-    - HIG'ify dialogs (Ettore)
-
-  * Mail
-
-    - Clear passwords didn't work.  (Michael)
-    - Show preview and view threaded were made per-folder, as in
-      1.2.x, 1.3.1 had them global.  (Michael)
-    - Make the printing dialog, and account editor transient for the
-      parent.  (Larry, Jeff)
-    - Check for unique filter/vFolder names in all cases.  (Michael)
-    - Most warnings removed.  (Jeff, Michael)
-    - some text/plain mails detected as text/html, re-do the fix for
-      #16817 to make it pickier.  (Michael)
-    - Imap buffer overflow potential.  (Timo Sirainen)
-    - GSSAPI SASL support.  (Jeff)
-    - Handle broken header charset checking similarly to badly
-      labelled/broken body content.  (Dan)
-    - Various glib deprecation issues, and use non-locale specific
-      string compares in various places.  (Jeff, Michael)
-    - Mail piped to the sendmail transport is canoncalised into Un*x
-      format, using network format (CRLF) confuses some versions of
-      postfix.  (Jeff)
-    - Some work on fixing cut and paste shortcuts in composer.  (Jeff)
-    - Made the EvolutionComposer corba interfaces work again/port to
-      GNOME 2.  (Michael)
-
-  * Shell
-
-    - Fixed some problems with the folder dialogs.  (Dan)
-    - Fixed shell .server files.  (Dan)
-    - Added --force-shutdown to the shell as a killev replacement.
-      (Dan)
-    - Make Evolution use large WM icons.  (Ettore)
-    - Made the offline dialog work again.  (Ettore)
-    - Fixed importer framework to support non-local folders.  (Ettore)
-
-  * Summary
-
-    - Make creation of the summary settings page faster.  (Dan)
-
-  * All
-
-    - A number of compiler portability fixes, varadic macro's,
-      __FUNCTION__ -> G_GNUC_FUNCTION, inline usage, void returns, etc
-      (Everyone)
-    - Fixed druid colors.  (Dan)
-
-Updated translations:
-
-  - cs (Miloslav Trmac)
-  - de (Christian Neumair)
-  - es (Francisco Javier Fernandez)
-  - fi (Sami Pesonen)
-  - hu (Andras Timar)
-  - it (Marco Ciampa)
-  - no (Kjartan Maraas)
-  - pt (Duarte Loreto)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-  - sk (Stanislav Visnovsky)
-  - sv (Christian Rose)
-  - uk (Yuriy Syrota)
-  - zh_TW (Chao-Hsiung Liao)
-
-
-Evolution 1.3.1, 2003-03-05
----------------------------
-
-First release based on GNOME 2.
diff --git a/NEWS-1.0 b/NEWS-1.0
deleted file mode 100644
index b3e5fc7e57..0000000000
--- a/NEWS-1.0
+++ /dev/null
@@ -1,2939 +0,0 @@
-Evolution 1.0.8, 2002-06-23
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #17332 -- Addressbook crashes in LDAP address completion code.
-              (Toshok)
-    #26130 -- Close contact editor before save as crashes. (Toshok)
-
-  * Calendar
-
-    #25757 -- Fix quoting of icalendar properties (JP)
-    #25829, #25830, #26066 
-	   -- Fix a number of meeting usability and interop issues (JP)
-    #25697 -- Exchange reminders still not quite working (Rodrigo)
-    
-Other fixes:
-
-  * Addressbook
-
-    - Some memory leak fixes in the addressbook backends and
-      libversit. (Toshok)
-
-  * Calendar
-	
-    - Update time zone information (Damon)
-
-Updated translations:
-
-  - sk (Stanislav Visnovsky)
-  - sv (Christian Rose)
-
-
-Evolution 1.0.7, 2002-06-07
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #25054 -- "New Contact List" button is no longer active in
-              folders that don't support contact lists.  (Toshok)
-
-  * Calendar
-
-    #16962 -- Make the schedule page use the work hours set in the
-              preferences.  (JP)
-    #23350 -- Crash when refreshing meeting or task.  (JP)
-    #24783 -- Fix crash in wombat.  (Rodrigo)
-
-  * Mail
-
-    #11391 -- Bogus gnome_vfs_file_info_unref() that caused an
-              occasional crash.  (Frederic Crozat)
-    #15185 -- Non-RFC-compliant From/To/Cc being displayed as empty
-              in mail display.  (Dan)
-    #19920 -- Messages hiding in threaded view.  (Michael)
-    #21604 -- Various crashes.  (Michael)
-    #23782 -- Stop button causes a hang.  (Michael)
-    #25056 -- wombat segfaults when scrolling around calendar in month view
-              (Rodrigo)
-    #25456 -- Crash when deleting an account that has not been added
-              to the Evolution storage yet.  (Jeff)
-    #24615 -- VFolders with the UNMATCHED vfolder as a source hang.
-              (Michael)
-
-  * Shell
-
-    #24284 -- Copyright notice inconsistent in the about box.
-              (Ettore)
-
-Other fixes:
-
-  * Misc
-
-    - Fixed some typos in the names of some French locations.
-      (Christophe Merlet)
-
-Updated translations:
-
-  - et (GNOME ET Team)
-  - eu (Josu Waliño)
-  - sk (Stanislav Visnovsky)
-  - fr (Christophe Merlet)
-  - fi (Sami Pesonen)
-  - vi (pclouds)
-
-
-Evolution 1.0.5, 2002-05-06
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Mail
-
-    #24140 -- Crash when downloading a message with invalid header.
-              (Jeff)
-
-    #17174 -- Mail spools appear to be unread forever.  (Michael)
-
-  * Shell
-
-    #23538 -- Intermittent bug when moving folders around.  (Michael)
-
-Other fixes:
-
-  * Calendar
-
-    - Make reminders work with remote backends.  (Rodrigo)
-
-  * Misc
-
-    - Added support for adding an Evolution icon to the CDE
-      Application Manager.  (Ettore)
-
-Updated translations:
-
-  - bg (Borislav Aleksandrov)
-  - pl (GNOME PL Team)
-
-
-Evolution 1.0.4, 2002-04-18
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #22965 -- Comply with RFC 2739 for calCalURI and calFBURL.  (Toshok)
-
-  * Calendar
-
-    #22624 -- Unable to accept meeting request that doesn't list user
-              as attendee.  (JP)
-
-  * Startup Wizard
-
-    #22047 -- Crash after closing the start-up wizard.  (Ettore)
-
-  * Mail
-
-     #8214 -- "Error Synchronizing Folder" on incoming mail spool.
-              (Michael)
-    #18929 -- If we get multiple Content-Type header values, change
-              subsequent headers to X-Invalid-Content-Type so it doesn't 
-              wreck processing.  (Michael)
-    #22363 -- Problems resyncing IMAP folders when going Online.  (Jeff)
-    #21716 -- Fixes to decoding illegally rfc2047 encoded words.  (Michael)
-    #22657 -- Fixes printing for some localizations (Radek)
-    
-
-Other fixes:
-
-  * Calendar
-
-    - Use default tasks folder in calendar view.  (Rodrigo)
-    - Added getQuery method to CalBackend to allow custom queries for
-      each calendar backend.  (Rodrigo)
-
-  * Mail
-
-    - Fixed Daylight-Savings-Time calculations on systems that use 
-      tm.tm_gmtoff rather than 'timezone' (affects BSD systems).  (Jeff)
-    - Fixed the annoying EINPROGRESS error dialogs when connecting 
-      to IMAP/SMTP/POP via SSL.  (Jeff)
-    - Changed the date format used in From-lines in mbox spools to be 
-      the same as those used by Pine to fix interoperability issues.
-      (Michael)
-    - Fixed some filtertypes.xml typos.  (Michael)
-
-  * Summary
-
-    - Change the dot.kde.org url.
-
-Updated translations:
-
-  - fi (Sami Pesonen)
-  - fr (Christophe Merlet, Frederic Riss)
-  - ko (Young-Ho Cha)
-  - nl (Tino Meinen)
-  - no (Kjartan Maraas)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-
-
-Evolution 1.0.3, 2002-03-19
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #16097 -- Need a way to let the user specify the DN to
-              authenticate against.  (Toshok)
-    #16680 -- LDAP performance problem.  (Toshok)
-    #16968 -- Changing search type immediately requeries.  (Toshok)
-    #20089 -- Cannot copy contacts with comma from "Contacts" to LDAP.
-              (Toshok)
-    #20690 -- LDAP contacts dont show when using letter shortcuts.
-              (Toshok)
-    #20740 -- LDAP performance problem.  (Toshok)
-    #20871 -- SelectNames dialog needs search feedback.  (Toshok)
-
-  * Calendar
-
-    #14705 -- iMIP compatibility with versions of Outlook. (Better fix
-              for the pseudo-fix in 1.0.1). We now support Outlook in
-              both Workgroup and Internet-Only modes.  (Dan)
-    #19054 -- Minimum number of alarm repetitions should be
-              1. (Federico)
-    #19234 -- BYMONTH off-by-one in RRULE:FREQ=YEARLY.  (Damon)
-    #20510 -- Load free busy info as attendees are added.  (JP)
-    #20022 -- Itip addresses are case sensitive.  (JP)
-    #20226 -- Timezone data missing from some itip replies.  (JP)
-    #20346 -- Calendar should indicate if backend dies.  (Rodrigo)
-    #20780 -- Better subjects in iMIP messages.  (Dan)
-    #20787 -- Accepted/declined messages aren't always clear.  (JP)
-    #20800 -- Sorting of free busy information in schedule page does
-	      not work.  (JP)
-    #20783 -- Accepting updated meeting request doesn't work.  (Rodrigo)
-    #21198 -- Outlook didn't recognize Evolution's acceptance of an
-	      updated meeting request.  (Dan)
-    #21240 -- Calendar Reminders don't appear for appointments in remote
-              servers.  (Rodrigo)
-
-  * Mail
-
-    #19564 -- Don't crash when changing to disconnected mode.  (Michael)
-    #20779 -- Set a 'name' parameter in the Content-Type header
-              since Outlook doesn't seem to check the filename
-              parameter on the Content-Disposition header. (Jeff)
-
-  * Shell
-
-    #20234 -- Deleting folder gratuitiously causes /local to open.
-	      (Ettore)
-    #20237 -- Shell silently drops xfer errors.  (Ettore)
-    #20311 -- New window from shortcuts should not show the folder 
-              bar and the shortcut bar.  (Ettore)
-
-  * Summary
-
-    #18025 -- Summary crash upon switching to offline mode.  (Ettore)
-
-Other fixes:
-
-  * Calendar
-
-    - Show more descriptive messages on opening errors.  (Rodrigo)
-    - Remove $filename.ics from remote URIs.  (Rodrigo)
-
-  * Addressbook
-
-    - Fix search weirdness in local addressbooks.  (Toshok)
-    - Let backends return general error status from load_uri instead
-      of just TRUE/FALSE.  (Toshok)
-    - EBook(View) handling fixes in ESelectNames and
-      EAddressbookModel.  (Clahey)
-    - Rethink (and change) some of the default queries to ones that
-      are at the same time useful and more easily implemented
-      efficiently by the backends, in both the component's view and in
-      the select-names dialog.  (Toshok)
-    - Change the "beginswith" query implementation on the name field
-      to search both first and last name, so it's a little more useful
-      in the general case.  (Toshok)
-
-Updated translations:
-
-  - es (Carlos Perelló Marín)
-  - fr (Christophe Merlet)
-  - jp (Akira TAGOH)
-  - nl (Vincent van Adrighem)
-  - nn (Roy-Magne Mo)
-  - no (Kjartan Maraas)
-  - pt_BR (Gustavo Maciel Dias Vieira)
-
-
-Evolution 1.0.2, 2002-01-24
----------------------------
-
-Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
-
-  * Addressbook
-
-    #17725 -- Non-ASCII letter headings are black when printing
-              (Zbigniew Chyla)
-
-  * Calendar
-
-    #6544  -- Make Timezone names translatable (Damon)
-    #18801 -- Alarms with specific trigger times are not shown (Damon)
-  
-  * Importers
-
-    #16864 -- LDIF importer chokes on long description field (Toshok)
-    #17441 -- Crash trying to import VCards file into an LDAP folder
-              (Ettore)
-
-  * Mail
-
-    #6896  -- message_list_select() with wraparound won't select very
-              first message (Jeff)
-    #11499 -- All recovered Composer windows have HTML enabled (Jeff)
-    #16947 -- Crash while setting up a new mail account (Jeff)
-    #17205 -- Crash of evolution-mail on start-up (Jeff)
-    #17634 -- Marking a message as unread should undelete it, as well
-              (Jeff)
-    #17694 -- Exchange 5.5 reporting 2 messages as having the same UID
-              breaks Evolution (Jeff)
-    #17759 -- Cancelling Send/Receive can lose mail for local case
-              (Jeff)
-    #18142 -- Mailer crash when trying to send an email (Jeff)
-
-Other fixes:
-
-  * Summary
-
-    - Change the list of items in the mail preferences (Iain)
-
-  * Calendar
-
-    - Make Tasks default to public as in Outlook (Rodrigo)
-
-  * Importers
-
-    - Make the druid as a transient window for the main shell (Iain)
-
-  * Mail
-
-    - Follow symlinks for mbox files (Jeff)
-    - Fixed copy/paste problems in mail-account-gui.c (Ian Goldberg,
-      Jeff)
-    - Make Vfolders work with add-on storages (Dan)
-
-  * Shell
-
-    - Don't crash on missing icon on start-up (Michael Meeks)
-    - Change activation/deactivation order for views in order to
-      reduce flicker in the toolbars (Michael Meeks)
-
-Updated translations:
-
-  - bg (Alexander Shopov)
-  - el (Nick Niktaris, Panayotis Pakos, Simos Xenitellis)
-  - fr (Christophe Merlet)
-  - hu (Andras Timar)
-  - it (Clara Tattoni, Ettore)
-  - lv (Peteris Krisjanis)
-  - nn (Roy-Magne Mo)
-  - no (Kjartan Maraas)
-  - sk (Stanislav Visnovsky)
-  - sv (Christian Rose)
-
-
-Evolution 1.0.1, 2001-12-18
----------------------------
-
-New features:
-
-  * csv2vcard script to convert CSV addressbook files from Outlook
-    into VCard files that the Evolution importer can understand (by
-    Michael MacDonald).
-
-  * Alarms are now properly synced in the calendar conduit.
-
-Bugs fixed:
-
-  * Addressbook
-
-    #10114 -- No icon for Delete in the New Contact List editor
-    #10241 -- Occasional address completion flakiness
-    #10910 -- "Save" in list editor vs. "Save and Close" in contact editor
-    #11776 -- Email addresses are case sensitive
-    #13751 -- AddressBook address entry form usability problem
-    #14002 -- Select names dialog stays up after composer is closed
-    #14074 -- Editing fields under the "Collaboration" LDAP contact
-    #14715 -- Wombat gets locked up when LDAP server is down
-    #14876 -- Modifying LDAP contacts destroys existing objectclass entries
-    #15379 -- Printing from the addressbook totally broken
-    #16156 -- "Save As", "Send As", "Send To" not available in list editor
-    #16176 -- Tab order starts wrong
-    #16510 -- Small contact editor fixes
-    #16744 -- Crash
-    #16852 -- Crash closing empty mail
-    #16910 -- Crashed addressbook when selecting addresses
-    #17109 -- Crashed when editing a contact
-    #17126 -- Adding some addresses does not work
-
-  * Calendar
-
-    #7641  -- Crash in EMap widget when used in Evolution 
-    #8993  -- Attendees not stripped properly from itip replies
-    #13843 -- Deleting tasks causes crash
-    #13952 -- Notifier repeatedly gives alarm after appointment ended
-    #14087 -- Daily repeat event with end-date misses one day
-    #14489 -- UI bug in Calendar Settings
-    #14699 -- gtk_signal_disconnect_by_data warning
-    #14705 -- iMIP compatibility with versions of Outlook. (We now support
-	      Outlook in an Exchange environment by default, but the old
-	      behavior can be turned on with the environment variable
-	      EVOLUTION_SEND_IMIP_AS_ATTACHMENT. This will be fixed better
-	      later.)
-    #15401 -- Use UTF-8-aware gnome-print calls
-    #15456 -- Typo in translatable string
-    #15774 -- Crashed by selecting "decline" in meeting request
-    #15941 -- Location missing for the calendar
-    #15749 -- Empty end time in all-day-event crashes calendar.
-    #15774 -- Selecting decline in schedule meeting request makes evo crash
-    #15798 -- Calendar Date Never Updates         
-    #16232 -- e-itip-control.c - init() doing odd stuff     
-    #16359 -- Calendar Crash
-    #16460 -- Changing a meeting doesn't always offer to send an update
-    #16571 -- Weird URI in meeting request email
-    #16910 -- Crashed when entering a completion percentage
-    #16224 -- remove unsupported columns from Tasks view
-    #16880 -- Cannot import ical (ics) even its own       
-    #17344 -- iCalendar should not be translated   
-    #17526 -- Refreshing request does not show relevant information
-    #17527 -- Refresh requests have wrong menu
-    #17531 -- libical does not build with bison 1.30
-    #17606 -- libical does not build with autoconf 2.52
-    (none) -- Scheduling page did not accurately display no information range
-
-  * Conduits
-
-    #1183  -- Handle alarms in conduits
-    #14452 -- Converting names wrong from Palm
-    #15810 -- Crashed during EAddress sync
-    #15922 -- Crash
-    #16460 -- Changing a meeting doesn't always offer to send an
-              update
-    #16997 -- Pilot compilation with libiconv
-    #17230 -- Custom data on Pilot being over written
-
-  * Importers
-
-    #14701 -- Importing locks up Evolution
-
-  * Mail
-
-    #2233  -- Don't show RTF attachments inline 
-    #5547  -- Crash: Error closing a HTML-mail 
-    #12062 -- Can't use 'n' to skip to next unread if multiple messages 
-  	      are selected
-    #13898 -- Crash: Cannot create emails in evolution
-    #14127 -- Wrong error message 
-    #14348 -- Some things that need open messages... 
-    #14517 -- "Clear" needed twice for non-body+subject searches 
-    #14662 -- GPG signature showing as attachment 
-    #14678 -- Timestamp on outgoing mail incorrect on FreeBSD
-    #14734 -- Evolution-mail crashes while accessing imap servers 
-    #14770 -- Appending messages to other IMAP folder can cause INBOX to
-  	      stop updating
-    #14838 -- Saving passwords doesn't work
-    #14848 -- Forwarding wrong email due to next/prev 
-    #14965 -- Message copy fails with space in folder names
-    #14976 -- Crash when reading a message from an IMAP server
-    #15264 -- Crash: evolution-mail seg fault on exit 
-    #15374 -- "___" in autogenerated name of vfolder created by sender of 
-    #15415 -- Virtual Folders Editor: display of non-ascii symbols is broken 
-    #15449 -- `N' wraps `P' doesn't 
-    #15451 -- Crash when pressing stop during "going offline" 
-    #15489 -- Evolution crashed while deleting my IMAP mail account 
-    #15491 -- Evolution crashes/becomes unusable if ppp connection is lost
-    #15498 -- Crash: Faulty vFolder editor 
-    #15512 -- Hangs while scanning for changed messages on S/IMAP+Exchange
-    #15552 -- Crash
-    #15608 -- RCPT TO: response error: Success 
-    #15647 -- Composer "send" button has wrong tooltip when offline 
-    #15657 -- Empty recipients 
-    #15693 -- Crash: Loading message contents from IMAP and close application 
-    #15745 -- Search edit window widgets disabled. / Mail component crash.
-    #15813 -- Decrypting cuts off initial text
-    #15843 -- Attachments inside attachments 
-    #15946 -- Opening IMAP mailbox made it crash 
-    #15952 -- Mailer crashed after hitting page down key 
-    #16227 -- "Body contains" seems to want a regexp 
-    #16254 -- Add Sender to Addressbook missing from menus 
-    #16284 -- Evolution-mail crashed selecting "create vfolder on subject" 
-    #16371 -- Corrupt Email crashes Mail component 
-    #16416 -- X-Mailer says "Preview Release" 
-    #16501 -- Crash while creating new account
-    #16520 -- Crash
-    #16559 -- Race-condition in the Camel type system
-    #16669 -- Camel 64-bit badness
-    #16695 -- A few dialogs are missing sensible titles 
-    #16698 -- Crash: Can't empty trash; segfault when I try to exit
-    #16722 -- Attachment properties dialog crash
-    #16903 -- Crash: segv retrieving mail
-    #16924 -- Crash on a particular spam message
-    #16936 -- Crash when opening a specific message 
-    #16947 -- Crash: Trouble Setting up a new mail account
-    #17085 -- Bad encoding for subject
-    #17386 -- Crash when reading a specific message
-
-  * Shell
-
-    #7827  -- Switching desktops leaves the folder bar popped up
-    #14518 -- Crashed when starting the program
-    #14701 -- Importing locks up Evolution
-    #15435 -- "Rename folder" dialog: non-ASCII folder names are displayed
-    #16507 -- Right Click -> View does nothing
-    #16693 -- Crash when creating a new folder
-    #17258 -- Shell displays splash even if Evolution is already running
-
-  * Summary
-
-    #8029  -- Locations.h file for translators
-    #11212 -- Degree symbol in weather
-    #14483 -- "Hello"?
-    #14996 -- All-day appointments are displayed incorrectly in the
-              summary view
-    #16417 -- Have a better default than CNN headlines
-    #16772 -- Summary crashes on startup
-    #17249 -- Crash going offline
-  
-  * Misc
-
-    #16358 -- Evolution doesn't have a man page
-    #17377 -- Evolution doesn't work on multi-visual displays
-
-
-Evolution 1.0, 2001-11-14
--------------------------
-
-Misc:
-  Removed OpenSSL support.
-
-Mailer:
-  #14893 -- Mailer hanging if you specify an invalid password
-
-  
-Evolution 0.99.2 (Release Candidate 2), 2001-11-14
---------------------------------------------------
-
-Misc:
-  #14783 -- killev does not check for system type properly
-  #14630 -- HTML docs refer to missing gifs in stylesheet-images
-  #15027 -- Typos in the docs
-  #15028 -- Corrections to the user documentation
-  #15056 -- Spelling Error
-
-Shell:
-
-   #6295 -- Go to folder dialog should have the e-tree focused
-  #13872 -- Crash
-
-Summary
-
-  #13478 -- Summary hangs at startup
-  #14518 -- Crashing while starting the program
-
-Mailer:
-
-  #10560 -- Messages in Korean charset displayed as blank
-  #10735 -- Extra cruft at bottom of Compose window's View menu
-  #11177 -- Closing main window while dialog up, hangs
-  #11647 -- "Body contains" and "Body does not contain" searches are
-            matching strings in the message header
-  #13996 -- Searches not available in IMAP in offline mode
-  #14351 -- pgp 5.5.8 not supported, recognized as 2.6.x
-  #14361 -- IMAP/SSL APPENDs hang
-  #14542 -- Crash pressing ctrl-a ctrl-k
-  #14569 -- Crash when moving a folder
-  #14620 -- Weird font issue in Mdk 7.2
-  #14659 -- GPG messages are truncated
-  #14672 -- evolution-mail crashes on startup
-  #14794 -- PGP signing problem, complaining about 2.6.x when 6.5.1
-            is installed
-  #14826 -- Crashed the editor by using Alt-C (capitalize word)
-  #14838 -- Saving passwords dosen't work
-  #14848 -- Forwarding wrong email in separate window when using prev/next
-            buttons
-  #14861 -- DnD a message from a folder with a space in the name fails
-  #14951 -- Cancelling before IMAP connect causes IMAP to loop forever
-  #14965 -- Message copy fails with space in folder names
-  #15038 -- Can page up or page down off of table
-  #15154 -- Long line rendering bug
-  #15267 -- Outgoing filter move/copy to folder crashes Mailer
-  #15296 -- Mailer hangs when fetching mail
-  #15324 -- Table handling code not rendering centered content when
-	    it should
-  #15374 -- "___" in autogenerated name of vfolder created by sender of message
-  #15393 -- Pointer grab when shift-double clicking
-
-Addressbook:
-
-   #9501 -- Appointment Editor has "Save changes?" confirmation but
-            Contact editor does not
-  #14107 -- Crash: Address auto-complete pop-up appears after sending mail
-  #14646 -- Doesn't handle failure in default_book case
-  #14743 -- Contacts crashes when saving a List
-  #14780 -- Pushing categories in Contact editor crashes Contacts
-  #17355 -- e-select-names/completion from arbitrary storages
-
-Pilot conduits:
-
-  #9465  -- Palm Addressbook sync corrupts character set
-  #14562 -- Crash
-  #15355 -- Bogus warning in calendar conduit
-
-Calendar:
-
-  #10285 -- Problem printing the calendar
-  #13631 -- Left-over debug print
-  #14021 -- Problems entering a task
-  #14335 -- UTF-8 Error in schedule meeting
-  #14337 -- Meeting is added to calender even when selecting decline
-  #14362 -- Appointments (public or private) don't show in the Day
-	    view of the calendar
-  #14392 -- Event editor removes wrong pages when object updated
-  #14524 -- Meeting page dragging broken for all day events
-  #14655 -- evolution-alarm-notify crash on start
-  #14687 -- load_uri failures are not noticed by the client talking
-            to the wombat
-  #14704 -- Free/busy info not in UTC
-  #14765 -- Schedule page timezone problems
-  #14842 -- EWeekView - typing in event & day incorrect
-  #14845 -- Crash assigning category to new task
-  #14941 -- Crash
-  #15137 -- Crash when double clicking on empty appointment
-
-
-Version 0.99.0 (1.0 Release Candidate 1), 2001-11-05
-----------------------------------------------------
-
-Shell:
-
-  - Fixed problems with icons not showing up in the druids.  (Ettore,
-    Anna)
-
-  - Fixed some dnd brokenness.  (Ettore)
-
-  - Fixed some random crashes and made the shell more robust in case
-    of activation problems or components crashing.  (Ettore)
-
-  - Implemented a newer, prettier about box.  (Ettore)
-
-  - Made sure the quit message always gets displayed.  (Ettore)
-
-  - Made sure the shell doesn't allow for folder names with slashes.
-    (Ettore)
-
-  - Made the folder selection and folder creation dialogs play better
-    with the WM for out-of-proc components.  (Ettore)
-
-  - Make sure components don't display dialogs before the shell
-    windows are displayed.  (Ettore)
-
-  - Fixed some problems with copying/transferring/renaming folders.
-    (Ettore)
-
-  - Made the pop-up folder bar have the expected size when popped up.
-    (Ettore)
-
-Mailer:
-
-  - Fixed SMTP truncation, IMAP/SSL truncation/hangs when
-    sending/appending messages.  (Jeff)
-
-  - Implemented rename for imap/maildir folders.  Rename also tracked
-    in vfolder and filter code.  Use rename for local folders when we
-    can instead of copy/delete.  (Michael, Jeff)
-
-  - Fixed startup wizard next page race bugs. (Michael)
-
-  - Fixed toolbars vanishing, Bonobo Suxors. (Michael)
-
-  - Made filter/vfolder on mailing lists honour domains, but also
-    backward compatible.  (Michael)
-
-  - Fixed the password coming up behind the main window.  (Michael,
-    Ettore)
-
-  - Fixed numerous crash on startup/exit/while doing nothing/switching
-    folder/components, many races and other architectural errors.
-    (Michael, Jeff)
-
-  - Bunch of vFolder fixes and feature completion. (Michael)
-
-  - Added a 'index body' option to configure folder.  (Michael)
-
-  - Fixed 'unread' counts, again.  (Michael)
-
-  - Fixed some problems leaking file descriptors and overusing them
-    when not necessary.  (Michael)
-
-  - Implemented iconv() caching and Solaris friendly iconv name
-    converter.  Made override display charset work in more cases.
-    (Michael, Jeff)
-
-  - Various untranslated buttons/menus and other translation issues
-    fixed.  (Michael, Jeff)
-
-  - Offline searching in IMAP. (Michael)
-
-  - Don't warn the user if he drags a message and drops it in the same
-    place.  (Jeff)
-
-  - Fixed replying-to and forwarding messages with attachments to
-    attach the appropriate attachments in the new message.  (Jeff, Larry)
-
-  - Don't allow the user to edit the default searches and keep all the
-    search menus consistant accross all folders.  (Jeff)
-
-  - Allow the user to drag&drop and/or move messages to the Trash
-    folder.  (Jeff)
-
-  - Various fixes to the filtering code.  (Jeff, Michael)
-
-  - Make various dialogs non-modal.  (Jeff)
-
-  - Fixes to POP3 UID caching so users can "leave mail on server" and
-    not get duplicates.  (Jeff)
-
-  - Fixes to IMAP caching code where servers support the UIDPLUS
-    extension. Will also now un-cache a folder when the user deletes
-    it from the IMAP server.  (Jeff)
-
-  - Removed support for PGP 2.6.x due to security issues (pgp would
-    always return 0 suggesting that the signature was valid even when
-    it wasn't).  (Jeff)
-
-  - "Whitespace-only" recipients are now ignored, rather than being
-    flagged as invalid. (Trow)
-
-  - Fixed bugs related to message searching: memory leak, i18n problems,
-    etc. (Trow)
-
-  - We no longer leave stray windows lying around after doing the
-    "Add Sender to Addressbook" operation. (Trow)
-
-  - Bcc: headers are now shown when viewing drafts, sent mail. (Trow)
-
-  - Lots and lots and lots of other little and not so little things.
-    (Michael, Jeff, Dan, Trow)
-
-Addressbook:
-
-  - General bug fixes.  (Everybody)
-
-  - Printing fixes.  (Trow)
-
-  - Fixed the dreaded "this should never happen" bug.  (Trow)
-
-  - Plugged memory leaks.  (Trow)
-
-  - Fixed use-score sort ordering when doing completion.  (Trow)
-
-  - Fixed EAddressPopup race conditions.  (Trow)
-
-  - Implemented transfer function for shell, so moving contact
-    folders now works.  (Trow)
-
-  - Fixed occasional completion flakiness.  (Trow)
-
-  - Fixed contact count on folder bar.  (Trow)
-
-  - Fixes for LDAP/multibook address completion.  (Toshok, Trow)
-
-  - Added a "Do you want to save changes?" dialog to the contact 
-    and contact list editors. (Toshok)
-
-  - Fixed date (birthday and anniversary) handling for LDAP. (Toshok)
-
-  - Fixed nasty LDAP modification bug. (Toshok)
-
-  - Add a config setting (/Addressbook/default_book_uri) to specify where
-    vcards and email addresses from mail messages are stored as contacts.
-    (Toshok)
-
-  - Fixed problem that arose in an earlier beta where some contacts
-    couldn't be modified or deleted from local addressbook.
-    (Chris Toshok)
-
-  - LDIF Importer.  (Chris Toshok, Michael M. Morrison)
-
-  - Fixed Memory Leaks.  (Trow)
-
-  - Always show the correct message about the number of contacts on the
-    message bar.  (Trow)
-
-  - Fixed printing of contacts.  (Trow)
-
-  - Fixed the incredibly annoying bug which caused completed
-    (underlined) contacts to spontaneously revert when edited.
-    (Trow)
-
-  - Better event handling in minicard view.  (Chris Lahey)
-
-  - Fixed Bold font in select names dialog.  (Chris Lahey)
-
-  - Show error dialog if saving a contact to a file fails.  (Chris Lahey)
-
-  - Handle carriage returns in any contact field properly.  (Chris Lahey)
-
-Summary:
-
-  - Worked around gnome-vfs problems that were causing crashes.  (Trow)
-
-  - Set the defaults to be CNN and Boston (Ettore)
-
-  - Move the location of the RDF file to be in a place that will always exist.
-
-  - Fixed numerous bugs (Trow, iain)
-
-  - Made the offline stuff work correctly (iain)
-
-  - Fixed a bug were the summary wouldn't retain settings if all folders,
-    or RDFs, or weather stations were removed. (iain)
-
-Importers:
-
-  - Made the pine importer work for multidepth mail folders. (iain)
-
-Calendar:
-
-  - Underlined accelerators now work in the editor dialogs.  (Damon)
-
-  - Many fixes for scheduling meetings.  (JP)
-
-  - Status bar messages for long queries.  (Rodrigo)
-
-  - Appointments with empty summaries are now deleted from the views.
-    Also, you can press Escape to cancel editing [#780].  (Federico)
-
-  - The alarm daemon no longer displays "old" alarms twice. (Federico)
-
-  - Alarms now handle timezones correctly [#5852].  (Federico)
-
-  - Repeating alarms are now handled [#12163].  (Federico)
-
-  - The alarm daemon is launched as soon as the calendar starts, not
-    when you actually open a folder [#13867].  (Federico)
-
-  - You can now set a default reminder to be added to new appointments
-    [#13649].  (Federico)
-
-  - Fixes for printing week views [#13687, #13688].  (Damon)
-
-  - Tasks printout now matches the task list better [#10280].  (Damon)
-
-  - Better handling of DATE values, as opposed to DATE-TIME ones.  (Damon)
-
-  - Many changes to handle the default timezone better.  (Damon)
-
-  - Recurrence generation fixes [#11525].  (Damon)
-
-  - Fixed merging of complete VCALENDAR components.  (Damon)
-
-  - Fixes to the folder transfer functions.  (Ettore, Federico)
-
-  - Tasks activation fixes.  (Damon)
-
-  - Outlook interoperability fixes.  (Damon, JP)
-
-  - Miscellaneous fixes to the event/task editors.  (Damon, JP, Federico)
-
-  - New iCalendar importer.  (Rodrigo)
-
-  - Fixed problems introduced in Beta 6 due to the changes in the URI
-    management functions.  (Rodrigo)
-
-  - Prettier alarm notification dialog.  (Larry)
-
-  - Session management for the alarm daemon.  (Federico)
-
-  - Added activity bars for long calendar operations.  (Rodrigo)
-
-  - Added iCal file importer.  (Rodrigo)
-
-  - Show error dialogs on calendar failures.  (Rodrigo)
-
-Conduits:
-
-  - Addressbook phone numbers now preserved if they can't all be
-    synced to desktop (JP)
-
-  - Sync addressbook phone numbers from non-english pilots (JP)
-
-  - Various memory leak fixes (JP)
-
-  - Handle multi-day calendar events (without recurrences) (JP)
-
-  - Make sure task records are marked complete in every relevant field
-    (JP)
-
-  - Use new timezone stuff everywhere (JP, Damon)
-
-  - Translate task priorities better (JP)
-
-
-Version 0.16 (Beta 6), 2001-10-10
----------------------------------
-
-Shell:
-
-  - Now the shell restarts stale components from previous sessions
-    properly.  This should reduce the need for oaf-slay to only the
-    cases in which a specific component is completely stuck (which
-    hopefully should never happen).  (Ettore)
-
-  - Fixed the saving of the size of the shortcut bar and the folder
-    bar.  (Ettore)
-
-  - Always display a new default view for the shell, unless the user
-    specified an `evolution:' URI on the command-line.  (Ettore)
-
-  - Fix the weird behavior for right click -> open in new window in a
-    pop-up folder bar.  (Ettore)
-
-  - Make the copy/move and dnd code to detect copying of folders onto
-    themselves correctly.  (Ettore)
-
-Mailer:
-
-  - Bcc: addresses are now visible when browsing messages in
-    the "Sent" folder.  (Trow)
-
-  - Various backend fixes like thread safeness of concurrent
-    triggered events, more forgiving address header decoding,
-    fixes for recent breakage to progress reports, adding a deleted
-    event/state for folders, various deadlocks.  (Michael, Jeff)
-
-  - Fixed quick-searching by receipients to work.  (Michael)
-
-  - Caching of iconv handles to improve performance of many internal
-    mail reading/indexing operations.  (Michael)
-
-  - Major oops in mbox code that caused significant performance
-    problems getting/filtering mail fixed.  (Michael)
-
-  - Message charsets can now be overridden by a user-chosen charset
-    encoding in the mail display.  (Jeff)
-
-  - Report errors when file cannot be attached in the composer.  (Jeff)
-
-  - File->Folder->Properties and Delete Folder now work for VFolders.
-    (Michael)
-
-  - VFolders, Filters and Searches are saved in a safe manner so that
-    they should not be lost with quota/filled disk problems.  (Michael)
- 
-  - VFolders now update with new mail on their sources.  (Michael)
-
-  - Fixed the "Load HTML Images" radio button options in the mail
-    config dialog to work properly.  (Jeff)
-
-  - When an IMAP folder is deleted, removed any cached messages that
-    had been in that folder when it was "alive".  (Jeff)
-
-  - New icons for PGP signature authenticity.  (Jeff, Jimmac)
-
-Addressbook:
-
-  - General fixes.  (Chris Toshok, Trow, Iain, Chris Lahey, JP)
-
-  - LDAP configuration dialog fixes.  (Chris Toshok)
-
-  - New authentication work.  (Chris Toshok)
-
-  - Fixed crashes related to editing the Master Category List.  (Trow)
-
-  - Address completion is no longer confused by whitespace.  (Trow)
-
-  - More work on having multiple wombats.  (Chris Toshok)
-
-  - Contact names no longer mysteriously disappear when using the
-    SelectNames dialog.  (Trow)
-
-Calendar:
-
-  - Backend improvements (Rodrigo)
-
-  - Compilation fixes for latest Bonobo (Rodrigo)
-
-  - Fixed problem with exceptions to recurring events.  (Damon)
-
-  - Fixed handling of UNTIL property in recurring events. (Damon)
-
-  - The alarm daemon will now notify you of alarms that should have
-    occurred while it was not running.  (Federico)
-
-  - Handle monthly-by-day and "last day" recurrences in the conduits.  (JP)
-
-  - Added priorities to the fields in the attendee list.  (Chris)
-
-  - Enhancements to the event editor for meetings.  (JP)
-
-Summary:
-
-  - Bugfixes.  (Iain)
-
-  - Recurring events have the correct time and date.  (Iain)
-
-
-Version 0.15 (Beta 5), 2001-10-02
----------------------------------
-
-Shell:
-
-  - Fixed a problem with shortcuts not appearing when created by the
-    mailer.  (Ettore)
-
-  - Fixed right-click menu behavior for folders in the folder bar.
-    (Ettore)
-
-  - Got Rename to work again.  (Ettore)
-
-  - Fixed some folder copy/move/dnd bugs.  (Ettore)
-
-  - Added a menu item to configure the Pilot settings.  (Ettore)
-
-  - Fixed some other miscellaneous bugs/crashes.  (Ettore)
-
-  - Added ability to run the intelligent importers from the File->Import
-    menu item. (iain)
-
-Mailer:
-
-  - Fixed the multiple error-dialog thing.  (Michael)
-
-  - Fixes to PGP decrypting and verification code.  (Jeff)
-
-  - Made vFolders work a lot better.  (Michael)
-
-  - Added a confirm expunge option to the mail settings dialog.
-    (Jeff)
-
-  - Fixed the update-IMAP-unread-counts bug.  (Jeff)
-
-  - Show messages in the user's preferred charset if the message
-    itself doesn't contain charset information or if the message
-    charset is wrong (ie the system can't convert the text to utf-8).
-    (Jeff)
-
-  - Many backend fixes that users won't notice.  (Michael, Jeff, Dan)
-
-  - Fixed the crash that accompanied the invalid address warning.  (Trow)
-
-  - Properly encode the mailto: links we generate inside of displayed
-    messages.  (Trow)
-
-  - Improve the signature editor. (iain)
-
-Calendar:
-
-  - Backend improvements (JP, Rodrigo).
-
-  - The alarm daemon can now re-enter properly [#10840].  (Federico)
-
-  - Alarms can now have zero-time offsets [#7892].  (Federico)
-
-  - Warning fixes.  (Chris)
-
-  - Fixed custom Glade widgets on non-Linux systems.  (Dan)
-
-  - Fixed crashing problems in the event/task editor.  (Damon)
-
-Addressbook:
-
-  - Miscellaneous bug fixes.  (Trow, Chris Toshok, Chris Lahey, JP,
-    Peter Williams)
-
-  - Better handling of addresses containing commas or other special
-    characters.  (Trow)
-
-  - Fixed bugs related to sending mail by left-clicking on an address
-    inside a message.  (Trow)
-
-  - Auto-completion now matches against contact nicknames.  (Trow)
-
-  - Added help text and generally cleaned up the contact editor.
-    (Anna)
-
-  - Handle multiple wombats properly.  (Chris Toshok)
-
-  - Made which book to use for address completion configurable (no gui
-    for this yet.)  (Chris Toshok)
-
-  - Made Print Preview work in addressbook.  (Chris Lahey)
-
-Pilot:
-
-  - Now syncs exception dates in calendar and addressbook notes.  (JP)
-
-  - Does not overwrite custom data on pilot.  (JP)
-
-  - Address completion no longer marks records as changed.  (JP)
-
-  - Miscellaneous other bug fixes.  (JP)
-
-Summary:
-
-  - Cache images instead of repeatedly reloading them (iain)
-
-  - Only redraw when the summary is visible (iain)
-
-  - Use the encoding specified in the RDF file (Takuo Kitame)
-
-  - Leak fixes (Larry)
-
-  - Show todays tasks works (iain)
-
-  - Make the preferences dialog nicer. (iain)
-
-Importers:
-
-  - Handle cases where the Netscape transport is nothing. (iain)
-
-Version 0.14 (Beta 4), 2001-09-21
----------------------------------
-
-General:
-
-  - Lots of i18n fixes.  (Zbigniew Chyla and others)
-
-  - Made the splash screen use BackingStore.  (Ettore)
-
-  - Added a quit dialog box.  (Ettore)
-
-  - Fixed a shell crash that could happen when launching Evolution
-    before a previously launched instance was done initializing itself.
-    (Ettore)
-
-  - Fixed other random shell crashes.  (Ettore)
-
-  - Got the shell to remember window geometries on exit.  (Ettore)
-
-  - Fixed some things for Automake 1.5 (unfinished).  (Richard
-    Boulton)
-
-  - Add nice highlighting to DnD operations in the folder tree.
-    (Ettore, Clahey)
-
-  - Fixed several leaks.  (Dan)
-
-  - Fixed some problems with folder creation and deletion.  (Toshok)
-
-  - Made the Summary the default folder.  (Ettore)
-
-  - Made the title bar display the unread message count again.
-    (Ettore)
-
-Mail:
-
-  - Had a few beers while sitting back and relaxin'.  (Jeff, Michael)
-
-  - Check for valid addresses before sending. (Trow)
-
-  - Use contact preferences when deciding whether or not to put the
-    composer into HTML mode by default. (Trow)
-
-  - Properly address mail from "hidden" contact lists. (Trow)
-
-  - Redid folder unread counts/folder tree backend code
-    completely. (Michael)
-
-  - Implemented/fixed getfolderinfo in maildir/spool/local
-    folder/vfolder, required to make unread counts work. (Michael)
-
-  - Redid 'local folder' handling code completely. (Michael, Peter)
-    Also fixed the properties dialogue to get the list of supported
-    types dynamically, and set the right one at startup. (Michael)
-
-  - Redid vfolder code in evolution-mail completely.  Main visible
-    change is they open at startup, and the vfolder editor works
-    much better.  (Michael)
-
-  - Made it so fcntl(2) locking failures on filesystems (e.g. NFS)
-    that dont support locking are treated as success. (Michael)
-
-  - Fix imap inbox filtering, then moved it to CamelFolder, and
-    partly implemented it for spool and maildir mailboxes.  (Michael)
-
-  - Made the vfolder UNMATCHED folder's name translatable.  (Michael)
-
-  - Change the way the 'not body contains' filter rule works, so that
-    it runs much more efficiently, particularly on IMAP.  (Michael)
-
-  - Camel will not try and convert charsets of data that contain
-    invalid charset data, thus data will not be tainted by
-    a failed conversion process. (Michael)
-
-  - A few threading scheduling changes to try to optimise the user
-    experience.  Also changed the way threads are terminated,
-    avoiding some possible libpthread bugs.  (Michael)
-
-  - Changed vfolder uri's to not include the query, set it separately.
-
-  - Removed a lot of special case code for vfolder/file uri's, other
-    dead or newly redundant code, cleanups, etc.  (Michael)
-
-  - Fixed a bug in libibex that would overallocate block data and
-    corrupt it and crash, also fail-back and reset the index in
-    more cases.  (Michael)
-
-  - Fix filtering on score so the expression compiles. (Michael)
-
-  - Came to visit USA at a very wrong time.  (Michael)
-
-  - Removed X-Evolution headers before sending messages.  (Jeff)
-
-  - When configuring a new default account, make sure to set it as the
-    default.  (Jeff)
-
-  - Convert all textual parts to 8bit before saving them, this makes
-    saved messages more human readable.  (Jeff)
-
-  - Don't cache PGP passphrases unless the user requests to do so.
-    (Jeff)
-
-  - Unsubscribe from folders before deleting them.  (Jeff)
-
-  - Fixed a number of race conditions in the subscribe dialog.  (Jeff)
-
-  - Save transport (SMTP) passwords if the user has asked us to.  (Jeff)
-
-  - Hide the S/MIME frame in the account editor, we won't be
-    supporting it for 1.0.  (Jeff)
-
-  - Fixed it so that icons are displayed for PGP messages.  (Jeff)
-
-  - Give a description for each of the Source and Transport types when
-    configuring an account. This makes a few things less confusing.
-    (Jeff)
-
-  - When performing a Send & Receive on a disconnected IMAP server, if
-    the user provides a password, connect tot he IMAP server and display
-    it's folders too.  (Jeff)
-
-  - Return a folder info for each IMAP folder created when the user
-    creates a recursive directory structure.  (Jeff)
-
-  - Added support for more charset conversions (including all
-    Windows-cp125x charsets).  (Jeff)
-
-  - When the disk is full, warn the user and don't crash.  (Jeff)
-
-  - Handle POP servers that don't support the UIDL extension.  (Jeff)
-
-  - Several PGP fixes.  (Jeff)
-
-Addressbook:
-
-  - Miscellaneous bug fixes. (Jon Trowbridge, Chris Toshok, Chris Lahey,
-    Ettore Perazzoli, Iain Holmes, Zbigniew Chyla, Jacob Berkman)
-
-  - Fixed race conditions associated with adding/removing contacts.
-    The addressbook should be much more stable now.  (Trow)
-
-  - Fixed reference counting bugs in addressbook & wombat.  (Trow)
-
-  - Made address lookup smarter; cut & paste of address now mostly works.
-    (Trow)
-
-  - Plugged Trow's memory leaks.  (Larry)
-
-  - Name completion now works with one-word names, so it is now much
-    easier to send mail to Cher.  (Trow)
-
-  - Better handling of contact lists in the composer entries.  (Trow,
-    Toshok)
-
-  - SelectNames dialog fixes.  (Trow)
-
-  - Better handling of contact lists in the pilot conduits.  (JP)
-
-  - Added Free busy URL and Calendar URI info to contact editor and
-    ECard.  (JP)
-
-  - Made it so you can select uneditable text in Contact Editor.
-    (Chris Toshok)
-
-  - Worked on LDAP dialog.  (Chris Toshok)
-
-  - General LDAP work.  (Chris Toshok)
-
-  - Fixed charset handling within VCard handling.  (Chris Lahey)
-
-  - Reworked Drag & Drop for card view.
-
-Calendar & Tasks:
-
-  - Free/Busy changes.  (JP, Rodrigo)
-
-  - iTIP fixes (JP)
-
-  - i18n fixes, particularly for printing (Zbigniew Chyla)
-
-  - Added option to confirm deletions (Federico)
-
-  - Improved alarm system (Federico)
-
-  - Fixed crashing bug when deleting a folder (Federico)
-
-  - Added option to hide completed tasks (Damon)
-
-  - Timezone changes for interoperability with Outlook (Damon)
-
-  - Fixed problems displaying/parsing times in locales which don't specify
-    'am' and 'pm' strings (Damon)
-
-  - Added toolbar button to delete the selected calendar event (Damon)
-
-  - Meeting selector integrated (JP)
-
-Summary:
-
-  - Fixed bugs and leaks.  (Iain)
-
-  - Fixed bug with handling of the Slashot RDF files.  (Iain)
-
-  - Made the Addressbook and Tasks links open the editor for
-    them.  (Iain)
-
-  - Mail summary doesn't force all folders to be opened.  (Iain)
-
-  - Calendar summary shows if an alarm is set for an appointment.  (Iain)
-
-  - Timezone fixes.  (Iain, Damon)
-
-Importers:
-
-  - Fixed more bugs.  (Iain)
-
-  - Netscape importer shouldn't crash on Movemail users anymore.
-    (Iain)
-
-  - Pine importer should import addressbooks better.  (Iain)
-
-  - VCard importer will actually import things now.  (Iain)
-
-
-Version 0.13 (Beta 3), 2001-08-21
----------------------------------
-
-Global:
-
-  - New startup assistant to create mail accounts, import mail and set 
-    your timezone.  (Iain, Taylor)
-
-  - Improved the appearance and behavior of the clickable title bar and
-    the folder tree.  (Ettore)
-
-  - "Stock" folders such as Inbox have their names translated now and
-    cannot be removed.  (Ettore)
-
-  - Moved the Summary (formerly known as "My Evolution") to be a
-    normal node instead of being the toplevel node.  (Ettore)
-
-  - Fixed some problems with copying, moving and removing folderes.
-    (Jason)
-
-  - Fixed the handling of documentation files in the Help menu.  It
-    now integrates nicely with Nautilus and Scrollkeeper.  (Aaron,
-    Kjartan)
-
-  - Implemented the `File -> New' menu.  (Ettore)
-
-  - Improved error messages on start-up.  (Ettore)
-
-  - Fixed various crashes and minor bugs.  (Ettore, Jason)
-
-  - Various UI tweaks and improvements.  (Anna, Tuomas, Jakub)
-
-Mail:
-
-  - Fixed creating IMAP folders.  (Jeff)
-
-  - Add a shortcut to the INBOX of IMAP or spool stores when 
-    their accounts are first created. (Peter)
-
-  - Fixed Crash on Exit bugs.  (Jeff)
-
-  - Many more i18n fixes.  (Zbigniew Chyla, Jeff and others)
-
-  - Subscribe dialog UI tweaks. (Peter, Anna)
-
-  - Displaying PGP signed messages now shows icons.  (Jeff)
-
-  - Sensitize menu items based on number of selected messages. (Peter)
-
-  - Always-sign options for PGP.  (Jeff)
-
-  - Fixed keep-on-server for POP servers that don't support UIDL.
-    (Jeff)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Fix crash after conversion of an empty folder to another
-    format. (Peter)
-
-  - Ibex now limits its file descriptor usage. (Michael)
-
-  - When deleting an account, remove the shortcuts that point to it. (Peter)
-
-  - Several IMAP fixes. (Peter, Jeff, Danw)
-
-  - Miscellaneous bugfixes all around. (Peter, Jeff, Danw, Michael, others)
-
-Calendar & Tasks:
-
-  - Calendar no longer crashes when you scroll a busy month view
-    (Federico).
-
-  - Performance improvements throughout (Damon).
-
-  - Improved search bar; now handles categories.  (Jon, Federico)
-
-  - The date navigator now reflects the results of the search bar.
-    (Federico)
-
-  - An empty task is no longer added when you have selected a
-    category. (Federico)
-
-  - Internationalization fixes (Zbigniew).
-
-  - Timezone fixes (Damon).
-
-  - Time transparency and component classification support (Damon).
-
-  - Folder bar now displays the selected time range (Damon).
-
-  - Improved settings dialog (Anna, Damon, Federico).
-
-  - iTIP/iMIP fixes for attendees, cancellation. (JP).
-
-  - Category icon drawing fixes. (Rodrigo)
-
-  - Alarm fixes. (Federico)
-
-  - Calendar components can be saved independently. (JP)
-
-  - New icons. (Tuomas)
-
-  - Contacts support. (Damon)
-
-  - You can double-click on appointments to edit them. (Damon)
-
-  - Share more code between the backends. (Rodrigo)
-
-  - Miscellaneous fixes all over the place. (Damon, JP, Rodrigo, Federico)
-
-Addressbook:
-
-  - Various fixes.  (Anna Dirks, Dan Winship, Jason Leach, Jos Dehaes,
-    Kjartan Maraas, Lahey, Nat Friedman, Radek Doulik, Toshok, Trow)
-
-  - Made addressbook menus match the right click menus.  (Lahey)
-
-  - Made addressbook use camel for building email addresses.  (Trow)
-
-  - Fixed up phone number matching to not cause errors.  (Lahey)
-
-  - Made the alphabet bar change the current search.  (Lahey)
-
-  - Made duplicate contact matching less sensitive.  (Lahey)
-
-  - Changed advanced search to match behavior in mailer.  (Toshok)
-
-  - Redesigned LDAP server dialog.  (Anna Dirks)
-
-  - Work on addressbook authentication.  (Toshok)
-
-  - Changes to EDestination.  (Trow)
-
-  - Magic comma work.  (Trow)
-
-  - Redesigned ESelectNames dialog.  (Anna Dirks)
-
-  - Made LDAP changes appear in gui immediately if they're made by the
-    local client.  (Toshok)
-
-  - Made ECard hold a link to its original EBook.  (Lahey, Trow)
-
-  - Adapted for new ESearchBar. (Federico, Trow)
-
-  - Added the ability to create cards from anywhere in evolution.
-    (Lahey)
-
-  - Made searches for completion not use invalid cached data.  (Trow)
-
-  - Encode strings typed in by the user for use in sexps.  (Toshok)
-
-  - Made EContactEditor make the save button active more often.
-    (Toshok)
-
-  - Made ESelectNames handle LDAP storages.  (Toshok)
-
-  - Added full country list to addressbook full address editor.
-    (Lahey)
-
-  - Added the contact count to the folder bar.  (Lahey)
-
-  - Updated icons.  (Damon, Ettore)
-
-  - Worked on addressbook conduit.  (JP)
-
-  - Made ESelectNames only show names on the left that aren't on the
-    right.  (Trow)
-
-  - Fixed up minicard dragging.  (Toshok)
-
-My Evolution:
-
-  - Miscellaneous fixes all over the place. (iain)
-
-  - New icons. (Tuomas and Jakub)
-
-  - Works for people whos text colour was a light colour. (iain)
-
-
-Version 0.12 (Beta 2), 2001-07-31
----------------------------------
-
-Shell:
-
-  - Change the name of the local storage node from "local" to "Local
-    Folders".  (Jason)
-
-  - Fixed a problem with invalid URIs crashing the shell.  (Jason)
-
-  - Hide internal folder types (like "vtrash") from user.  (Ettore)
-
-  - Fixed some crashes that could happen when creating folders.
-    (Ettore)
-
-  - Fixed the URIs for the installed manuals in the help menu.
-    (Ettore)
-
-  - Added a status bar to show components' tasks instead of using
-    pop-up progress dialogs.  (Ettore)
-
-  - Other miscellaneous bug and leak fixes.  (Jason, Ettore)
-
-  - Initialize GConf properly when GtkHTML is built with GConf
-    support.  (Frederic Crozat)
-
-  - Make the shortcut bar not change the current group when renaming
-    it.  (Jason)
-
-Mail:
-
-  - Use new shell ActivityClient interface for progress reporting so
-    the ongoing activities appear at the bottom of the window instead of
-    using a pop-up.  (Michael)
-
-  - "Remember this password" check box added.  (Peter, Jeff)
-
-  - UI for timespan editor cleaned up.  (Peter)
-
-  - UTF8 issues with PGP and mail display addressed.  (Jeff)
-
-  - Translate some more strings.  (Jeff, Zbigniew Chyla)
-
-  - Fix camel_session_*_timeout functions.  (Michael)
-
-  - Fix application/pgp handling.  (Jeff)
-
-  - Fix DnD with no messages selected.  (Jeff)
-
-  - Respect the GTK+ theme when generating the header in the mail
-    display.  (Jeff)
-
-  - Make the default date column smaller.  (Peter)
-
-  - Don't display "0 hidden" messages.  (Peter)
-
-  - 'q' now toggles the message (pre)view.  (Peter)
-
-  - Rename the "Date" column to "Sent".  (Peter)
-
-  - Fix saving of passwords (some passwords were being saved and
-    loaded under different URI's).  (Jeff)
-
-  - Enter now always open the message in a new window.  (Peter)
-
-  - Gray out unsupported authentication mechanisms.  (Jeff)
-
-  - Fix saving/loading of several preferences.  (Peter, Jason)
-
-  - Overwrite attachment files correctly.  (Jeff)
-
-  - Don't lose the selection when deleting the last message.  (Jason)
-
-  - Improve guessing of which address to use when replying.  (Jeff, Jason)
-
-  - If SSL isn't supported, indicate so.  (Peter)
-
-  - Improve handling of NoSelect IMAP folders.  (Peter)
-
-  - Add a browse button for local mailboxes.  (Jason)
-
-  - VTrash handling improvements.  (Jeff, Peter)
-
-  - Display "unsent" in outbox summary.  (Peter)
-
-  - Only have main view folder browsers save view settings.  (Peter)
-
-  - Fixes to POP3 cache.  (Jeff)
-
-  - Handle variants of charset names.  (Jeff)
-
-  - Progress reporting and optimizations for IMAP.  (Dan)
-
-  - Progress reporting for SMTP.  (Michel)
-
-  - Handle unencoded eight-bit headers.  (Jeff)
-
-  - Miscellaneous improvements to Camel backend.  (Michael, Jeff)
-
-  - Several crashes fixed.  (everyone)
-
-Addressbook:
-
-  - Fixed some warnings.  (Chris T.)
-
-  - I18n fixes.  (Zbigniew Chyla)
-
-  - Address quoting in composer bug fixed.  (Jon)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    LDAP compiled in.  (Jason)
-
-  - Made it so that Other Contacts doesn't show up if you don't have
-    any LDAP servers configured.  (Jos Dehaes)
-
-  - General bug fixes.  (Chris T., Jon, Frederic Crozat, Jason,
-    JP, Ettore, Chris L.)
-
-  - Some LDAP cleanup.  (Chris T.)
-
-  - Crash fixes.  (Jon, Dan)
-
-  - Work on contact lists.  (Chris T., Jon)
-
-  - Made Contact Editor Save & Close button not active if nothing is
-    changed.  (Chris T.)
-
-  - Added accelerators to a few dialogs.  (Taylor Hayward)
-
-  - Made evolution-vcard-importer.c load the file into the correct directory.
-    (Iain)
-
-Calendar & Tasks:
-
-  - Show icons for categories.  (Rodrigo)
-
-  - Multiple selections for cut/copy/paste in task list.  (Rodrigo)
-
-  - Added missing underlined shortcuts for dialogs.  (Taylor)
-
-  - Many timezone-related fixes.  (Damon, Federico)
-
-  - Alarm notification dialogs.  (Federico)
-
-  - iTIP and iMIP ongoing work.  (JP)
-
-  - Consistency & cosmetic fixes for dialogs and menus.  (Damon,
-    Federico)
-
-  - You can now create new calendar/tasks folders in the shell.
-    (Ettore)
-
-  - Printing fixes.  (Damon)
-
-  - Added a search bar for tasks folders.  (Federico)
-
-  - The task pad in the day view is now filtered as well.  (Federico)
-
-  - Timezone support for conduits.  (JP)
-
-  - General bug fixes.  (Federico, JP, Damon, Rodrigo)
-
-My Evolution:
-
-  - Removed the wipe trackers option.  (Iain)
-
-  - Fix broken links in the Calendar.  (Iain)
-
-  - Added some more German cities.   (Iain)
-
-  - Fixed the New Feed button.  (Iain)
-
-  - Fixed the KDE and Newsforge urls.  (Iain and Jason)
-
-
-Version 0.11 (Beta 1), 2001-07-12
----------------------------------
-
-Shell:
-
-  - Drag and drop handling (Chris T.)
-
-  - Online/Offline operation (Ettore)
-
-  - Numerous code cleanups and bug fixes (Ettore & Jason)
-
-Mail:
-
-  - Added ability to specify a charset in the composer and for the 
-    Preview Pane.  (Jeff, Danw)
-
-  - Auto-save messages during composition and composer 
-    crash-recovery.  (Larry)
-
-  - Better signature file handling.  (Radek)
-
-  - File->Insert menu.  (Larry)
-
-  - Address-completion in the composer.  (Trow)
-
-  - Much improved PGP/GPG.  (Jeff)
-
-  - Cut/Copy/Paste and Drag & Drop.  (Jeff)
-
-  - Disconnected IMAP, IMAP filtering, and other IMAP improvements. (Danw)
-
-  - Empty Trash On Exit.  (Jeff)
-
-  - More informative Folder message counts (new/hidden/total).  (Peter)
-
-  - Implemented "Select Thread".  (Peter)
-
-  - Movemail fixes and improvements.  (Michael)
-
-  - Improved/Configurable Forward/Reply functionality.  (Jeff, Trow, Danw)
-
-  - Improved Message browser window.  (Jeff, Peter)
-
-  - Load HTML images Sometimes/Always/Never.  (Danw)
-
-  - rfc2184 conformance.  (Jeff)
-
-  - Online/Offline modes.  (Ettore, Danw, Jeff)
-
-  - HTML indexing.  (Michael)
-
-  - Spool providers.  (Michael)
-
-  - Many i18n fixes. (Jeff, Trow, Larry, Michael)
-
-  - Fixed saving of html signature preferences. (Peter)
-
-  - Cleaned up exiting by having remote stores sync folders (Peter)
-
-  - Attached binhex files do not cause infinite loops (Peter)
-
-  - Don't send BCC headers when sending via SMTP (Peter)
-
-  - Let you show and hide attached message/rfc822's (Peter)
-
-  - Implemented Create/Remove/Move Folder. (Jason, Jeff)
-
-  - Maildir fixes and improvments, support for subdirectories. (Michael)
-
-  - Progress reporting using via shell activity interface. (Michael)
-
-  - Many bug fixes all around.  (Michael, Jeff, Danw, Peter, Trow and others)
-
-Addressbook:
-
-  - Cut/Copy/Paste (Chris T.)
-
-  - Improvements to address completion, matching and merging (Jon, Chris L.)
-
-  - LDAP improvements (Chris T.)
-
-  - Numerous bug fixing (Jon, Chris L., Chris T.)
-
-Calendar & Tasks:
-
-  - Timezone support (Damon)
-
-  - Cut/Copy/Paste (Rodrigo)
-
-  - Event/Task editor rewrite (Federico & JP)
-
-  - Improved Printing (Damon)
-
-  - Itip/Imip improvements (JP)
-
-Importers: 
-
-  - Fixes, bug fixes and more fixes. (Iain & Jason)
-
-General:
-
-  - New graphics/icons (Jakub & Tuomas)
-
-  - UI Improvements (Anna & Taylor)
-
-  - 'make distcheck' should hopefully be working again (Peter)
-
-  - Have 'make install' work for non-root users in Camel, albeit
-    with a large and important warning message (Peter)
-
-My Evolution:
-
-  - Completely new and prettier My Evolution (nee Executive Summary) 
-
-  - Pretty graphics (Jakub)
-
-  - Mail, Calendar and Task summaries to tell you what you need to do
-    today.
-
-  - Weather forecasts so you don't need to look out the window (I
-    dunno, hackers seem to dislike looking out the window or
-    something...)
-
-  - News feeds so you don't need to go to websites to see what news
-    articles you don't want to read.
-	
-  - Printing, you can print it out and make it look like you've got
-    lots of stuff to do when really you're just trying to pass the 
-    time by playing Aisleriot or GLine all day (Iain)
-
-
-Version 0.10 "Tasmanian Devil", 2001-04-26
-------------------------------------------
-
-Shell:
-
-  - Fixed some usability bugs in the folder selection and creation
-    dialogs.  (Ettore)
-
-  - Added a --debug option.  (Dan)
-
-  - Added support for drag and drop operations.  (Ettore)
-
-Mail: 
-
-  - SSL (S/IMAP, S/POP, and S/SMTP).  (Jeff)
-
-  - Virtual Trash folders in each mail storage and "Empty Trash" menu
-    item to expunge all folders in a store.  (Jeff)
-
-  - Email addresses in mail headers are now right-clickable to add
-    them to the Addressbook (Jon, Radek)
-
-  - Hide deleted messages is now a mode rather than a one-time
-    operation. (Michael)
-
-  - When sending plain text mail, use the new plain text mode of the
-    GtkHTML editor (Larry)
-
-  - Cancellable operations, cancellable/async dns lookup, slightly
-    improved progress reporting.  (Michael)
-
-  - Allow per-identity Draft and Sent folders.  (Dan)
-
-  - Replies quoted with "> " in messages are now displayed dimmed to
-    make it easier to find the new bits of text. (Radek)
-
-  - Saved searches.  Searches now configurable via XML with supporting
-    C code.  (Michael)
-
-  - UNMATCHED vFolder (shows all messages that are in no other
-    vFolder). (Michael)
-
-  - SASL Authentication (Kerberos4, DIGEST-MD5, CRAM-MD5, PLAIN,
-    LOGIN, ANONYMOUS) for IMAP and SMTP (haven't done POP yet)
-    (Jeff, Dan)
-
-  - Filter/vFolder on Mailing List.  (Michael)
-
-  - Resend sent items.  (Jeff)
-
-  - Allow users to turn on/off headers in the composer and added
-    Reply-To header entry in the composer.  (Miguel, Jeff)
-
-  - Numerous OpenPGP (PGP/MIME) fixes.  (Jeff)
-
-  - Replying to a message chooses account based on message
-    addressee's.  (Jeff)
-
-  - Redid Forward Inline and Forward Quoted.  (Jeff)
-
-  - IMAP fixes: greater configurability for faster startup/mail check
-    (Dan), folders should now notice new messages when you switch to
-    them (Dan), copying/moving many messages at once should be much
-    faster (Jeff), better support for old IMAP servers (Dan)
-
-  - IMAP message bodies are now cached to local disk to speed up
-    re-access (Dan)
-
-  - New config dialogs (last time!) (Anna, Dan)
-
-  - Sorting by a text field in the message list no longer generates a
-    random order. (Michael)
-
-  - Fixed "crash when getting new mail from 2 POP servers" bug. (Dan)
-
-  - Numerous bugfixes, cleanups and optimisations. (Everyone)
-
-Addressbook:
-
-  - Added support for non editable sources.  (Toshok)
-
-  - Added address completion for use in contact entries using the
-    select names system.  (Jon Trowbridge)
-
-  - Fixed some major crashes in the addressbook backend.  (Clahey)
-
-  - Updated Ximian's contact information.  (Jason Leach)
-
-  - Finished LDAP support.  (Toshok)
-
-Calendar:
-
-  - Event creation fixes.  (Miguel)
-
-  - Calendar loading fixes and removal of old code.  (Federico)
-
-  - Made the iTIP control have better spacings.  (Anna)
-
-  - i18n fixes.  (Kjartan)
-
-Tasks:
-
-  - Created a popup list item for ETable to select the Status,
-    Classification, Priority, Percent & Transparencey fields.  (Damon)
-
-  - Created a popup date editor item for ETable to set all the dates in the
-    tasks.  (Damon)
-
-Importers: 
-
-  - Created Intelligent Importers that look for certain files on your disk
-    and works out what type of data it is. Currently Intelligent Importers
-    exist for Pine, Elm and Netscape. (Iain)
-
-General:
-
-  - Rewrote ETree in gal.  Changed evolution to support the changes in
-    API.  (Clahey)
-
-  - Lots of Etable/ETree bug fixes.  (Clahey)
-
-  - Lots of i18n/l10n fixes.  (Kjartan Maraas, Gedeminas Paulauskas,
-    and the Evolution gang)
-
-  - Fixed the shell interface so it could correctly create folders. (Iain)
-
-
-Version 0.9 "Platypus", 2001-03-12
-----------------------------------
-
-Shell:
-
-  - Importing framework.  (Iain)
-
-  - Made the splash screen a regular window.  (Miguel)
-
-  - Added a menu item to hide the shortcut bar to the shortuct bar
-    right-click menu.  (Jason)
-
-  - Update the shortcut labels to contain the number of unread
-    messages as well.  (Jason)
-
-  - Pre-select a newly created folder in the folder selection dialog.
-    (Ettore)
-
-Mail:
-
-  - GPG/PGP support is now mostly working and sort of configurable.
-    Except that the pretty pictures are missing.  (Jeff)
-
-  - Exciting new configuration druid (Anna, Jeff) and configuration
-    editor-of-the-month (Jeff). You can now have multiple identities
-    that use different transports.  (Jeff)
-
-  - The folder-tree unread message counts now work much better. But
-    vfolders only display their unread message counts *after you've
-    looked at the folder for the first time*.  (Dan)
-
-  - New mail send/receive stuff with status dialog.  (NotZed)
-
-  - "Stop" button and support for cancelling operations.  (NotZed)
-
-  - Various fixes involving IMAP folders and subscriptions.  (Dan)
-
-  - Fake messages to root threads in the message list are now gone.  (NotZed)
-
-  - NNTP support is no longer configured by default, as this code is
-    not expected to be completed by 1.0.
-
-  - Interface for hiding messages matching certain criteria.  (NotZed)
-
-  - Quick search bar now includes "Sender contains" option (Tuomas? Eek!)
-
-  - The mailer now properly launches "gnome_segv" when it crashes. I
-    mean, if it were to crash.  (Dan)
-
-  - IMAP attachments are now not loaded unless you look at them.  (Dan)
-
-  - The X-Mailer header can now include a compile-time-specified
-    string (for specifying package version, etc).  (Dan)
-
-  - The Date header in the message list now formats dates differently
-    depending on how long ago they are.  (Chris)
-
-  - The composer doesn't ask if you want to save before closing if you
-    haven't changed anything. Also, it has more useful window titles
-    (Jason Leach) And you can now turn off the "are you sure you
-    didn't mean to enter a subject?" dialog box.  (Jeff)
-
-  - The "Menu" key on a Windows keyboard (the one with the picture of
-    a pop-up menu) now pops up the message list right-click menu.
-    (Dan)
-
-  - Lots of internal stuff that doesn't much affect the user-visible
-    functionality, particularly involving multithreading, message
-    threading, filters/searching, and regression testing.  (NotZed)
-
-  - Importers for Outlook Express 4 and mbox (used by most mailers like
-    Netscape, Pine, Elm, Eudora) (Iain & Jeff)
-
-Addressbook:
-
-  - Fixed crashing bug on PPC.  (Clahey)
-
-  - Updated to work with both OpenLDAP 1 and OpenLDAP 2.  (Toshok)
-
-  - Added configuration dialog for LDAP.  (Toshok)
-
-  - Plenty of bug fixes.  (Clahey, Toshok, Meeks, JP, Larry, Jason,
-    Federico, Dan, Zucchi, Gediminas Paulauskas, Ettore)
-
-  - Moved category dialog to gal.  (JP)
-
-  - Worked on LDAP authentication.  (Toshok)
-
-  - Worked on status messages.  (Toshok)
-
-  - Worked on GalView stuff.  (Clahey)
-
-  - Improved the select names dialog GUI.  (Clahey)
-
-Calendar:
-
-  - New "go to date" dialog.  (JP)
-
-  - Categories support for appointments.  (JP)
-
-  - New alarms page in event editor.  (Anna, JP)
-
-  - Weekday picker now follows the week start setting.  (Federico)
-
-  - Date-editing widgets are more consistent with each other.
-    (Federico)
-
-  - Colorization fixes to the views.  (Damon)
-
-  - Optimizations to the views.  (Damon)
-
-  - New, simpler loading interface for calendars in the Wombat.  (Federico)
-
-  - Removal of lots of old Gnomecal code.  (Federico, JP)
-
-  - Alarm instance generation support for the Wombat.  (Federico)
-
-  - Alarm trigger queueing for the GUI.  (Federico)
-
-  - More robust launching and registration of the components.  (Federico)
-
-  - More i18n friendliness.  (JP, Federico)
-
-  - Start of the alarm notification daemon.  (Federico)
-
-  - Cosmetic and focus fixes all over the place.  (Federico, JP)
-
-Tasks:
-
-  - New, stand-alone tasks component.  (Damon)
-
-  - Categories support.  (JP, Damon)
-
-  - Your old tasks are migrated automatically to the new tasks folder.
-    (Federico)
-
-  - You get asked for confirmation when trying to delete a task entry.
-    (Federico)
-
-Conduits:
-
-  - Many bug fixes and cleanups.  (JP)
-
-Executive Summary:
-
-  - Bugfixes and memory leaks removed.  (Iain)
-
-  - Calendar summary component.  (Iain)
-
-  - RDF Summary saves it's state.  (Iain)
-
-  - Mail summary shows vFolder summaries as well.  (Iain)
-
-  - User changable number of columns. (Iain)
-
-
-Version 0.8 "Archaeopteryx", 2000-12-14
----------------------------------------
-
-Shell:
-
-  - Added a `--no-splash' option.  (Ettore)
-
-  - Plugged a number of memory leaks.  (Federico)
-
-  - Added interfaces to display an arbitrary string associated with a
-    folder, and highlight it on demand.  (Ettore, Dan)
-
-  - Changed the Storage IDLs so that you can associate a physical URI
-    to the toplevel node as well.  (Ettore)
-
-  - If a shell is already running, `evolution' will just make it
-    create a new view instead of creating a new shell.  (Ettore)
-
-Mail:
-
-  Display:
-
-  - The folder tree now shows unread message counts for mail
-    folders. For local folders, this updates in real time.  For IMAP, it
-    only updates when you "Get Mail".  To be continued.  (Dan)
-
-  - New "important" column in the message list.  User-settable.  (Dan)
-
-  - The message list "Size" column now displays more prettily and
-    sorts correctly.  (Jeff)
-
-  - New command to view the raw source to a message.  (Jeff)
-
-  - More reliable MIME icon code in the mailer and the composer.
-    (Dan, Iain)
-
-  - Lots of internationalization fixes.  (Dan, Kjartan)
-
-  Composer / Outgoing mail
-
-  - Various fixes to use the best charset and MIME encoding for
-    outgoing messages.  (Michael, Jeff)
-
-  - You can now forward messages inline, instead of attaching them.
-    Forwarding multiple messages now results in a multipart/digest
-    attachment.  (Jeff)
-
-  - Replies are now preceded by "On DATE, PERSON wrote:" (Jeff)
-
-  - Better reply editing, automagically sets indentation and paragraph
-    style to Normal. (Radek)
-
-  - HTML signature support.  (Radek)
-
-  - Inline image support.  (Radek)
-
-  - Fixes for addresses with commas.  (Jeff, Michael)
-
-  - Fix to not allow attaching directories, devices, etc.
-    (Jeff)
-
-  - Fixed the sign of the GMT offset in generated Date headers. 
-    (Michael)
-
-  - Fixed a bug in base64 encoding.  (Michael)
-
-  - Fixed a problem in connecting to non-ESMTP SMTP servers.  (Jeff)
-
-  Miscellaneous Commands / Features:
-
-  - The mailer will now remember your passwords, if you configure
-    that option for a service.  (Dan)
-
-  - New "Apply Filters" command to apply filter rules to selected
-    messages.  (Jeff)
-
-  - No more "No new mail" dialog.  (Jeff)
-
-  - Individual messages can now be saved to disk.  (Jeff)
-
-  - Synced the Message menu with the right-click menu.  (Jeff)
-
-  - Mailer now uses the same search bar as the addressbook.  (Anna,
-    Chris, Jeff)
-
-  Filters:
-
-  - Now supports filtering on system flags (ie Answered, Seen,
-    Unseen).  (Jeff)
-
-  - Regular expression searches are now moved to their own Option
-    menu.  (Jeff)
-
-  - Allows regex searching on the entire message header.  (Jeff)
-
-  - Now has soundex filters (x sounds like y).  (Jeff)
-
-  IMAP:
-
-  - "Get Mail" now scans all folders.  (Dan)
-
-  - IMAP password dialog no longer pops up at startup: click on the
-    server in the folder tree to connect.  (Dan)
-
-  - Folder subscription support.  (Chris Toshok, Dan)
-
-  - Various IMAP folder naming fixes. (May fix Cyrus support) (Dan)
-
-  - Seen/deleted flags are preserved across "Get Mail".  (Jeff)
-
-  - Fixed a bug that could cause messages to be marked as seen
-    even when the UI thought they weren't.  (Dan)
-
-  - Fixes for IMAP folders with spaces in their names (again).
-    (Jeff)
-
-  - IMAP Kerberos 4 authentication support.  (Dan)
-
-  POP3:
-
-  - Fixed a bunch of error cases in POP3 connection.  (Dan)
-
-  - Fixed POP3 to more reliably delete messages when it was supposed
-    to be doing so.  (Dan)
-
-  Local mail:
-
-  - Major local mail rewrite that fixed memory leaks, reduced
-    memory consumption, improved efficiency, etc.  (Michael)
-
-  - Maildir support.  (Michael)
-
-  - Local mail folders are now locked (via dot locking and/or
-    fcntl/flock) while Evolution is modifying them, and it will
-    notice if they've changed while it's not looking. (Michael)
-
-Calendar:
-
-  - To-do and calendar conduits working except for extended
-    character support (ie accented chars) (JP)
-
-  - Updated wombat implementation of change reporting (JP)
-
-  - Majorly kick-ass new recurrence page in the event editor with an
-    easy UI, a preview of what will happen, and lots of love. (Anna)
-
-  - Imported a new libical with the APIs we require for alarms, the
-    start of the timezone code.  This may be the last Evolution
-    release that uses a CVS-imported libical; in the future we should
-    depend on official tarballs. (Federico)
-
-  - Event editor now deals gracefully with iCalendar recurrences we
-    cannot edit. (Federico)
-
-  - Plenty of fixes to the ETable calendar model for the task list
-    (Damon).
-
-  - The task list now saves its state, selected columns and sort order
-    (Damon).
-
-  - Lots of love to the iTIP engine and user interface.  Scheduling
-    appointments via email should be working fine, and they should
-    also work when you receive them. (Jesse)
-
-  - Lots of work on the calendar preferences code. (Damon)
-
-  - Many functional and cosmetic fixes to the day and week
-    views. (Damon)
-
-  - Event and task editors now ask if you try to close them without
-    saving changes. (Damon)
-
-  - You are now prompted if you are sure that you want to delete an
-    appointment. (Federico)
-
-  - Plenty of memory leaks fixed. (JP, Federico)
-
-  - Prettified the event editor a bit by making widget spacings
-    consistent. (Federico)
-
-  - Fixed semantics for handling exception dates (Federico)
-
-  - Some fixes to the recurrence instance generation engine. (Damon)
-
-  - Fixed insertion of new objects via notification into the task
-    list.  (JP, Federico)
-
-  - Misc. polishing for the event editor's innards. (Damon, Federico)
-
-  - Misc. cruft removal from old Gnomecal code (Federico, Miguel)
-
-  - Prettier icons for the task list. (Federico)
-
-Addressbook:
-
-  - Addressbook conduit now working, experimentally, except for
-    extended character support (ie accented chars.) (JP)
-
-  - Extended wombat functionality with getChanges call. (JP)
-
-  - Full name and address dialogs in contact editor fixed. (Chris)
-
-Executive Summary: (iain)
-
-  - Now compiled by default.
-
-  - Prettier default dialogs.
-
-  - Customisable background.
-
-  - RDF Summary, and Mail Summary components.
-
-  - Fixes and optimisations.
-
-  - Can restore state.
-
-Version 0.7, "Loch Ness Monster", ????
---------------------------------------
-
-There have been no verified sightings of this release.
-
-
-Version 0.6, "Procompsognathus", 2000-10-19
--------------------------------------------
-
-General:
-
-  - Split out lots of functionality to gal.  Evolution now depends on
-    gal. (Chris Lahey, Gal Team)
-
-Shell:
-
-  - Added a cute splash screen.  (Ettore, TigerT)
-
-  - Improved the way `~/evolution' is initialized the first time.
-    (Iain)
-
-  - Fixed the problem with the folder bar disappearing too son when
-    clicking on the scrollbar.  (Ettore)
-
-  - Updated to use the new toolbar and UI merging code from Bonobo.
-    (Michael Meeks, Ettore)
-
-Mail:
-
-  - Numerous i18n encoding, decoding, and display fixes. Non-ASCII
-    text should be displayed correctly in most context in the mailer
-    now. The composer no longer sends undeclared 8bit data. (Jeff)
-
-  - The IMAP provider now caches summary info between sessions, so
-    startup should be much faster for large folders. (Dan)
-
-  - Subscribe/unsubscribe UI for newsgroups. (IMAP subscriptions will
-    be supported in a later release.) NNTP authentication support.
-    Various other NNTP fixes. (Chris Toshok)
-
-  - New "full search" button to do more complicated searches. (NotZed)
-
-  - Composer attachment bar improvements. You can now drag files to
-    the composer window to attach them to the message. (Iain)
-
-  - Message list state (columns selected, sorting, etc) is now saved
-    between sessions. (NotZed)
-
-  - "Get Mail" now works for IMAP. IMAP mail no longer arrives
-    asynchronously (although if you delete mail from another client,
-    it will be deleted asynchronously). (Dan)
-
-  - Image attachments now use thumbnail images rather than a generic
-    image icon. (Iain)
-
-  - Various IMAP provider bugs (Dan, Jeff)
-
-  - Filter code cleanup/improvements. (NotZed) Filtering can read and
-    write message scores. (Jeff) On-demand filters no longer expunge
-    the source folder, and don't filter deleted messages. (Jeff)
-    Filters now log their actions. (Jeff)
-
-  - Drafts, Outbox, and Sent folders now default to showing "To"
-    instead of "From" in the header list. Messages output to the Sent
-    folder are marked as "Seen". "Send later" on a reply will mark the
-    message as having been replied to. (Jeff)
-
-  - Message list "attachment" column is now functional. The
-    read/unread state of a fake thread header now matches the state of
-    the thread. (NotZed) Message list sorting is more clever (Jeff)
-
-  - The "Print" toolbar button now opens a Print dialog rather than a
-    Print Preview window. (Miguel)
-
-  - New "Select All" command. "Mark all messages as seen" became "Mark
-    (selected) messages seen". (Jeff)
-
-Calendar:
-
-  - Improved todo list and calendar view gui (Damon)
-
-  - Printing works again (Federico)
-
-  - Config dialog improvement and implementation (Damon)
-
-  - Todo and calendar conduits working, except for archiving (JP)
-
-Addressbook:
-
-  - Lots of internal refactoring of addressbook, including changes due
-    to gal. (Chris, Chris)
-
-  - Lots of bug fixes. (Chris, Chris, Matt Bissiri, Iain, Dan)
-
-  - Added a working field to save whether the contact wants
-    HTML. (Chris Lahey)
-
-  - Added "Stop" and "View All" toolbar buttons. (Chris Lahey)
-
-  - Lots of work on modifiable LDAP. (Chris Toshok)
-
-  - Recognizes a lot more Prefixes and Suffixes when parsing names. (Nat)
-
-  - The card view doesn't write out cards unless they've changed. (Chris Lahey)
-
-  - New layout of address editor dialog. (Anna, Chris Lahey)
-
-Version 0.5.1, "Salamended", 2000-09-15
----------------------------------------
-
-General:
-
-  - Fixed a font-handling problem that would cause Evolution to crash
-    at startup with certain Gtk themes. (Chris)
-
-  - Fixed some build problems. (Chris)
-
-  - We no longer ship an out-of-date Red Hat-only RPM spec file.
-
-Shell:
-
-  - The shell now installs the `Sent' folder at startup if it doesn't
-    exist yet.  (Ettore)
-
-  - If a component crashes unexpectedly, the shell displays a dialog
-    box informing the user of that.  (Ettore)
-
-  - Fixed a bug in the folder selector dialog that would result in
-    crashes while trying to move messages in the mailer. (Dan)
-
-Addressbook:
-
-  - Fixed a bug that would cause the addressbook to crash when
-    embedded in the composer. (Dan)
-
-Mail:
-
-  - Fixed a display problem caused by expunging an IMAP folder. (Dan)
-
-  - Fixed POP mail so that "keep on server" is obeyed correctly. (Dan,
-    Jeff)
-
-  - Fixed replies so that replying to a message twice doesn't turn off
-    the "replied" flag. (Dan)
-
-  - Fixed a bug that prevented "Send later" from working. (Dan)
-
-
-Version 0.5, "Salamander", 2000-09-13
--------------------------------------
-
-Shell:
-
-  - Switched to using ETree for the folder view.  (Chris Toshok,
-    Ettore)
-
-  - Added interfaces to change the string displayed in the tree view
-    as the name of the folder.  (Ettore)
-
-Calendar:
-
-  - Uses only the new iCalendar standard internally; this means future
-    interoperability with new calendaring programs.  (JP, Federico)
-
-  - New ultra-cool date range selector, aka little calendar.  (Damon)
-
-  - Plenty of internal refactoring.  (JP, Damon, Federico)
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-Addressbook:
-
-  - New advanced search dialog.  (Michael Zucchi, Chris Lahey)
-
-  - Added parsing of addresses.  (Jesse Pavel)
-
-  - Converted most of addressbook to UTF8.  (Lauris)
-
-Mailer:
-
-  - Filters (but not vfolders) are now more powerful: they can check
-    any message header, and can do regexp searches on the headers and
-    body.  (Jeff)
-
-  - A first draft of an automated mailing list recognizer
-    has been added.  (It will need more/better rules.)  (Ettore)
-
-  - Attachments are handled differently now.  All attachments always
-    have an icon and a header, and you can right-click on the icon to
-    view/hide, save, or launch an external viewer.  (Dan)
-
-  - It is no longer necessary to quit and restart after adding a new
-    IMAP server.  (Peter)
-
-  - Lots of i18n/charset fixing.  (Lauris)
-
-  - Shiny new toolbar icons.  (Tuomas)
-
-  - Giant menu reorganization. Most message operations are now in the
-    "Message" menu, and folder operations in the "Folder" menu.
-    (Ettore, Dan, Peter)
-
-  - "Mark as seen" timeout is now configurable. Mail view remembers
-    the location of the message list/message display split.  (Richard
-    Hult)
-
-  - New filter category: "On-demand", for filters to be applied
-    at arbitrary times rather than during mail incorporation.  (Peter)
-
-  - POP/IMAP config pages allow you to specify a port... this may
-    go away in a later release when we support ssl/ssh tunneling
-    directly.  (Peter)
-
-  - Reply To All will now remove your own addresses from the recipient
-    lists.  (Jesse Pavel)
-
-  - Folders are synced when you switch to another folder now.  (Dan)
-
-  - An IMAP bug that caused all messages to be marked as read before
-    they were read has been fixed.  (Dan)
-
-  - The IMAP provider is now more robust about dealing with other
-    concurrent IMAP clients.  (Jeff)
-
-  - POP and IMAP are better about when they do and don't try to
-    reconnect.  This was part of Camel operation cancellation support,
-    which unfortunately didn't make it into 0.5.  (Peter)
-
-  - Sent and Outbox folders are now functional.  You now have 2
-    options when sending a message - "Send Now" which will send the
-    message imediately and "Send Later" which will queue the message in
-    Outbox for later sending.  When a message is successfully sent, it
-    is copied to the Sent folder for your records.  (Jeff)
-
-ETable:
-
-  - ETree fixes.  (Chris Toshok)
-
-  - Lots of small usability fixes.  (Chris Lahey)
-
-  - Lots of grouping bug fixes.  Specifically, fixed crashes when
-    grouping in trees and made ETable not go crazy when you change
-    data and the table is grouped.  (Chris Lahey)
-
-  - Improved table printing when grouped.  (Chris Lahey)
-
-  - Converted most of ETable to UTF8.  (Lauris)
-
-
-Version 0.4, "Alewife", 2000-08-14
-----------------------------------
-
-Shell:
-
-  - Added interfaces to display messages and a progress bar when the
-    component is busy.  (Ettore)
-
-  - Changed the shell BonoboUIHandler code to allow placing menu items
-    such as "Print" in the right places.  (Ettore)
-
-  - Added code to check if an existing `~/evolution' directory
-    actually has the content we expect and, if not, complain to the
-    user.  (Dan)
-
-  - Fixed some Bonobo-related refcounting problems.  (Michael Meeks)
-
-  - Removed the GConf dependency.  (JP)
-
-  - Improved the API for the folder selection dialog.  (Ettore)
-
-  - Memory leak fixes.  (Peter)
-
-Calendar:
-
-  The calendar is in the middle of major rewrite. Evolution 0.4
-  ships with essentially the same calendar component as 0.3 did.
-
-Addressbook:
-
-  - More work on the Palm Pilot conduits.  (Chris Toshok)
-
-  - Fixed some LDAP-related crashes.  (Chris Toshok)
-
-  - Added support for displaying embedded vCards through a Bonobo
-    component.  (Chris Lahey)
-
-  - Added support for generic fields.  (Chris Lahey)
-
-  - Fixed the navigation order for the Tab key in the contact editor
-    window.  (Chris Lahey)
-
-  - Fixed some Bonobo-related bugs and crashes.  (Chris Lahey, Michael
-    Meeks)
-
-  - Only display entries that have an email address in the address
-    selector dialog.  (Chris Lahey)
-
-  - Added an utility program to import vCards from Gnomecard.  (Chris
-    Lahey)
-
-Mailer:
-
- Generic
-
-  - Long mailer operations (such as fetching new mail) now run
-    asynchronously rather than blocking the UI. This involved
-    a major rewrite of much of the Camel and mailer code.  (Peter)
-
-  - GPG/PGP message decryption support (Nathan Thompson-Amato, Dan)
-
-  - Unfinished messages in the composer can be saved to the "Drafts"
-    folder and finished later.  (Jeff)
-
-  - Double-clicking on a message in the message view now opens it in a
-    separate window.  (Jeff)
-
-  - vCards attached to messages now bring up a minicard view with a
-    button to add the vCard to the addressbook (Chris Lahey, Dan)
-
-  - Inline uuencoded/binhexed "attachment" support (Dan)
-
-  - "Mark All Messages Seen" command.  (Cody Russell)
-
- Filters / VFolders
-
-  - Major filter/vfolder dialog rewrite (Michael Zucchi) VFolders can
-    now search any (searchable) folder, not just Inbox.
-
-  - Auto-filter/auto-vfolder code (right click on a message in the
-    list and pick one of the options at the bottom of the menu to
-    create a filter/vfolder rule for similar messages).  (Michael)
-
-  - You can now set the color of messages in the message list, based
-    on filter rules.  (Local stores can also now store arbitrary user
-    flags, although there is not yet UI code to set/view them.)
-    (Michael)
-
-  - Added "Save" button to the quicksearch bar to save a search as a
-    vfolder.  (Michael)
-
- Configuration
-
-  - Major mail config dialog rewrite (JP).
-
-  - The mailer now remembers your threaded/unthreaded message view
-    setting between sessions.  (Jeremy Wise).
-
-  - Support for multiple identities (JP, Jeff), sources (JP, Peter), and
-    IMAP servers (JP, Dan)
-
- Providers
-
-  - You can now leave POP mail on the server. (This will [currently]
-    only work right with POP servers that support the UIDL command.
-    On other servers, it will never download some messages unless you
-    never delete mail.)
-
-  - There is now an MH-like local store available, and code to convert
-    a folder from one type to the other.  (Michael)
-
-  - The mbox provider now writes out "From " lines that are more
-    compatible with other mailers (like Mutt) that are picky about
-    their exact format.  (Michael)
-
-  - The IMAP provider now supports searching (Jeff). Also various
-    other speed/efficiency/robustness improvements (Jeff), and support
-    for old IMAP4 servers as well as IMAP4rev1 (Jon K Hellan).
-
-
-Version 0.3, "Jellyfish", 2000-07-21
-------------------------------------
-
-Shell:
-
-  - Pop-up folder selection.  (Ettore)
-
-  - Added support for multiple views.  (Ettore)
-
-  - Added support for saving component-specific settings, and
-    some initial code to save the view's configuration.
-    (Ettore)
-
-  - Fixed the Bonobo menu code so that it works with all the
-    locales.  (Ettore)
-
-Mailer:
-
-   - Lots of IMAP fixes.  (Jeff) 
-
-   - You can use an external setuid/setgid movemail program
-    (although we don't ship our own yet). If you have one
-    installed with emacs, the configure script will find
-    that. Otherwise, you can specify --with-movemail=/path.
-    (Dan)
-
-  - You can toggle HTML/plain text for an individual message
-    in the composer now.  (Ettore)
-
-  - Bonobo embedding sort of works again, but there are
-    problems with size allocation somewhere. Attachments can now
-    also be handled by external applications.  (Dan)
-
-  - text/plain mail is now line-wrapped in the mail display,
-    to deal with people who don't put newlines in their mail.
-    (Dan)
-
-  - Allow user to specify IMAP namespace in the mail config
-    dialog.  (Dan, Jeff)
-
-  - Quoted-printable encoder fixes.  (Michael Zucchi)
-
-  - Various NNTP fixes, include a news pane in the config
-    dialog.  (Chris Toshok)
-
-  - Some memory corruption fixes.  (Peter Williams)
-
-  - Fix for message not being re-drawn as deleted.  (Peter
-    Williams, Jeff)
-
-  - Moving a message to another folder copies the flags now
-    (Jeff)
-
-  - Close signature in HTML mail with </PRE>, not <PRE>, and
-    default to ~/.signature.  (Michael Meeks)
-
-  - Fixed some confusing behavior in the message threading
-    algorithm.  (Dan)
-
-  - Improvements to the item selection code.  (Chris Lahey)
-
-Calendar:
-
-  - Added support for a bunch of previously unsupported iCalendar
-    properties.  (Federico)
-
-  - Conduit for synchronizing the calendar with gnome-pilot
-    (requires gnome-pilot from CVS).  (Seth)
-
-  - ETable-based to-do list view ("taskpad"), for your viewing
-    pleasure.
-
-Addressbook:
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Fixed some random crashes.  (Chris Lahey)
-
-  - Implemented a vCard Bonobo control so that we can support
-    inline vCard viewing in the mailer.  (Chris Lahey)
-
-  - Quick search looks at both the name and the company name now.
-    (Chris Lahey)
-
-  - Added more functionality to the contact editor's toolbar.  (Chris
-    Lahey)
-
-  - Support for printing single cards.  (Chris Lahey)
-
-Version 0.2, "Saccharomyces", 2000-07-11
-----------------------------------------
-
-Shell:
-
-  * Folder selection dialog (Ettore).
-
-  * Folder creation dialog (Ettore).
-
-Addressbook:
-
-  * LDAP server configuration dialog (Chris Toshok).
-  
-  * Integration of LDAP servers in the shell's tree view (Chris Toshok).
-  
-  * ETable-based view (Chris Lahey).
-  
-  * Printing support for the ETable-based view (Chris Lahey).
-  
-  * Address selection dialog integrated with the message composer (Chris
-    Lahey).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-Calendar:
-
-  * Printing support (Michael, Federico).
-  
-  * Many, many behavior fixes and polishing to the day/week/month view
-    widgets (Damon).
-  
-  * New glade-based event editor.  This is unfinished but usable (Seth,
-    Federico).
-  
-  * Mouse wheel scrolling support (Anders).
-  
-  * We have an awesome new engine for computing recurring events
-    (Damon).  This will be plugged in to the new iCalendar code.
-  
-  * Internal and public API fixes (Federico, Seth).
-  
-  * Shell-related changes (Ettore).
-  
-  * Data model for ETable; this is not used yet (Federico).
-  
-  * New iCalendar support; this is not used yet (Federico).
-  
-  * Pilot syncing updates; this is not used yet (Seth).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-
-Mailer:
-
-  Major features:
-
-  * Basic IMAP support (Jeff)
-
-  * Threaded message view (Michael, Chris Toshok)
-
-  * Filters now work (original work by Michael, bugfixes by Dan)
-
-
-  Smaller features:
-
-  * Implemented moving messages between folders (Dan)
-
-  * Very basic printing support (Dan, but it was only like 5 lines
-    of code, because gnome-print kicks ass)
-
-  * "Delete", "Forward", and "Refile" operations now work on
-    multiple messages. (Chris Lahey, Peter Williams, Dan)
-
-  * Toggle read/unread flag when the user clicks on the envelope
-    icon (Chris Lahey, Dan).
-
-  * The "New folder" menu item now works (Ettore, Dan).
-
-  * The filter/vfolder druid now uses the new shell folder selection
-    UI (Michael)
-
-  * Added "Cc" to the set of filter/vfolderable headers and make the
-    filter/vfolder "messages to address" rule work with to or cc.
-    (Dan)
-
-  * New key bindings: "Delete" deletes the current message and jumps
-    to the next undeleted message. "N" and "P" go to next/previous
-    unread message. (Dan)
-
-  * Keep asking for POP/IMAP password until the user gets it correct
-    or hits Cancel, and remember the result until the user exits (or
-    chooses "Forget Passwords"). (Dan, Jeff)
-
-  * Kludge Camel to output ISO-8859-1 instead of UTF-8, since
-    neither GtkHTML nor ETable supports UTF-8 still. (Dan)
-
-  * Use the gnome-vfs "sniff buffer" interface to try to identify
-    the MIME type of attachments without useful type information
-    (Dan)
-
-  * Allow saving drafts in the composer (Ettore)
-
-  * Added "Received date" header to the set of possible message list
-    headers. (Dan)
-
-  * Partial gladification of the config dialog (JP Rosevear)
-
-
-  Bug fixes:
-
-  * Message read/unread/deleted flags should now be saved reliably
-    when you exit, and summary should not be rebuilt when a rebuild
-    isn't needed. Expunging should work reliably (Dan, Ettore,
-    Jeff).
-
-  * Fix disappearing toolbar bug (Dan).
-
-  * Fixed a bug that made downloading of very large messages over
-    POP incredibly slow, and various other smaller POP bugs. (Dan)
-
-  * Fixed bugs that made large attachments sometimes get dropped and
-    small ones sometimes get truncated. (Dan)
-
-  * Fixed filter/vfolder "messages to address" rule to correctly
-    match "to" rather than "from". (Michael)
-
-  * Fix some text/plain formatting bugs in the composer. (Dan,
-    Ettore)
-
-  * Turn off search mode when getting new mail (to avoid corrupting
-    the display). Make "get mail" always put unfiltered mail into
-    Inbox rather than the current folder. (Dan)
-
-  * Fixed a bug that caused "Re:" to be prepended even to subjects
-    that started with "Re:" when replying. Added a default subject
-    to forwarded messages. (Dan)
-
-  * Make the "Attach" dialog in the composer remember the last
-    directory it was in. (Dan)
-
-  * Code to parse invalid date formats since some mailers generate
-    them... (Jeff)
-
-  * Fixed various small SMTP bugs (Jeff, Chris Lahey)
-
-  * Fixed some memory leaks (Peter, Jeff)
-
-  * Make replies use the text/plain part of a multipart/alternative
-    if the user configured plain text rather than HTML mail sending.
-    (Dan)
-
-  * Various config dialog fixes (Jeff)
-
-  * Partial filter/vfolder GUI facelift (Jacob)
diff --git a/README b/README
deleted file mode 100644
index 56b4e1820f..0000000000
--- a/README
+++ /dev/null
@@ -1,252 +0,0 @@
-Evolution is the integrated mail, calendar and address book suite from
-Ximian, Inc.
-
-See http://www.ximian.com/products/evolution for more information.
-
-If you are using Evolution, you may wish to subscribe to the Evolution
-users mailing list.  If you are interested in contributing to
-development on it, you should certainly subscribe to the Evolution
-Hackers mailing list.  Visit
-
-	http://developer.ximian.com/community/lists.html
-
-to subscribe or view archives of the Ximian mailing lists.
-
-If you are planning to work on any part of Evolution, please send mail
-to the mailing list first, to avoid duplicated effort (and to make
-sure that you aren't basing your work on interfaces that are expected
-to change).
-
-There is also a #evolution IRC channel on irc.gnome.org.
-
-Help for Evolution is available in the user manual (select "Help" from
-the menu after running the application), at the Ximian knowledge base
-(http://support.ximian.com), in the Evolution man page (run "man
-evolution" at the command line), and in the --help strings (run
-"evolution --help" at the command line).
-
-The rest of this file is dedicated to building Evolution.
-
-
-DEPENDENCIES
-------------
-
-In order to build Evolution you need to have the full set of GNOME 2
-or GNOME 2.2 development libraries installed.
-
-GNOME 2 comes with most of the modern distributions, so in most cases
-it should be enough to just install all the devel packages from your
-distribution.  If, on the other hand, you want to build GNOME 2 from
-source, please refer to this page:
-
-	http://gnome.org/start/2.2/notes/rninstallation.html
-
-Please make sure you have the most recent versions of the libraries
-installed, since bugs in the libraries can cause bugs in Evolution.
-
-Additional dependencies, besides the stock GNOME libraries (the
-dependencies should be compiled in the order they are listed here):
-
-	* [If compiling against GNOME 2.0] libgnomeprint and
-          libgnomeprintui 2.2.0 or later
-
-	  These library come with GNOME 2.2 installations, but not
-	  with GNOME 2.0 ones.  The source code can be downloaded from
-	  the following locations:
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/libgnomeprint
-	     ftp://ftp.gnome.org/pub/gnome/sources/libgnomeprintui
-
-	* [If compiling against GNOME 2.2] libgnomecanvas 2.2.0.2 or
-          later
-
-	  If you have a GNOME 2.2 installation, you need to upgrade
-	  libgnomecanvas to this version (or a later one), since
-	  Evolution exposes a bug in the older versions of the library
-	  which causes a crash.
-
-	  If you have a GNOME 2.0 installation, libgnomecanvas 2.0 is
-	  safe to use.
-
-	* gtkhtml 3.0.1 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gtkhtml
-
-	* gal 1.99.8 or later
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gal
-
-	* Berkeley's libdb 3.1.17
-
-	  It is important to use *exactly* this version, and not a
-	  later one, to compile Evolution.  Please check the "Building
-	  Berkeley DB" section below for more information.
-
-   	     ftp://ftp.ximian.com/pub/source/evolution
-
-	* [Optional] Mozilla NSPR/NSS libraries
-
-	  These are needed if you want to compile Evolution with SSL
-	  support.
-
-	     http://www.mozilla.org/
-
-          Many distributions ship these as Mozilla development
-          packages.
-
-	* [Optional] gnome-pilot 2.0 or later
-
-	  This is only necessary if you want to be able to synchronize
-	  your Palm device with Evolution.
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot-conduits
-
-	* [Optional] gnome-spell 1.0.1 or later
-
-	  This is only necessary if you want to have the spell
-	  checking functionality in Evolution's message composer.
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell
-
-
-COMPILING BERKELEY DB
----------------------
-
-    --- IMPORTANT WARNING ---
-
-    The on-disk format of DB files has been changing between versions 2, 3
-    and 4.  Also, because of the libdb API, there is no way to easily
-    handle the different formats from within the application.  For this
-    reason, Evolution has chosen to use one specific version of the
-    library (version 3) and stick to it, so that users do not need to
-    convert their addressbook files to use them with different version of
-    Evolution.
-
-    That's why Evolution REQUIRES libdb 3.1.17, and NO OTHER VERSION.
-
-    If you force the check to accept a version different from 3.1.17, your
-    binary of Evolution will be using a different format from the chosen
-    one; this means that it will not be able to read addressbook databases
-    created by other versions of Evolution which were compiled in the
-    standard way.  Also, we DO NOT GUARRANTEE that Evolution will work
-    with different versions of libdb at all, even if it can be trivially
-    made to compile against them.
-
-    SPECIAL NOTE FOR BINARY PACKAGERS:
-
-    If you are making binary packages for end-users (e.g. if you are a
-    distribution vendor), please statically link Evolution to Berkeley
-    DB 3.1.17, as mandated by the configure.in check.  DO NOT patch
-    configure.in to work around the check.  Forcing the check to link
-    to a different version of the library will only give headaches and
-    pain to your users, who will see their addressbook disappear and
-    will complain to us (the Evolution team) about losing their data.
-
-    Besides, libdb will be linked statically, which means that your
-    distribution doesn't actually need to ship DB 3.1.17 itself
-    separately.
-
-    The Evolution team will be infinitely grateful for your
-    co-operation.  Thanks!
-
-If you don't have version 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.
-
-  * Install the content of the tarball somewhere *other* than the
-    evolution source tree, e.g: NOT evolution/db-3.1.17 .
-
-  * Compile according to instructions, but installing into some custom
-    prefix, for example:
-
-      ../dist/configure --prefix=/home/user/berkeleydb-3.1.17
-
-  * Configure Evolution specifying that it has to look for the DB
-    library there, for example:
-
-      ./configure --prefix=/opt/gnome
-      --with-db3-includes=/home/user/berkeleydb-3.1.17/include
-      --with-db3-libs=/home/user/berkeleydb-3.1.17/lib
-
-Evolution links statically to the library, so after you have compiled
-Evolution you can remove the installed library from your system.
-
-
-CONFIGURING EVOLUTION
----------------------
-
-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.  Also, it increases the chance
-that something goes wrong and your GNOME installation gets ruined.
-
-If you want to install in a different prefix, you need to do the
-following things:
-
-	* Set the PKG_CONFIG_PATH environment variable to contain a
-          colon-separated list of all the pkg-config directories that
-          will be involved in the build.  This basically means a list
-          of $prefix/lib/pkgconfig directory names, where $prefix is
-          the prefix where a library is installed.
-
-	  For example, if you have GNOME installed in /usr and you
-          are installing Evolution and its dependencies in
-          /opt/evolution, you want to do something like the following
-          (assuming you are using Bash):
-
-	      export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/evolution/lib/pkgconfig
-
-	* Edit the bonobo-activation-config.xml file (which is
-          normally found in /etc/bonobo-activation/) to include the
-          location where you are installing Evolution.
-
-	  In the example given above (GNOME in /usr, Evolution and
-          dependencies in /opt/evolution), your
-          bonobo-activation-config.xml will have to look like this:
-
-	      <?xml version="1.0"?>
-	      <oafconfig>
-	        <searchpath>
-	          <item>/usr/lib/bonobo/servers</item>
-	          <item>/opt/evolution/lib/bonobo/servers</item>
-	        </searchpath>
-	      </oafconfig>
-
-	* Pass an appropriate --prefix parameter to the configure
-          scripts of Evolution and its dependencies, eg:
-
-	      ./configure --prefix=/opt/evolution
-
-More information on how to use the configure script is available in
-the INSTALL file which is part of the Evolution tarball.
-
-
-OPTIONAL FEATURES
------------------
-
-Some optional features can be enabled at compilation time by passing
-appropriate flags to the configure script:
-
-	* GNOME Pilot support.
-
-	  Assuming you have installed gnome-pilot, add the following
-	  options:
-
-	    --with-pisock=<prefix> --enable-pilot-conduits=yes
-
-	  Where <prefix> is the location where pilot-link (a package
-	  that gnome-pilot depends on) was installed.
-
-	* SSL support.
-
-	  Make sure you have Mozilla's NSS nad NSPR libraries
-	  installed and pass the following flag:
-
-	    --enable-nss
-
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
deleted file mode 100644
index 45172e08e3..0000000000
--- a/RELEASE-NOTES
+++ /dev/null
@@ -1,88 +0,0 @@
-WARNING
-
-Evolution 1.1.2 is a BETA quality release.  This means that it has
-bugs, including possibly destructive bugs that can cause valuable data
-to be lost.
-
-For this reason, please make sure you back up your mail and your
-calendar/addressbook information before using Evolution 1.1.2 on them.
-In particular, you are strongly advised to backup the `evolution'
-directory in your home directory if you are upgrading from a 1.0.x
-version of Evolution to Evolution 1.1.2.
-
-
-UPGRADING FROM 1.0.x
-
-The format of certain configuration files has changed in this version
-of Evolution.  When you start Evolution 1.1.2 for the first time, it
-will automatically migrate your configuration so that it will work as
-expected with this version.
-
-IMPORTANT: After you have succesfully installed Evolution 1.1.2,
-please make sure that Evolution 1.0.x isn't running anymore and type
-command `killev' on the command-line (without quotes) before launching
-the new version of Evolution.
-
-
-RETURNING TO 1.0.x
-
-If you want to return to a 1.0.x version after trying 1.1.2, you have
-to restore the original configuration files.  From the command-line,
-you can do the following, after having quit Evolution:
-
-	killev
-	cd ~/evolution
-	mv filters.xml.bak-1.0 filters.xml
-	mv vfolders.xml.bak-1.0 vfolders.xml
-	mv shortcuts.xml.bak-1.0 shortcuts.xml
-	mv mail/imap.bak-1.0 mail/imap
-
-Note that any changes to filters, vfolders or shortcuts made with
-1.1.2 will be lost after this operation.
-
-Also note that the upgrade mechanism runs automatically only the first
-time you run 1.1.2.  For this reason, if you run Evolution 1.1.2, then
-go back to 1.0 using the aforementioned procedure, and then go back to
-using 1.1.2 again, the settings will not be upgraded.
-
-To force the upgrade to happen again in this case, use the following
-command to start Evolution 1.1.2:
-
-	evolution --force-upgrade
-
-IMPORTANT: After you have succesfully installed Evolution 1.0.x,
-please make sure that Evolution 1.1.2 isn't running anymore and type
-command `killev' on the command-line (without quotes) before launching
-the older version of Evolution.
-
-
-SEARCH CRITERIA CHANGES
-
-When you specify multiple words in search "contains" criterion,
-Evolution will now search the mail messages that contain all the words
-specified, in any order.  (The 1.0.x behavior was to look for the
-whole string in "subject contains" matches, and matched no messages in
-the case of body searches.)
-
-This applies to the search bar, the filter rules and the vfolder
-rules.  Filter rules and vfolder rules might need to be re-adjusted
-after you upgrade to version 1.1.2.
-
-
-IMAP FOLDER NAME CHANGES (I18N)
-
-If you created any folder names using non-ASCII characters using prior
-versions of Evolution, you will find they may not be displayed
-properly anymore.  This is because previous versions did not implement
-IMAP I18N folder names correctly as specified in RFC 2060.
-
-The upgrade script will try to rectify any filters or vfolders using
-any such names.  However, as it does not know the character set used
-by the server, non ISO-8859-1 (latin-1) characters will not be
-properly converted.  You may need to reverify the filter and vFolder
-rules in this case.
-
-Also note that if such folder names do not display properly that it is
-purely cosmetic and may be fixed by renaming the folder(s) in
-question.
-
diff --git a/a11y/.cvsignore b/a11y/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
deleted file mode 100644
index 6752384193..0000000000
--- a/a11y/ChangeLog
+++ /dev/null
@@ -1,103 +0,0 @@
-2003-12-05  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        * calendar/ea-cal-view-event.c (ea_cal_view_event_new): shortcut when cal_view is NULL.
-        * calendar/ea-cal-view.c: Change an action name.
-        * calendar/ea-calendar.c (ea_calendar_focus_watcher): add check for event atk object.
-        * calendar/ea-week-view.c (ea_week_view_get_n_children): correct impl.
-          (get_visible_text_item_count): removed.
-                                                                                
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/Makefile.am (SHELL_IDLS): Only get Evolution.idl.
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50538
-                                                                                
-        * new files:
-                widgets/ea-calendar-cell.[hc]
-                                                                                
-        * widgets/ea-calendar-item: impl. atk selection and atk table interface.        
-
-	* widgets/Makefile.am : use shared object library (.so)
-                                                                                
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): don't include toplevel libical
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Handle some more renaming
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Reflect renaming of ECalView to ECalendarView
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes # 48509
-
-	* new files:
-		ea-cell-table.h ea-cell-table.c
-	* calendar/Makefile.am: add entries for new files
-	* calendar/New files added:
-		ea-day-view-main-item.c ea-day-view-main-item.h
-		ea-day-view-cell.c ea-day-view-cell.h
-	* Add debug info and remove some non-C99 compilers warnings.
-	* calendar/ea-cal-view: add action interface. 
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* calendar/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* Makefile.am: add widgets directory; move calendar idl stuff to
-	calendar directory; stop make a single shared lib for whole a11y
-	stuff.
-
-	* ea-factory.h: make factory macros available to GOBJECT
-
-	* calendar/Makefile.am: add calendar idl stuff
-
-	* calendar/ea-cal-view-event.c: add atkcomponent interface.
-
-	* calendar/ea-gnome-calendar.c (ea_gcal_switch_view_cb): add
-	details for "children_changed".
-
-	* new widgets directory for widgets a11y stuff, new files are:
-		widgets/Makefile.am, widgets/ea-calendar-item.c,
-		widgets/ea-calendar-item.h, widgets/ea-widgets.c,
-		widgets/ea-widgets.h
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_name):
-	adapted to changes in ECalViewEvent.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-	setup the a11y directory for evolution accessibility work
-	New files are:
-		ChangeLog
-		ea-factory.h
-		Makefile.am
-		calendar/ea-calendar.c
-		calendar/ea-calendar.h
-		calendar/ea-calendar-helpers.c
-		calendar/ea-calendar-helpers.h
-		calendar/ea-cal-view.c
-		calendar/ea-cal-view.h
-		calendar/ea-cal-view-event.c
-		calendar/ea-cal-view-event.h
-		calendar/ea-day-view.c
-		calendar/ea-day-view.h
-		calendar/ea-week-view.c
-		calendar/ea-week-view.h
-		calendar/ea-gnome-calendar.c
-		calendar/ea-gnome-calendar.h
-		calendar/Makefile.am
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
deleted file mode 100644
index c3e7a89fed..0000000000
--- a/a11y/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS = . calendar widgets
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-a11y.la
-
-INCLUDES =                                              \
-        -I$(top_srcdir)/a11y                            \
-        $(A11Y_CFLAGS)
-
-libevolution_a11y_la_SOURCES = 		        \
-        ea-factory.h                            \
-        ea-cell-table.h                         \
-        ea-cell-table.c
-
diff --git a/a11y/calendar/.cvsignore b/a11y/calendar/.cvsignore
deleted file mode 100644
index 0e1e389af7..0000000000
--- a/a11y/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-Evolution-*.c
-Evolution.h
-evolution-calendar-*.c
-evolution-calendar.h
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
deleted file mode 100644
index 0c4aba11a0..0000000000
--- a/a11y/calendar/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# Calendar IDL files
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-CALENDAR_IDLS = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-SHELL_IDLS = \
-        $(top_srcdir)/shell/Evolution.idl
-                                                                                                                       
-CALENDAR_IDL_GENERATED_H = evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =                              \
-        evolution-calendar-common.c                     \
-        evolution-calendar-skels.c                      \
-        evolution-calendar-stubs.c
-
-SHELL_IDL_GENERATED_H = Evolution.h
-SHELL_IDL_GENERATED_C =			\
-	Evolution-common.c  		\
-	Evolution-skels.c 		\
-	Evolution-stubs.c
-                                                                                                                       
-$(CALENDAR_IDL_GENERATED_H): $(CALENDAR_IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-                                                                                                                       
-$(SHELL_IDL_GENERATED_H): $(SHELL_IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)  \
-        $(top_srcdir)/shell/Evolution.idl
-
-IDL_GENERATED = $(SHELL_IDL_GENERATED_H) $(CALENDAR_IDL_GENERATED_H)
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES) $(CALENDAR_IDL_GENERATED_C) $(SHELL_IDL_GENERATED_C)
-                                                                                                                       
-privlib_LTLIBRARIES = libevolution-calendar-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar/cal-client		\
-	-I$(top_srcdir)/calendar/gui			\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_calendar_a11y_la_SOURCES =		\
-	$(CALENDAR_IDL_GENERATED_H)		\
-	$(SHELL_IDL_GENERATED_H)		\
-	ea-calendar.c				\
-	ea-calendar.h				\
-	ea-calendar-helpers.c			\
-	ea-calendar-helpers.h			\
-	ea-cal-view.c				\
-	ea-cal-view.h				\
-	ea-cal-view-event.c			\
-	ea-cal-view-event.h			\
-	ea-day-view.c				\
-	ea-day-view.h				\
-	ea-day-view-main-item.c			\
-	ea-day-view-main-item.h			\
-	ea-day-view-cell.c			\
-	ea-day-view-cell.h			\
-	ea-week-view.c				\
-	ea-week-view.h				\
-	ea-gnome-calendar.c			\
-	ea-gnome-calendar.h
-
-libevolution_calendar_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
deleted file mode 100644
index 37b0d5ed90..0000000000
--- a/a11y/calendar/ea-cal-view-event.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "ea-day-view.h"
-#include "ea-week-view.h"
-#include <gal/e-text/e-text.h>
-
-static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
-
-static G_CONST_RETURN gchar* ea_cal_view_event_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_cal_view_event_get_description (AtkObject *accessible);
-static AtkObject* ea_cal_view_event_get_parent (AtkObject *accessible);
-static gint ea_cal_view_event_get_index_in_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void ea_cal_view_get_extents (AtkComponent *component,
-				     gint *x, gint *y, gint *width, gint *height,
-				     AtkCoordType coord_type);
-
-#ifdef ACC_DEBUG
-static gint n_ea_cal_view_event_created = 0, n_ea_cal_view_event_destroyed = 0;
-static void ea_cal_view_finalize (GObject *object);
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_event_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewEventClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_event_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalViewEvent), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (atk object for E_TEXT, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    E_TYPE_TEXT);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		/* we inherit the component, text and other interfaces from E_TEXT */
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalViewEvent", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_event_class_init (EaCalViewEventClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_cal_view_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-
-	class->get_name = ea_cal_view_event_get_name;
-	class->get_description = ea_cal_view_event_get_description;
-	class->get_parent = ea_cal_view_event_get_parent;
-	class->get_index_in_parent = ea_cal_view_event_get_index_in_parent;
-
-}
-
-#ifdef ACC_DEBUG
-static void ea_cal_view_finalize (GObject *object)
-{
-	++n_ea_cal_view_event_destroyed;
-	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
-		n_ea_cal_view_event_destroyed);
-}
-#endif
-
-AtkObject* 
-ea_cal_view_event_new (GObject *obj)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *target_obj;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
-	cal_view = ea_calendar_helpers_get_cal_view_from (GNOME_CANVAS_ITEM (obj));
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekViewEventSpan *event_span;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-		/* for week view, we need to check if a atkobject exists for
-		 * the first span of the same event
-		 */
-		if (!e_week_view_find_event_from_item (week_view,
-						       GNOME_CANVAS_ITEM (obj),
-						       &event_num,
-						       &span_num))
-			return NULL;
-		week_view_event = &g_array_index (week_view->events,
-						  EWeekViewEvent,
-						  event_num);
-		/* get the first span */
-		event_span = &g_array_index (week_view->spans,
-					     EWeekViewEventSpan,
-					     week_view_event->spans_index);
-		target_obj = G_OBJECT (event_span->text_item);
-		atk_obj = g_object_get_data (target_obj, "accessible-object");
-
-	}
-	else
-		target_obj = obj;
-
-	if (!atk_obj) {
-		static AtkRole event_role = ATK_ROLE_INVALID;
-		atk_obj = ATK_OBJECT (g_object_new (EA_TYPE_CAL_VIEW_EVENT,
-						    NULL));
-		atk_object_initialize (atk_obj, target_obj);
-		if (event_role == ATK_ROLE_INVALID)
-			event_role = atk_role_register ("Calendar Event");
-		atk_obj->role = event_role;
-#ifdef ACC_DEBUG
-		++n_ea_cal_view_event_created;
-		printf ("ACC_DEBUG: n_ea_cal_view_event_created = %d\n",
-			n_ea_cal_view_event_created);
-#endif
-	}
-
-	/* the registered factory for E_TEXT is cannot create a EaCalViewEvent,
-	 * we should save the EaCalViewEvent object in it.
-	 */
-	g_object_set_data (obj, "accessible-object", atk_obj);
-
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarViewEvent *event;
-	gchar *tmp_name;
-	gchar *new_name = g_strdup ("");
-        const char *summary;
-
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj || !E_IS_TEXT (g_obj))
-		return NULL;
-	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
-
-	if (event && event->comp_data) {
-		if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "alarm ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "recurrence ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (event->different_timezone) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "time-zone ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "meeting ", NULL);
-			g_free (tmp_name);
-		}
-	}
-	tmp_name = new_name;
-	new_name = g_strconcat (new_name, "event. Summary is ", NULL);
-	g_free (tmp_name);
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	if (summary) {
-		tmp_name = new_name;
-		new_name = g_strconcat (new_name, summary, NULL);
-		g_free (tmp_name);
-	}
-	else {
-		tmp_name = new_name;
-		new_name = g_strconcat (new_name, "empty", NULL);
-		g_free (tmp_name);
-	}
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-#ifdef ACC_DEBUG
-	printf("EvoAcc:  name for event accobj=%p, is %s\n",
-	       (void *)accessible, new_name);
-#endif
-	g_free (new_name);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return "calendar view event";
-}
-
-static AtkObject *
-ea_cal_view_event_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (g_obj == NULL)
-		/* Object is defunct */
-		return NULL;
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	return gtk_widget_get_accessible (GTK_WIDGET (cal_view));
-}
-
-static gint
-ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), -1);
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return -1;
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return -1;
-
-	cal_view_event = ea_calendar_helpers_get_cal_view_event_from (canvas_item);
-	if (!cal_view_event)
-		return -1;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num, num_before;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-
-		/* the long event comes first in the order */
-		for (event_num = day_view->long_events->len - 1; event_num >= 0;
-		     --event_num) {
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-			if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-				return event_num;
-
-		}
-		num_before = day_view->long_events->len;
-
-		for (day = 0; day < day_view->days_shown; ++day) {
-			for (event_num = day_view->events[day]->len - 1; event_num >= 0;
-			     --event_num) {
-				day_view_event = &g_array_index (day_view->events[day],
-							EDayViewEvent, event_num);
-				if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-					return num_before + event_num;
-			}
-			num_before += day_view->events[day]->len;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint index;
-		EWeekViewEvent *week_view_event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-		for (index = week_view->events->len - 1; index >= 0; --index) {
-			week_view_event = &g_array_index (week_view->events,
-							  EWeekViewEvent, index);
-			if (cal_view_event == (ECalendarViewEvent*)week_view_event)
-				return index;
-		}
-	}
-	else {
-		g_assert_not_reached ();
-		return -1;
-	}
-	return -1;
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-
-  iface->get_extents = ea_cal_view_get_extents;
-}
-
-static void 
-ea_cal_view_get_extents (AtkComponent   *component,
-                         gint           *x,
-                         gint           *y,
-                         gint           *width,
-                         gint           *height,
-                         AtkCoordType   coord_type)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	gint x_window, y_window;
-	gint scroll_x, scroll_y;
-	ECalendarView *cal_view;
-	gint item_x, item_y, item_w, item_h;
-	GtkWidget *canvas = NULL;
-
-	g_return_if_fail (EA_IS_CAL_VIEW_EVENT (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	g_return_if_fail (E_IS_TEXT (g_obj));
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num;
-
-		if (!e_day_view_find_event_from_item (E_DAY_VIEW (cal_view),
-						      canvas_item,
-						      &day, &event_num))
-			return;
-		if (day == E_DAY_VIEW_LONG_EVENT) {
-			gint start_day, end_day;
-			if (!e_day_view_get_long_event_position (E_DAY_VIEW (cal_view),
-								 event_num,
-								 &start_day,
-								 &end_day,
-								 &item_x,
-								 &item_y,
-								 &item_w,
-								 &item_h))
-				return;
-			canvas = E_DAY_VIEW (cal_view)->top_canvas;
-		}
-		else {
-			if (!e_day_view_get_event_position (E_DAY_VIEW (cal_view), day,
-							    event_num,
-							    &item_x, &item_y,
-							    &item_w, &item_h))
-
-				return;
-			canvas = E_DAY_VIEW (cal_view)->main_canvas;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		if (!e_week_view_find_event_from_item (E_WEEK_VIEW (cal_view),
-						       canvas_item, &event_num,
-						       &span_num))
-			return;
-
-		if (!e_week_view_get_span_position (E_WEEK_VIEW (cal_view),
-						    event_num, span_num,
-						    &item_x, &item_y, &item_w))
-			return;
-		item_h = E_WEEK_VIEW_ICON_HEIGHT;
-		canvas = E_WEEK_VIEW (cal_view)->main_canvas;
-	}
-	else
-		return;
-
-	if (!canvas)
-		return;
-
-	gdk_window_get_origin (canvas->window,
-			       &x_window, &y_window);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (canvas), &scroll_x, &scroll_y);
-
-	*x = item_x + x_window - scroll_x;
-	*y = item_y + y_window - scroll_y;
-	*width = item_w;
-	*height = item_h;
-
-	if (coord_type == ATK_XY_WINDOW) {
-		GdkWindow *window;
-		gint x_toplevel, y_toplevel;
-
-		window = gdk_window_get_toplevel (GTK_WIDGET (cal_view)->window);
-		gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
-
-		*x -= x_toplevel;
-		*y -= y_toplevel;
-	}
-
-#ifdef ACC_DEBUG
-	printf ("Event Bounds (%d, %d, %d, %d)\n", *x, *y, *width, *height);
-#endif
-}
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
deleted file mode 100644
index f139dde9fb..0000000000
--- a/a11y/calendar/ea-cal-view-event.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_EVENT_H__
-#define __EA_CAL_VIEW_EVENT_H__
-
-#include <atk/atkgobjectaccessible.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW_EVENT                   (ea_cal_view_event_get_type ())
-#define EA_CAL_VIEW_EVENT(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEvent))
-#define EA_CAL_VIEW_EVENT_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-#define EA_IS_CAL_VIEW_EVENT(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_IS_CAL_VIEW_EVENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_CAL_VIEW_EVENT_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-
-typedef struct _EaCalViewEvent                   EaCalViewEvent;
-typedef struct _EaCalViewEventClass              EaCalViewEventClass;
-
-struct _EaCalViewEvent
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_cal_view_event_get_type (void);
-
-struct _EaCalViewEventClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_cal_view_event_new (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CAL_VIEW_EVENT_H__ */
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
deleted file mode 100644
index 2d86d9ef10..0000000000
--- a/a11y/calendar/ea-cal-view.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view.h"
-#include "ea-calendar-helpers.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "calendar-commands.h"
-#include "goto.h"
-#include <glib/gstrfuncs.h>
-
-static void ea_cal_view_class_init (EaCalViewClass *klass);
-
-static AtkObject* ea_cal_view_get_parent (AtkObject *accessible);
-static void ea_cal_view_real_initialize (AtkObject *accessible, gpointer data);
-
-static void ea_cal_view_event_changed_cb (ECalendarView *cal_view,
-                                          ECalendarViewEvent *event, gpointer data);
-static void ea_cal_view_event_added_cb (ECalendarView *cal_view,
-                                        ECalendarViewEvent *event, gpointer data);
-
-static gboolean idle_dates_changed (gpointer data);
-static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean action_interface_do_action (AtkAction *action, gint i);
-static gint action_interface_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalView", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_class_init (EaCalViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_parent = ea_cal_view_get_parent;
-	class->initialize = ea_cal_view_real_initialize;
-}
-
-AtkObject* 
-ea_cal_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_CAL_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	return accessible;
-}
-
-static void
-ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gcal;
-	static AtkRole role = ATK_ROLE_INVALID;
-
-	g_return_if_fail (EA_IS_CAL_VIEW (accessible));
-	g_return_if_fail (E_IS_CALENDAR_VIEW (data));
-
-        ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
-	if (role == ATK_ROLE_INVALID)
-		role = atk_role_register ("Calendar View");
-	accessible->role = role;
-	cal_view = E_CALENDAR_VIEW (data);
-
-	/* add listener for event_changed, event_added
-	 * we don't need to listen on event_removed. When the e_text
-	 * of the event is removed, the cal_view_event will go to the state
-	 * of "defunct" (changed by weak ref callback of atkgobjectaccessible
-	 */
-	g_signal_connect (G_OBJECT(cal_view), "event_changed",
-			  G_CALLBACK (ea_cal_view_event_changed_cb), NULL);
-	g_signal_connect (G_OBJECT(cal_view), "event_added",
-			  G_CALLBACK (ea_cal_view_event_added_cb), NULL);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (cal_view);
-
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_cal_view_dates_change_cb),
-				  accessible);
-}
-
-static AtkObject* 
-ea_cal_view_get_parent (AtkObject *accessible)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gnomeCalendar;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	cal_view = E_CALENDAR_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gnomeCalendar = e_calendar_view_get_calendar (cal_view);
-
-	return gtk_widget_get_accessible (GTK_WIDGET(gnomeCalendar));
-}
-
-static void
-ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                              gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-	}
-	if (event_atk_obj) {
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p changed\n", (void *)event);
-#endif
-		g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
-		g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
-	}
-
-}
-
-static void
-ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                            gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-	gint index;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-
-	}
-	if (event_atk_obj) {
-		index = atk_object_get_index_in_parent (event_atk_obj);
-		if (index < 0)
-			return;
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p added\n", (void *)event);
-#endif
-		g_signal_emit_by_name (atk_obj, "children_changed::add",
-				       index, event_atk_obj, NULL);
-	}
-}
-
-static gboolean
-idle_dates_changed (gpointer data)
-{
-	AtkObject *ea_cal_view;
-
-	g_return_val_if_fail (data, FALSE);
-	g_return_val_if_fail (EA_IS_CAL_VIEW (data), FALSE);
-
-	ea_cal_view = ATK_OBJECT(data);
-
-	if (ea_cal_view->name) {
-		g_free (ea_cal_view->name);
-		ea_cal_view->name = NULL;
-	}
-	g_object_notify (G_OBJECT (ea_cal_view), "accessible-name");
-	g_signal_emit_by_name (ea_cal_view, "visible_data_changed");
-	g_signal_emit_by_name (ea_cal_view, "children_changed", NULL);
-#ifdef ACC_DEBUG
-	printf ("AccDebug: cal view date changed\n");
-#endif
-
-	return FALSE;
-}
-
-static void
-ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	g_idle_add (idle_dates_changed, data);
-}
-
-/* atk action interface */
-
-#define CAL_VIEW_ACTION_NUM 5
-
-static const char * action_name [CAL_VIEW_ACTION_NUM] = {
-	"New Appointment",
-	"New All Day Event",
-	"New Meeting",
-	"Go to Today",
-	"Go to Date"
-};
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->do_action = action_interface_do_action;
-	iface->get_n_actions = action_interface_get_n_actions;
-	iface->get_description = action_interface_get_description;
-	iface->get_keybinding = action_interface_get_keybinding;
-	iface->get_name = action_interface_action_get_name;
-}
-
-static gboolean
-action_interface_do_action (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	gboolean return_value = TRUE;
-	time_t dtstart, dtend;
-	ECalendarView *cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return FALSE;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	cal_view = E_CALENDAR_VIEW (widget);
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 e_calendar_view_new_appointment (cal_view);
-		 break;
-	 case 1:
-		 /* New All Day Event */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, TRUE, FALSE);
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, FALSE, TRUE);
-		 break;
-	 case 3:
-		 /* Go to today */
-		 break;
-		 calendar_goto_today (e_calendar_view_get_calendar (cal_view));
-	 case 4:
-		 /* Go to date */
-		 goto_dialog (e_calendar_view_get_calendar (cal_view));
-		 break;
-	 default:
-		 return_value = FALSE;
-		 break;
-	 }
-	 return return_value;
-}
-
-static gint
-action_interface_get_n_actions (AtkAction *action)
-{
-	return CAL_VIEW_ACTION_NUM;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint index)
-{
-	return action_interface_action_get_name (action, index);
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	EaCalView *ea_cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return NULL;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	 ea_cal_view = EA_CAL_VIEW (action);
-
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 return "<Alt>fna;<Control>n";
-		 break;
-	 case 1:
-		 /* New Event */
-		 return "<Alt>fnd;<Shift><Control>d";
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 return "<Alt>fne;<Shift><Control>e";
-		 break;
-	 case 3:
-		 /* Go to today */
-		 return "<Alt>vt;<Alt><Control>t";
-		 break;
-	 case 4:
-		 /* Go to date */
-		 return "<Alt>vd;<Alt><Control>g";
-		 break;
-	 default:
-		 break;
-	 }
-	 return NULL;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i)
-{
-	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
-		return action_name [i];
-	return NULL;
-}
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
deleted file mode 100644
index 858aa497d4..0000000000
--- a/a11y/calendar/ea-cal-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_H__
-#define __EA_CAL_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-cal-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW                     (ea_cal_view_get_type ())
-#define EA_CAL_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW, EaCalView))
-#define EA_CAL_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW, EaCalViewClass))
-#define EA_IS_CAL_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW))
-#define EA_IS_CAL_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW))
-#define EA_CAL_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW, EaCalViewClass))
-
-typedef struct _EaCalView                   EaCalView;
-typedef struct _EaCalViewClass              EaCalViewClass;
-
-struct _EaCalView
-{
-	GtkAccessible parent;
-};
-
-GType ea_cal_view_get_type (void);
-
-struct _EaCalViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject* ea_cal_view_new (GtkWidget *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CAL_VIEW_H__ */
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
deleted file mode 100644
index 535265ebeb..0000000000
--- a/a11y/calendar/ea-calendar-helpers.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-calendar-helpers.h"
-#include "ea-cal-view-event.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-
-#include <gal/e-text/e-text.h>
-
-/**
- * ea_calendar_helpers_get_accessible_for
- * @canvas_item: the canvas item (e_text) for a event
- * @returns: the atk object for the canvas_item
- * 
- **/
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *g_obj;
-
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	g_obj = G_OBJECT (canvas_item);
-	/* we cannot use atk_gobject_accessible_for_object here,
-	 * EaDayViewEvent/EaWeekViewEvent cannot be created by the
-	 * registered facotry of E_TEXT
-	 */
-	atk_obj = g_object_get_data (g_obj, "accessible-object");
-	if (!atk_obj)
-		atk_obj = ea_cal_view_event_new (g_obj);
-	return atk_obj;
-}
-
-/**
- * ea_calendar_helpers_get_view_widget_from:
- * @canvas_item: the canvas item (e_text) for a event
- * @returns: the cal view widget if exists
- *
- * Get the cal view widget contains the canvas_item.
- * 
- **/
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
-{
-	GnomeCanvas *canvas;
-	GtkWidget *view_widget = NULL;
-
-	g_return_val_if_fail (canvas_item, NULL);
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	/* canvas_item is the e_text for the event */
-	/* canvas_item->canvas is the ECanvas for day view */
-	/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
-	canvas = canvas_item->canvas;
-	view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
-	if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
-		return NULL;
-	return E_CALENDAR_VIEW (view_widget);
-}
-
-/**
- * ea_calendar_helpers_get_cal_view_event_from
- * @canvas_item: the cavas_item (e_text) for the event
- * @returns: the ECalendarViewEvent
- *
- * Get the ECalendarViewEvent for the canvas_item.
- *
- **/
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
-{
-	ECalendarView *cal_view;
-	gboolean event_found;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint event_day, event_num;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-		event_found = e_day_view_find_event_from_item (day_view, canvas_item,
-							       &event_day, &event_num);
-		if (!event_found)
-			return NULL;
-		if (event_day == E_DAY_VIEW_LONG_EVENT) {
-			/* a long event */
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-		}
-		else {
-			/* a main canvas event */
-			day_view_event = &g_array_index (day_view->events[event_day],
-							 EDayViewEvent, event_num);
-		}
-		cal_view_event = (ECalendarViewEvent *) day_view_event;
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		event_found = e_week_view_find_event_from_item (week_view,
-								canvas_item,
-								&event_num,
-								&span_num);
-		if (!event_found)
-			return NULL;
-
-		week_view_event = &g_array_index (week_view->events, EWeekViewEvent,
-						  event_num);
-
-		cal_view_event = (ECalendarViewEvent *)week_view_event;
-	}
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-	return cal_view_event;
-}
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
deleted file mode 100644
index 50d997d91d..0000000000
--- a/a11y/calendar/ea-calendar-helpers.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
- */
-
-#ifndef _EA_CALENDAR_HELPERS_H__
-#define _EA_CALENDAR_HELPERS_H__
-
-#include "ea-cal-view.h"
-
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item);
-
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item);
-
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item);
-
-#endif /* _EA_CALENDAR_HELPERS_H__ */
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
deleted file mode 100644
index bb528cb919..0000000000
--- a/a11y/calendar/ea-calendar.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <gal/e-text/e-text.h>
-#include "ea-calendar-helpers.h"
-#include "ea-factory.h"
-#include "ea-calendar.h"
-
-#include "calendar/ea-cal-view.h"
-#include "calendar/ea-cal-view-event.h"
-#include "calendar/ea-day-view.h"
-#include "calendar/ea-day-view-main-item.h"
-#include "calendar/ea-week-view.h"
-#include "calendar/ea-gnome-calendar.h"
-
-
-EA_FACTORY (EA_TYPE_CAL_VIEW, ea_cal_view, ea_cal_view_new)
-EA_FACTORY (EA_TYPE_DAY_VIEW, ea_day_view, ea_day_view_new)
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_MAIN_ITEM, ea_day_view_main_item, ea_day_view_main_item_new)
-EA_FACTORY (EA_TYPE_WEEK_VIEW, ea_week_view, ea_week_view_new)
-EA_FACTORY (EA_TYPE_GNOME_CALENDAR, ea_gnome_calendar, ea_gnome_calendar_new)
-
-static gboolean ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-					   guint n_param_values,
-					   const GValue *param_values,
-					   gpointer data);
-
-void
-gnome_calendar_a11y_init (void)
-{
-	EA_SET_FACTORY (gnome_calendar_get_type(), ea_gnome_calendar);
-	/* we only add focus watcher when accessibility is enabled
-	 */
-	if (atk_get_root ()) {
-		g_signal_add_emission_hook (g_signal_lookup ("event", E_TYPE_TEXT),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event-after",
-							     e_day_view_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_day_view_main_item_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-
-	}
-}
-
-void
-e_cal_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_cal_view_get_type(), ea_cal_view);
-}
-
-void
-e_day_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_get_type(), ea_day_view);
-}
-
-void e_day_view_main_item_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_main_item_get_type (), ea_day_view_main_item);
-}
-
-void
-e_week_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_week_view_get_type(), ea_week_view);
-}
-
-gboolean
-ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-                           guint n_param_values,
-                           const GValue *param_values,
-                           gpointer data)
-{
-	GObject *object;
-	GdkEvent *event;
-        AtkObject *ea_event = NULL;
-
-	object = g_value_get_object (param_values + 0);
-	event = g_value_get_boxed (param_values + 1);
-
-	if (E_IS_TEXT (object)) {
-		/* "event" signal on canvas item
-		 */
-		GnomeCanvasItem *canvas_item;
-
-		canvas_item = GNOME_CANVAS_ITEM (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				ea_event =
-					ea_calendar_helpers_get_accessible_for (canvas_item);
-				if (!ea_event)
-					/* not canvas item we want */
-					return TRUE;
-
-			}
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	else if (E_IS_DAY_VIEW (object)) {
-		EDayView *day_view = E_DAY_VIEW (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* give main item chance to emit focus */
-				gnome_canvas_item_grab_focus (day_view->main_canvas_item);
-			}
-		}
-	}
-	else if (E_IS_DAY_VIEW_MAIN_ITEM (object)) {
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* we should emit focus on main item */
-				ea_event = atk_gobject_accessible_for_object (object);
-			}
-			else
-				/* focus out */
-				ea_event = NULL;
-#ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on day main item %p\n", (void *)object);
-#endif
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h
deleted file mode 100644
index 4b1779c0b5..0000000000
--- a/a11y/calendar/ea-calendar.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_CALENDAR_H__
-#define _EA_CALENDAR_H__
-
-void gnome_calendar_a11y_init (void);
-void e_cal_view_a11y_init (void);
-void e_day_view_a11y_init (void);
-void e_day_view_main_item_a11y_init (void);
-void e_week_view_a11y_init (void);
-
-#endif /* _EA_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
deleted file mode 100644
index 52fb860fd6..0000000000
--- a/a11y/calendar/ea-day-view-cell.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-cell.h"
-#include "ea-day-view-main-item.h"
-#include "ea-day-view.h"
-#include "ea-factory.h"
-
-/* EDayViewCell */
-
-static void e_day_view_cell_class_init (EDayViewCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_CELL, ea_day_view_cell, ea_day_view_cell_new)
-
-GType
-e_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "EDayViewCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_day_view_cell_class_init (EDayViewCellClass *class)
-{
-    EA_SET_FACTORY (e_day_view_cell_get_type (), ea_day_view_cell);
-}
-
-EDayViewCell *
-e_day_view_cell_new (EDayView *day_view, gint row, gint column)
-{
-	GObject *object;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	object = g_object_new (E_TYPE_DAY_VIEW_CELL, NULL);
-	cell = E_DAY_VIEW_CELL (object);
-	cell->day_view = day_view;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: e_day_view_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaDayViewCell */
-
-static void ea_day_view_cell_class_init (EaDayViewCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_cell_get_description (AtkObject *accessible);
-static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj);
-static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_cell_created = 0, n_ea_day_view_cell_destroyed = 0;
-static void ea_day_view_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaDayViewCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_cell_class_init (EaDayViewCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_day_view_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_cell_get_name;
-	class->get_description = ea_day_view_cell_get_description;
-	class->ref_state_set = ea_day_view_cell_ref_state_set;
-
-	class->get_parent = ea_day_view_cell_get_parent;
-}
-
-AtkObject* 
-ea_day_view_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_CELL (obj), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE_CELL;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_cell_created;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_created = %d\n",
-		n_ea_day_view_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_day_view_cell_finalize (GObject *object)
-{
-	++n_ea_day_view_cell_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
-		n_ea_day_view_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	if (!accessible->name) {
-		AtkObject *ea_main_item;
-		GnomeCanvasItem *main_item;
-		gchar *new_name = g_strdup ("");
-		const gchar *row_label, *column_label;
-
-		atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-		g_obj = atk_gobject_accessible_get_object (atk_gobj);
-		if (!g_obj)
-			return NULL;
-
-		cell = E_DAY_VIEW_CELL (g_obj);
-		main_item = cell->day_view->main_canvas_item;
-		ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item));
-		column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item),
-								 cell->column);
-		row_label = atk_table_get_row_description (ATK_TABLE (ea_main_item),
-							   cell->row);
-		new_name = g_strconcat (column_label, " ", row_label, NULL);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-		g_free (new_name);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_description (AtkObject *accessible)
-{
-	return ea_day_view_cell_get_name (accessible);
-}
-
-static AtkStateSet*
-ea_day_view_cell_ref_state_set (AtkObject *obj)
-{
-  AtkStateSet *state_set;
-  GObject *g_obj;
-  AtkObject *parent;
-  gint x, y, width, height;
-  gint parent_x, parent_y, parent_width, parent_height;
-
-  state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
-  if (!g_obj)
-	  return state_set;
-
-  atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
-
-  parent = atk_object_get_parent (obj);
-  atk_component_get_extents (ATK_COMPONENT (obj), &x, &y,
-			     &width, &height, ATK_XY_WINDOW);
-  atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
-			     &parent_width, &parent_height, ATK_XY_WINDOW);
-
-
-  if (x + width < parent_x || x > parent_x + parent_width ||
-      y + height < parent_y || y > parent_y + parent_height)
-	  /* the cell is out of the main canvas */	  
-	  ;
-  else
-	  atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
-
-  return state_set;
-}
-
-static AtkObject *
-ea_day_view_cell_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (cell->day_view->main_canvas));
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj;
-	EDayViewCell *cell;
-	EDayView *day_view;
-	GtkWidget *main_canvas;
-	gint day_view_width, day_view_height;
-	gint scroll_x, scroll_y;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_CELL (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	day_view = cell->day_view;
-	main_canvas = cell->day_view->main_canvas;
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (main_canvas));
-	atk_component_get_extents (ATK_COMPONENT (atk_obj),
-				   x, y,
-				   &day_view_width, &day_view_height,
-				   coord_type);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-	*x += day_view->day_offsets[cell->column] - scroll_x;
-	*y += day_view->row_height * cell->row
-		- scroll_y;
-	printf ("ybl: cellrow=%d, cellcol=%d, scroll_x=%d, scroll_y=%d\n",
-		cell->row, cell->column, scroll_x, scroll_y);
-	*width = day_view->day_widths[cell->column];
-	*height = day_view->row_height;
-}
diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h
deleted file mode 100644
index cba2fec15b..0000000000
--- a/a11y/calendar/ea-day-view-cell.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_CELL_H__
-#define __EA_DAY_VIEW_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_DAY_VIEW_CELL                     (e_day_view_cell_get_type ())
-#define E_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCell))
-#define E_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-#define E_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DAY_VIEW_CELL))
-#define E_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DAY_VIEW_CELL))
-#define E_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-
-typedef struct _EDayViewCell                   EDayViewCell;
-typedef struct _EDayViewCellClass              EDayViewCellClass;
-
-struct _EDayViewCell
-{
-	GObject parent;
-	EDayView *day_view;
-	gint row;
-	gint column;
-};
-
-GType e_day_view_cell_get_type (void);
-
-struct _EDayViewCellClass
-{
-	GObjectClass parent_class;
-};
-
-EDayViewCell * e_day_view_cell_new (EDayView *day_view, gint row, gint column);
-
-#define EA_TYPE_DAY_VIEW_CELL                     (ea_day_view_cell_get_type ())
-#define EA_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCell))
-#define EA_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-#define EA_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_CELL))
-#define EA_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_CELL))
-#define EA_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-
-typedef struct _EaDayViewCell                   EaDayViewCell;
-typedef struct _EaDayViewCellClass              EaDayViewCellClass;
-
-struct _EaDayViewCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_cell_get_type (void);
-
-struct _EaDayViewCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_CELL_H__ */
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
deleted file mode 100644
index af8d704178..0000000000
--- a/a11y/calendar/ea-day-view-main-item.c
+++ /dev/null
@@ -1,1259 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-main-item.h"
-#include "e-day-view-top-item.h"
-#include "ea-day-view.h"
-#include "ea-day-view-cell.h"
-#include "ea-cell-table.h"
-
-/* EaDayViewMainItem */
-static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
-
-static void ea_day_view_main_item_finalize (GObject *object);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_description (AtkObject *accessible);
-
-static gint         ea_day_view_main_item_get_n_children (AtkObject *obj);
-static AtkObject*   ea_day_view_main_item_ref_child (AtkObject *obj,
-						     gint i);
-static AtkObject * ea_day_view_main_item_get_parent (AtkObject *accessible);
-static gint ea_day_view_main_item_get_index_in_parent (AtkObject *accessible);
-
-/* callbacks */
-static void ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-static void ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* helpers */
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item);
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item);
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column);
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index);
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index);
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer,
-				     gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_main_item_created = 0;
-static gint n_ea_day_view_main_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_main_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewMainItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_main_item_class_init,
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewMainItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 *
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_day_view_main_item_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayViewMainItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_day_view_main_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_main_item_get_name;
-	class->get_description = ea_day_view_main_item_get_description;
-
-	class->get_n_children = ea_day_view_main_item_get_n_children;
-	class->ref_child = ea_day_view_main_item_ref_child;
-	class->get_parent = ea_day_view_main_item_get_parent;
-	class->get_index_in_parent = ea_day_view_main_item_get_index_in_parent;
-}
-
-AtkObject* 
-ea_day_view_main_item_new (GObject *obj)
-{
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_MAIN_ITEM (obj), NULL);
-
-	accessible = ATK_OBJECT (g_object_new (EA_TYPE_DAY_VIEW_MAIN_ITEM,
-					       NULL));
-
-	atk_object_initialize (accessible, obj);
-	accessible->role = ATK_ROLE_TABLE;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_created;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_created = %d\n",
-		n_ea_day_view_main_item_created);
-#endif
-	main_item = E_DAY_VIEW_MAIN_ITEM (obj);
-	g_signal_connect (main_item->day_view, "selected_time_changed",
-			  G_CALLBACK (ea_day_view_main_item_time_change_cb),
-			  accessible);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (main_item->day_view));
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_day_view_main_item_dates_change_cb),
-				  accessible);
-
-	return accessible;
-}
-
-static void
-ea_day_view_main_item_finalize (GObject *object)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (object));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_destroyed = %d\n",
-		n_ea_day_view_main_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_name (AtkObject *accessible)
-{
-	AtkObject *parent;
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-	parent = atk_object_get_parent (accessible);
-	return atk_object_get_name (parent);
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_description (AtkObject *accessible)
-{
-	return "a table to view and select the current time range";
-}
-
-static gint
-ea_day_view_main_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows * day_view->days_shown;
-}
-
-static AtkObject *
-ea_day_view_main_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-	EDayViewCell *cell;
-	EaCellTable *cell_data;
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (accessible);
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		gint row, column;
-
-		row = ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-		column = ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-		cell = e_day_view_cell_new (day_view, row, column);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-static AtkObject *
-ea_day_view_main_item_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (main_item->day_view));
-}
-
-static gint
-ea_day_view_main_item_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	/* always the first child of ea-day-view */
-	return 0;
-}
-
-/* callbacks */
-
-static void
-ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item update cb\n");
-#endif
-
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-}
-
-static void
-ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item time changed cb\n");
-#endif
-	g_signal_emit_by_name (data, "selection_changed");
-}
-
-/* helpers */
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row >= 0 && row < day_view->rows &&
-	    column >= 0 && column < day_view->days_shown)
-		return column * day_view->rows + row;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index % day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index / day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gchar *suffix;
-	gint hour, minute, suffix_width;
-
-	g_return_val_if_fail (ea_main_item, 0);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0 ;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	hour = day_view->first_hour_shown;
-	minute = day_view->first_minute_shown;
-	minute += row * day_view->mins_per_row;
-	hour = (hour + minute / 60) % 24;
-	minute %= 60;
-
-	e_day_view_convert_time_to_display (day_view, hour, &hour,
-					    &suffix, &suffix_width);
-	return g_snprintf (buffer, buffer_size, "%i:%02i %s",
-		    hour, minute, suffix);
-}
-
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_main_item, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (!cell_data) {
-		cell_data = ea_cell_table_create (day_view->rows,
-						  day_view->days_shown, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_main_item);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", NULL);
-	}
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *ea_canvas;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	ea_canvas = gtk_widget_get_accessible (day_view->main_canvas);
-	atk_component_get_extents (ATK_COMPONENT (ea_canvas), x, y,
-				   width, height, coord_type);
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	return ea_day_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->days_shown;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_child_index_at (ea_main_item,
-							 row, column);
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable      *table,
-				   gint          row,
-				   gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return height;
-}
-
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint     row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		/* no selection */
-		return FALSE;
-	if (day_view->selection_start_day != day_view->selection_end_day)
-		/* all row is selected */
-		return TRUE;
-	if (row >= day_view->selection_start_row &&
-	    row <= day_view->selection_end_row)
-		return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	return table_interface_is_row_selected (table, row) &&
-		table_interface_is_column_selected (table, column);
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (column >= day_view->selection_start_day &&
-	    column <= day_view->selection_end_day)
-		return TRUE;
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint     **rows_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_row = -1, n_rows = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	if (day_view->selection_start_day != day_view->selection_end_day) {
-		/* all the rows should be selected */
-		n_rows = day_view->rows;
-		start_row = 0;
-	}
-	else if (day_view->selection_start_row != -1) {
-		start_row = day_view->selection_start_row;
-		n_rows = day_view->selection_end_row - start_row + 1;
-	}
-	if (n_rows > 0 && start_row != -1 && rows_selected) {
-		gint index;
-
-		*rows_selected = (gint *) g_malloc (n_rows * sizeof (gint));
-		for (index = 0; index < n_rows; ++index)
-			(*rows_selected)[index] = start_row + index;
-	}
-	return n_rows;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_column = -1, n_columns = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	start_column = day_view->selection_start_day;
-	n_columns = day_view->selection_end_day - start_column + 1;
-	if (n_columns > 0 && start_column != -1 && columns_selected) {
-		gint index;
-
-		*columns_selected = (gint *) g_malloc (n_columns * sizeof (gint));
-		for (index = 0; index < n_columns; ++index)
-			(*columns_selected)[index] = start_column + index;
-	}
-	return n_columns;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = 0;
-	day_view->selection_end_day = 0;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	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);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = 0;
-	day_view->selection_end_row = day_view->rows;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable	  *table,
-					gint       in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (in_col < 0 || in_col >= day_view->days_shown)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128];
-		e_day_view_top_item_get_day_label (day_view, in_col, buffer, 128);
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data, in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable    *table,
-				     gint        row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row < 0 || row >= 12 * 24)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128];
-		ea_day_view_main_item_get_row_label (ea_main_item, row, buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-								row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (row == -1 || column == -1)
-		return FALSE;
-
-	/*FIXME: multi-selection is needed */
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	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);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	if (selection_interface_is_child_selected (selection, i))
-		return ea_day_view_main_item_ref_child (ATK_OBJECT (selection), i);
-	return NULL;
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint start_index, end_index;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1 ||
-	    day_view->selection_start_row == -1)
-		return 0;
-	start_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_start_row,
-								day_view->selection_start_day);
-	end_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_end_row,
-								day_view->selection_end_day);
-
-	return end_index - start_index + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (column < day_view->selection_start_day ||
-	    column > day_view->selection_end_day)
-		return FALSE;
-
-	if ((column == day_view->selection_start_day ||
-	     column == day_view->selection_end_day) &&
-	    (row < day_view->selection_start_row ||
-	     row > day_view->selection_end_row))
-		return FALSE;
-
-	/* if comes here, the cell is selected */
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h
deleted file mode 100644
index d22372d064..0000000000
--- a/a11y/calendar/ea-day-view-main-item.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_MAIN_ITEM_H__
-#define __EA_DAY_VIEW_MAIN_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view-main-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW_MAIN_ITEM                     (ea_day_view_main_item_get_type ())
-#define EA_DAY_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItem))
-#define EA_DAY_VIEW_MAIN_ITEM_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-#define EA_IS_DAY_VIEW_MAIN_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_IS_DAY_VIEW_MAIN_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_DAY_VIEW_MAIN_ITEM_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-
-typedef struct _EaDayViewMainItem                   EaDayViewMainItem;
-typedef struct _EaDayViewMainItemClass              EaDayViewMainItemClass;
-
-struct _EaDayViewMainItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_main_item_get_type (void);
-
-struct _EaDayViewMainItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_main_item_new         (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_MAIN_ITEM_H__ */
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
deleted file mode 100644
index f91583da24..0000000000
--- a/a11y/calendar/ea-day-view.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view.h"
-#include "ea-cal-view-event.h"
-
-#include "ea-calendar-helpers.h"
-#include "calendar-commands.h"
-#include <glib/gstrfuncs.h>
-
-static void ea_day_view_class_init (EaDayViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_get_description (AtkObject *accessible);
-static gint         ea_day_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_day_view_ref_child           (AtkObject *obj,
-                                                     gint i);
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_cal_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayView", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_class_init (EaDayViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_get_name;
-	class->get_description = ea_day_view_get_description;
-
-	class->get_n_children = ea_day_view_get_n_children;
-	class->ref_child = ea_day_view_ref_child;
-}
-
-AtkObject* 
-ea_day_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_name (AtkObject *accessible)
-{
-	EDayView *day_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gchar buffer[128] = "";
-	gint n_events;
-
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-	label_text = calendar_get_text_for_folder_bar_label (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events > 0)
-		g_snprintf (buffer, sizeof (buffer),
-			    ", %d events", n_events);
-	view_type = gnome_calendar_get_view (gcal);
-	if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-		accessible->name = g_strconcat ("work week view :",
-						label_text, buffer,
-						NULL);
-	else
-		accessible->name = g_strconcat ("day view :",
-						label_text, buffer,
-						NULL);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_description (AtkObject *accessible)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-			return "calendar view for a work week";
-		else
-			return "calendar view for one or more days";
-	}
-}
-
-static gint
-ea_day_view_get_n_children (AtkObject *accessible)
-{
-	EDayView *day_view;
-	gint day;
-	gint child_num = 0;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	child_num += day_view->long_events->len;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		child_num += day_view->events[day]->len;
-	}
-
-	/* "+1" for the main item */
-	return child_num + 1;
-}
-
-static AtkObject *
-ea_day_view_ref_child (AtkObject *accessible, gint index)
-{
-	EDayView *day_view;
-	gint child_num;
-	gint day;
-	AtkObject *atk_object = NULL;
-	EDayViewEvent *event = NULL;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
-	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (index == 0) {
-		/* index == 0 is the main item */
-		atk_object = atk_gobject_accessible_for_object (G_OBJECT (day_view->main_canvas_item));
-		g_object_ref (atk_object);
-	}
-	else {
-		--index;
-		/* a long event */
-		if (index < day_view->long_events->len) {
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, index);
-		}
-		else {
-			index -= day_view->long_events->len;
-			day = 0;
-			while (index >= day_view->events[day]->len) {
-				index -= day_view->events[day]->len;
-				++day;
-			}
-
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, index);
-		}
-		if (event && event->canvas_item) {
-			/* Not use atk_gobject_accessible_for_object here,
-			 * we need to do special thing here
-			 */
-			atk_object = ea_calendar_helpers_get_accessible_for (event->canvas_item);
-			g_object_ref (atk_object);
-		}
-	}
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h
deleted file mode 100644
index 5ca4614f03..0000000000
--- a/a11y/calendar/ea-day-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_H__
-#define __EA_DAY_VIEW_H__
-
-#include "ea-cal-view.h"
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW                     (ea_day_view_get_type ())
-#define EA_DAY_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW, EaDayView))
-#define EA_DAY_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW, EaDayViewClass))
-#define EA_IS_DAY_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW))
-#define EA_IS_DAY_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW))
-#define EA_DAY_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW, EaDayViewClass))
-
-typedef struct _EaDayView                   EaDayView;
-typedef struct _EaDayViewClass              EaDayViewClass;
-
-struct _EaDayView
-{
-	EaCalView parent;
-};
-
-GType ea_day_view_get_type (void);
-
-struct _EaDayViewClass
-{
-	EaCalViewClass parent_class;
-};
-
-AtkObject*     ea_day_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_H__ */
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
deleted file mode 100644
index 9d057ee31a..0000000000
--- a/a11y/calendar/ea-gnome-calendar.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-gnome-calendar.h"
-#include "calendar-commands.h"
-#include <gtk/gtknotebook.h>
-
-static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
-
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_description (AtkObject *accessible);
-static gint ea_gnome_calendar_get_n_children (AtkObject* obj);
-static AtkObject * ea_gnome_calendar_ref_child (AtkObject *obj, gint i);
-
-static void ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-				    guint index, gpointer data);
-static void ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_gnome_calendar_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaGnomeCalendarClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_gnome_calendar_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaGnomeCalendar), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaGnomeCalendar", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_gnome_calendar_get_name;
-	class->get_description = ea_gnome_calendar_get_description;
-
-	class->get_n_children = ea_gnome_calendar_get_n_children;
-	class->ref_child = ea_gnome_calendar_ref_child;
-}
-
-AtkObject* 
-ea_gnome_calendar_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	GtkWidget *notebook;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (widget), NULL);
-
-	object = g_object_new (EA_TYPE_GNOME_CALENDAR, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	accessible->role = ATK_ROLE_FILLER;
-
-	gcal = GNOME_CALENDAR (widget);
-
-	/* listen on view type change
-	 */
-	g_signal_connect (widget, "dates_shown_changed",
-			  G_CALLBACK (ea_gcal_dates_change_cb),
-			  accessible);
-	notebook = gnome_calendar_get_view_notebook_widget (gcal);
-	if (notebook) {
-		g_signal_connect (notebook, "switch_page",
-				  G_CALLBACK (ea_gcal_switch_view_cb),
-				  accessible);
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_name (AtkObject *accessible)
-{
-	if (accessible->name)
-		return accessible->name;
-	return "Gnome Calendar";
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-	return "Gnome Calendar";
-}
-
-static gint
-ea_gnome_calendar_get_n_children (AtkObject* obj)
-{
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), 0);
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return -1;
-	return 4;
-}
-
-static AtkObject *
-ea_gnome_calendar_ref_child (AtkObject *obj, gint i)
-{
-	AtkObject * child = NULL;
-	GnomeCalendar * calendarWidget;
-	GtkWidget *childWidget;
-
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), NULL);
-	/* valid child index range is [0-3] */
-	if (i < 0 || i >3 )
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return NULL;
-	calendarWidget = GNOME_CALENDAR (GTK_ACCESSIBLE (obj)->widget);
-
-	switch (i) {
-	case 0:
-		/* for the search bar */
-		childWidget = gnome_calendar_get_search_bar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		atk_object_set_name (child, "search bar");
-		atk_object_set_description (child, "evolution calendar search bar");
-		break;
-	case 1:
-		/* for the day/week view */
-		childWidget = gnome_calendar_get_current_view_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		break;
-	case 2:
-		/* for calendar */
-		childWidget = gnome_calendar_get_e_calendar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	case 3:
-		/* for todo list */
-		childWidget = GTK_WIDGET (gnome_calendar_get_task_pad (calendarWidget));
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	default:
-		break;
-	}
-	if (child)
-		g_object_ref(child);
-	return child;
-}
-
-static void
-ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-			guint index, gpointer data)
-{
-	GtkWidget *new_widget;
-
-	new_widget = gtk_notebook_get_nth_page (widget, index);
-
-	/* views are always the second child in gnome calendar
-	 */
-	if (new_widget)
-		g_signal_emit_by_name (G_OBJECT(data), "children_changed::add",
-				       1, gtk_widget_get_accessible (new_widget), NULL);
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: view switch to widget %p (index=%d) \n",
-		(void *)new_widget, index);
-#endif
-}
-
-static void
-ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	const gchar *new_name;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_GNOME_CALENDAR (data));
-
-	new_name = calendar_get_text_for_folder_bar_label (gcal);
-	atk_object_set_name (ATK_OBJECT(data), new_name);
-	g_signal_emit_by_name (data, "visible_data_changed");
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: calendar dates changed, label=%s\n", new_name);
-#endif
-}
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
deleted file mode 100644
index 2cb39219c4..0000000000
--- a/a11y/calendar/ea-gnome-calendar.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_GNOME_CALENDAR_H__
-#define __EA_GNOME_CALENDAR_H__
-
-#include <gtk/gtkaccessible.h>
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_GNOME_CALENDAR            (ea_gnome_calendar_get_type ())
-#define EA_GNOME_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendar))
-#define EA_GNOME_CALENDAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-#define EA_IS_GNOME_CALENDAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_GNOME_CALENDAR))
-#define EA_IS_GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_GNOME_CALENDAR))
-#define EA_GNOME_CALENDAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-
-typedef struct _EaGnomeCalendar                   EaGnomeCalendar;
-typedef struct _EaGnomeCalendarClass              EaGnomeCalendarClass;
-
-struct _EaGnomeCalendar
-{
-	GtkAccessible parent;
-};
-
-GType ea_gnome_calendar_get_type (void);
-
-struct _EaGnomeCalendarClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_gnome_calendar_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_GNOME_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
deleted file mode 100644
index 3c3e13a268..0000000000
--- a/a11y/calendar/ea-week-view.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-week-view.h"
-#include "ea-cal-view.h"
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "calendar-commands.h"
-#include <gal/e-text/e-text.h>
-
-static void ea_week_view_class_init (EaWeekViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_week_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_get_description (AtkObject *accessible);
-static gint         ea_week_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_week_view_ref_child           (AtkObject *obj,
-						      gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_week_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaWeekViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_week_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaWeekView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_cal_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaWeekView", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_week_view_class_init (EaWeekViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_week_view_get_name;
-	class->get_description = ea_week_view_get_description;
-
-	class->get_n_children = ea_week_view_get_n_children;
-	class->ref_child = ea_week_view_ref_child;
-}
-
-AtkObject* 
-ea_week_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	object = g_object_new (EA_TYPE_WEEK_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_name (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gchar buffer[128] = "";
-	gint n_events;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-	label_text = calendar_get_text_for_folder_bar_label (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events > 0)
-		g_snprintf (buffer, sizeof (buffer),
-			    ", %d events", n_events);
-
-	view_type = gnome_calendar_get_view (gcal);
-
-	if (view_type == GNOME_CAL_MONTH_VIEW)
-		accessible->name = g_strconcat ("month view :",
-						label_text, buffer,
-						NULL);
-
-	else
-		accessible->name = g_strconcat ("week view :",
-						label_text, buffer,
-						NULL);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_description (AtkObject *accessible)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_MONTH_VIEW)
-			return "calendar view for a month";
-		else
-			return "calendar view for one or more weeks";
-	}
-}
-
-static gint
-ea_week_view_get_n_children (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	GnomeCanvasGroup *canvas_group;
-	gint i, count = 0;
-	gint event_index;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	for (event_index = 0; event_index < week_view->events->len;
-	     ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + 0);
-
-		if (!span)
-			continue;
-
-		/* at least one of the event spans is visible, count it */
-		if (span->text_item)
-			++count;
-	}
-
-	/* add the number of visible jump buttons */
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		if (week_view->jump_buttons[i]->object.flags & GNOME_CANVAS_ITEM_VISIBLE)
-			++count;
-	}
-
-#ifdef ACC_DEBUG
-	printf("AccDebug: week view %p has %d children\n", (void *)week_view, count);
-#endif
-	return count;
-}
-
-static AtkObject *
-ea_week_view_ref_child (AtkObject *accessible, gint index)
-{
-	EWeekView *week_view;
-	gint child_num, max_count;
-	AtkObject *atk_object = NULL;
-	gint event_index;
-	gint jump_button = -1;
-	gint span_num = 0;
-	gint count = 0;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
- 	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-	max_count = week_view->events->len;
-
-	for (event_index = 0; event_index < max_count; ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-		gint current_day;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (!span)
-			continue;
-
-		current_day = span->start_day;
-		if (span->text_item)
-			++count;
-		else if  (current_day != jump_button) {
-			/* we should go to the jump button */
-			jump_button = current_day;
-			++count;
-		}
-		else
-			continue;
-
-		if (count == (index + 1)) {
-			if (span->text_item) {
-				/* Not use atk_gobject_accessible_for_object for event
-				 * text_item we need to do special thing here
-				 */
-				atk_object = ea_calendar_helpers_get_accessible_for (span->text_item);
-			}
-			else {
-				atk_object = atk_gobject_accessible_for_object (G_OBJECT(week_view->jump_buttons[current_day == -1 ? 0 : current_day]));
-			}
-			g_object_ref (atk_object);
-			break;
-		}
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n",
-		index, (void *)atk_object);
-#endif
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
deleted file mode 100644
index f0ed117375..0000000000
--- a/a11y/calendar/ea-week-view.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_WEEK_VIEW_H__
-#define __EA_WEEK_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_WEEK_VIEW                     (ea_week_view_get_type ())
-#define EA_WEEK_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW, EaWeekView))
-#define EA_WEEK_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-#define EA_IS_WEEK_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_WEEK_VIEW))
-#define EA_IS_WEEK_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_WEEK_VIEW))
-#define EA_WEEK_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-
-typedef struct _EaWeekView                   EaWeekView;
-typedef struct _EaWeekViewClass              EaWeekViewClass;
-
-struct _EaWeekView
-{
-	GtkAccessible parent;
-};
-
-GType ea_week_view_get_type (void);
-
-struct _EaWeekViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_week_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_WEEK_VIEW_H__ */
diff --git a/a11y/e-table/.cvsignore b/a11y/e-table/.cvsignore
deleted file mode 100644
index 5b48d3f593..0000000000
--- a/a11y/e-table/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.libs
-Makefile.in
-Makefile
-*.la
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
deleted file mode 100644
index 88325e726e..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <config.h>
-#include <gal/e-table/e-cell-popup.h>
-#include "gal-a11y-e-cell-popup.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-
-static AtkObjectClass *parent_class = NULL;
-#define PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-static void gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass);
-static void popup_cell_action (GalA11yECell *cell);
-
-/**
- * gal_a11y_e_cell_popup_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellPopup class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellPopup class.
- **/
-GType
-gal_a11y_e_cell_popup_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellPopupClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_cell_popup_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellPopup),
-			0,
-			(GInstanceInitFunc) NULL,
-			NULL /* value_cell_popup */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellPopup", &info, 0);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-static void
-gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-}
-
-AtkObject *
-gal_a11y_e_cell_popup_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *a11y;
-	GalA11yECell *cell;
- 	ECellPopup *popupcell;
-	ECellView* child_view = NULL;
-
-	popupcell=  E_CELL_POPUP(cell_view->ecell);
-
-	if (popupcell && popupcell->popup_cell_view)
-	        child_view = popupcell->popup_cell_view->child_view;
-	
- 	if (child_view && child_view->ecell) {
-		a11y = gal_a11y_e_cell_registry_get_object (NULL,
-							    item,
-							    child_view,
-							    parent,
-							    model_col,
-							    view_col,
-							    row);
-	} else {
-		a11y = g_object_new (GAL_A11Y_TYPE_E_CELL_POPUP, NULL);
-		gal_a11y_e_cell_construct (a11y,
-					   item,
-					   cell_view,
-					   parent,
-					   model_col,
-					   view_col,
-					   row);
-	       	}
-	g_return_val_if_fail (a11y != NULL, NULL);
-	cell = GAL_A11Y_E_CELL(a11y);
-	gal_a11y_e_cell_add_action (cell, 
-				    "popup",	       /* action name*/
-				    "popup a child", /* action description */
-				    "<Alt>Down",              /* action keybinding */
-				    popup_cell_action);
-
-	a11y->role  = ATK_ROLE_TABLE_CELL;
-	return a11y;
-}
-
-static void
-popup_cell_action (GalA11yECell *cell)
-{
-	ECellPopup *ecp;
-	gint finished;
-	GdkEvent event;
-
-	event.key.type = GDK_KEY_PRESS; 
-	event.key.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;;
-	event.key.send_event = TRUE;
-	event.key.time = GDK_CURRENT_TIME;
-	event.key.state = GDK_MOD1_MASK;
-	event.key.keyval = GDK_Down;
-  
-	g_signal_emit_by_name (cell->item, "event", &event, &finished);
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
deleted file mode 100644
index 5809f9b4f4..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __GAL_A11Y_E_CELL_POPUP_H__
-#define __GAL_A11Y_E_CELL_POPUP_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define GAL_A11Y_TYPE_E_CELL_POPUP            (gal_a11y_e_cell_popup_get_type ())
-#define GAL_A11Y_E_CELL_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_POPUP, GalA11yECellPopup))
-#define GAL_A11Y_E_CELL_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_POPUP, GalA11yECellPopupClass))
-#define GAL_A11Y_IS_E_CELL_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_POPUP))
-#define GAL_A11Y_IS_E_CELL_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_POPUP))
-
-typedef struct _GalA11yECellPopup GalA11yECellPopup;
-typedef struct _GalA11yECellPopupClass GalA11yECellPopupClass;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellPopupPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellPopup {
-	GalA11yECell object;
-};
-
-struct _GalA11yECellPopupClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_popup_get_type   (void);
-AtkObject *gal_a11y_e_cell_popup_new        (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
deleted file mode 100644
index 7110179554..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-e-cell.h"
-
-static GObjectClass *parent_class;
-static GalA11yECellRegistry *default_registry;
-#define PARENT_TYPE (G_TYPE_OBJECT)
-
-struct _GalA11yECellRegistryPrivate {
-	GHashTable *table;
-};
-
-/* Static functions */
-
-static void
-gal_a11y_e_cell_registry_finalize (GObject *obj)
-{
-	GalA11yECellRegistry *registry = GAL_A11Y_E_CELL_REGISTRY (obj);
-
-	g_hash_table_destroy (registry->priv->table);
-	g_free (registry->priv);
-}
-
-static void
-gal_a11y_e_cell_registry_class_init (GalA11yECellRegistryClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->finalize = gal_a11y_e_cell_registry_finalize;
-}
-
-static void
-gal_a11y_e_cell_registry_init (GalA11yECellRegistry *registry)
-{
-	registry->priv = g_new (GalA11yECellRegistryPrivate, 1);
-	registry->priv->table = g_hash_table_new (NULL, NULL);
-}
-
-/**
- * gal_a11y_e_cell_registry_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellRegistry class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellRegistry class.
- **/
-GType
-gal_a11y_e_cell_registry_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellRegistryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_cell_registry_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellRegistry),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_cell_registry_init,
-			NULL /* value_cell */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellRegistry", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-init_default_registry (void)
-{
-	if (default_registry == NULL) {
-		default_registry = g_object_new (gal_a11y_e_cell_registry_get_type(), NULL);
-	}
-}
-
-
-AtkObject *
-gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
-					 ETableItem               *item,
-					 ECellView                *cell_view,
-					 AtkObject                *parent,
-					 int                       model_col,
-					 int                       view_col,
-					 int                       row)
-{
-	GalA11yECellRegistryFunc func = NULL;
-	GType type;
-
-	if (registry == NULL) {
-		init_default_registry ();
-		registry = default_registry;
-	}
-
-	type = GTK_OBJECT_TYPE (cell_view->ecell);
-	while (func == NULL && type != 0) {
-		func = g_hash_table_lookup (registry->priv->table, GINT_TO_POINTER (type));
-		type = g_type_parent (type);
-	}
-
-	if (func)
-		return func (item, cell_view, parent, model_col, view_col, row);
-	else
-		return gal_a11y_e_cell_new (item, cell_view, parent, model_col, view_col, row);
-}
-
-void
-gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *registry,
-					 GType                     type,
-					 GalA11yECellRegistryFunc  func)
-{
-	if (registry == NULL) {
-		init_default_registry ();
-		registry = default_registry;
-	}
-
-	g_hash_table_insert (registry->priv->table, GINT_TO_POINTER (type), func);
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
deleted file mode 100644
index eecd41139c..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_REGISTRY_H__
-#define __GAL_A11Y_E_CELL_REGISTRY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL_REGISTRY            (gal_a11y_e_cell_registry_get_type ())
-#define GAL_A11Y_E_CELL_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistry))
-#define GAL_A11Y_E_CELL_REGISTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistryClass))
-#define GAL_A11Y_IS_E_CELL_REGISTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY))
-#define GAL_A11Y_IS_E_CELL_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_REGISTRY))
-
-typedef struct _GalA11yECellRegistry GalA11yECellRegistry;
-typedef struct _GalA11yECellRegistryClass GalA11yECellRegistryClass;
-typedef struct _GalA11yECellRegistryPrivate GalA11yECellRegistryPrivate;
-
-typedef AtkObject *(*GalA11yECellRegistryFunc) (ETableItem *item,
-						ECellView  *cell_view,
-						AtkObject  *parent,
-						int         model_col,
-						int         view_col,
-						int         row);
-
-struct _GalA11yECellRegistry {
-	GObject object;
-
-	GalA11yECellRegistryPrivate *priv;
-};
-
-struct _GalA11yECellRegistryClass {
-	GObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_registry_get_type       (void);
-AtkObject *gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
-						    ETableItem               *item,
-						    ECellView                *cell_view,
-						    AtkObject                *parent,
-						    int                       model_col,
-						    int                       view_col,
-						    int                       row);
-void       gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *registry,
-						    GType                     type,
-						    GalA11yECellRegistryFunc  func);
-
-#endif /* ! __GAL_A11Y_E_CELL_REGISTRY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
deleted file mode 100644
index e23d1f2feb..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-cell-text.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-cell-text.h>
-#include <atk/atkobject.h>
-#include <atk/atktext.h>
-#include <atk/atkeditabletext.h>
-#include <atk/atkaction.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTextClass))
-static AtkObjectClass *parent_class;
-#define PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-/* Static functions */
-static G_CONST_RETURN gchar*
-ect_get_name (AtkObject * a11y)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	return e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-}
-
-static gchar *
-ect_get_text (AtkText *text,
-	      gint start_offset,
-	      gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *ret_val;
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	if (end_offset == -1)
-		end_offset = strlen (full_text);
-	else
-		end_offset = g_utf8_offset_to_pointer (full_text, end_offset) - full_text;
-
-	start_offset = g_utf8_offset_to_pointer (full_text, start_offset) - full_text;
-
-	ret_val = g_strndup (full_text + start_offset, end_offset - start_offset);
-
-	e_cell_text_free_text (ect, full_text);
-
-	return ret_val;
-}
-
-static gchar *
-ect_get_text_after_offset (AtkText *text,
-			   gint offset,
-			   AtkTextBoundary boundary_type,
-			   gint *start_offset,
-			   gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gchar *
-ect_get_text_at_offset (AtkText *text,
-			gint offset,
-			AtkTextBoundary boundary_type,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gunichar
-ect_get_character_at_offset (AtkText *text,
-			     gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gunichar ret_val;
-	gchar *at_offset;
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-	at_offset = g_utf8_offset_to_pointer (full_text, offset);
-	ret_val = g_utf8_get_char_validated (at_offset, -1);
-	e_cell_text_free_text (ect, full_text);
-
-	return ret_val;
-}
-
-
-static gchar*
-ect_get_text_before_offset (AtkText *text,
-			    gint offset,
-			    AtkTextBoundary boundary_type,
-			    gint *start_offset,
-			    gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static gint
-ect_get_caret_offset (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint start, end;
-
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &start, &end)) {
-		gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-		end = g_utf8_pointer_to_offset (full_text, full_text + end);
-		e_cell_text_free_text (ect, full_text);
-		
-		return end;
-	}
-	else
-		return -1;
-}
-
-static AtkAttributeSet*
-ect_get_run_attributes (AtkText *text,
-			gint offset,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static AtkAttributeSet*
-ect_get_default_attributes (AtkText *text)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static void
-ect_get_character_extents (AtkText *text,
-			   gint offset,
-			   gint *x,
-			   gint *y,
-			   gint *width,
-			   gint *height,
-			   AtkCoordType coords)
-{
-	/* Unimplemented */
-}
-
-
-static gint
-ect_get_character_count (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint ret_val;
-
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	ret_val = g_utf8_strlen (full_text, -1);
-	e_cell_text_free_text (ect, full_text);
-	return ret_val;
-}
-
-
-static gint
-ect_get_offset_at_point (AtkText *text,
-			 gint x,
-			 gint y,
-			 AtkCoordType coords)
-{
-	/* Unimplemented */
-	return 0;
-}
-
-
-static gint 
-ect_get_n_selections (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint selection_start, selection_end;
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &selection_start,
-				       &selection_end)
-	    && selection_start != selection_end)
-		return 1;
-	return 0;
-}
-
-
-static gchar*
-ect_get_selection (AtkText *text,
-		   gint selection_num,
-		   gint *start_offset,
-		   gint *end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *ret_val;
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end) {
-		gint real_start, real_end, len;
-		gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-		len = strlen (full_text);
-		real_start = MIN (selection_start, selection_end);
-		real_end   = MAX (selection_start, selection_end);
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		ret_val = g_strndup (full_text + real_start, real_end - real_start);
-
-		real_start = g_utf8_pointer_to_offset (full_text, full_text + real_start);
-		real_end   = g_utf8_pointer_to_offset (full_text, full_text + real_end);
-
-		if (start_offset)
-			*start_offset = real_start;
-		if (end_offset)
-			*end_offset = real_end;
-		e_cell_text_free_text (ect, full_text);
-	} else {
-		if (start_offset)
-			*start_offset = 0;
-		if (end_offset)
-			*end_offset = 0;
-		ret_val = NULL;
-	}
-
-	return ret_val;
-}
-
-
-static gboolean
-ect_add_selection (AtkText *text,
-		   gint start_offset,
-		   gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	if (start_offset != end_offset) {
-		gint real_start, real_end, len;
-		gchar *full_text =
-			e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-		len = g_utf8_strlen (full_text, -1);
-		if (end_offset == -1)
-			end_offset = len;
-
-		real_start = MIN (start_offset, end_offset);
-		real_end   = MAX (start_offset, end_offset);
-		
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		real_start = g_utf8_offset_to_pointer (full_text, real_start) - full_text;
-		real_end   = g_utf8_offset_to_pointer (full_text, real_end) - full_text;
-		e_cell_text_free_text (ect, full_text);
-
-		if (e_cell_text_set_selection (gaec->cell_view,
-					       gaec->view_col, gaec->row,
-					       real_start, real_end)) {
-			g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-ect_remove_selection (AtkText *text,
-		      gint selection_num)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end 
-	    && e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  selection_end, selection_end)) {
-		g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-
-static gboolean
-ect_set_selection (AtkText *text,
-		   gint selection_num,
-		   gint start_offset,
-		   gint end_offset)
-{
-	if (selection_num == 0) {
-		atk_text_add_selection (text, start_offset, end_offset);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-
-static gboolean
-ect_set_caret_offset (AtkText *text,
-		      gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *full_text;
-	gint len;
-
-	full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	len = g_utf8_strlen (full_text, -1);
-	if (offset == -1)
-		offset = len;
-	else
-		offset = MIN (MAX (0, offset), len);
-	
-	offset = g_utf8_offset_to_pointer (full_text, offset) - full_text;
-
-	e_cell_text_free_text (ect, full_text);
-
-	return e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  offset, offset);
-}
-
-static gboolean
-ect_set_run_attributes (AtkEditableText *text,
-			AtkAttributeSet *attrib_set,
-			gint start_offset,
-			gint end_offset)
-{
-	/* Unimplemented */
-	return FALSE;
-}
-
-static void
-ect_set_text_contents (AtkEditableText *text,
-		       const gchar *string)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, string);
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-}
-
-static void
-ect_insert_text (AtkEditableText *text,
-		 const gchar *string,
-		 gint length,
-		 gint *position)
-{
-	/* Utf8 unimplemented */
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-	gchar *result = g_strdup_printf ("%.*s%.*s%s", *position, full_text, length, string, full_text + *position);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, result);
-
-	*position += length;
-
-	g_free (result);
-	e_cell_text_free_text (ect, full_text);
-}
-
-static void
-ect_copy_text (AtkEditableText *text,
-	       gint start_pos,
-	       gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (text, 0, start_pos, end_pos))
-		e_cell_text_copy_clipboard (gaec->cell_view,
-					    gaec->view_col, gaec->row);
-}
-
-static void
-ect_delete_text (AtkEditableText *text,
-		 gint start_pos,
-		 gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (text, 0, start_pos, end_pos))
-		e_cell_text_delete_selection (gaec->cell_view,
-					      gaec->view_col, gaec->row);
-}
-
-static void
-ect_cut_text (AtkEditableText *text,
-	      gint start_pos,
-	      gint end_pos)
-{
-	ect_copy_text (text, start_pos, end_pos);
-	ect_delete_text (text, start_pos, end_pos);
-}
-
-static void
-ect_paste_text (AtkEditableText *text,
-		gint position)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-
-	if (atk_text_set_caret_offset (text, position))
-		e_cell_text_paste_clipboard (gaec->cell_view,
-					     gaec->view_col, gaec->row);
-}
-
-static void
-ect_do_action_edit (AtkAction *action)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (action);
-	e_table_item_enter_edit (a11y->item, a11y->view_col, a11y->row);
-}
-
-static void
-ect_atk_text_iface_init (AtkTextIface *iface)
-{
-	iface->get_text                = ect_get_text;
-	iface->get_text_after_offset   = ect_get_text_after_offset;
-	iface->get_text_at_offset      = ect_get_text_at_offset;
-	iface->get_character_at_offset = ect_get_character_at_offset;
-	iface->get_text_before_offset  = ect_get_text_before_offset;
-	iface->get_caret_offset        = ect_get_caret_offset;
-	iface->get_run_attributes      = ect_get_run_attributes;
-	iface->get_default_attributes  = ect_get_default_attributes;
-	iface->get_character_extents   = ect_get_character_extents;
-	iface->get_character_count     = ect_get_character_count;
-	iface->get_offset_at_point     = ect_get_offset_at_point;
-	iface->get_n_selections        = ect_get_n_selections;
-	iface->get_selection           = ect_get_selection;
-	iface->add_selection           = ect_add_selection;
-	iface->remove_selection        = ect_remove_selection;
-	iface->set_selection           = ect_set_selection;
-	iface->set_caret_offset        = ect_set_caret_offset;
-}
-
-static void
-ect_atk_editable_text_iface_init (AtkEditableTextIface *iface)
-{
-	iface->set_run_attributes = ect_set_run_attributes;
-	iface->set_text_contents  = ect_set_text_contents;
-	iface->insert_text        = ect_insert_text;
-	iface->copy_text          = ect_copy_text;
-	iface->cut_text           = ect_cut_text;
-	iface->delete_text        = ect_delete_text;
-	iface->paste_text         = ect_paste_text;
-}
-
-static void
-ect_class_init (GalA11yECellTextClass *klass)
-{
-	AtkObjectClass *a11y      = ATK_OBJECT_CLASS (klass);   
-	parent_class              = g_type_class_ref (PARENT_TYPE);
-	a11y->get_name            = ect_get_name;
-}
-
-static void
-ect_init (GalA11yECellText *a11y)
-{
-	gal_a11y_e_cell_add_action (a11y,
-				    "edit",
-				    "begin editing this cell",
-				    NULL,
-				    (ACTION_FUNC)ect_do_action_edit);
-}
-
-/**
- * gal_a11y_e_cell_text_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellText class.
- **/
-GType
-gal_a11y_e_cell_text_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellTextClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ect_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellText),
-			0,
-			(GInstanceInitFunc) ect_init,
-			NULL /* value_cell_text */
-		};
-
-		static const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc) ect_atk_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_editable_text_info = {
-			(GInterfaceInitFunc) ect_atk_editable_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellText", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_text_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *a11y;
-
-	a11y = g_object_new (gal_a11y_e_cell_text_get_type (), NULL);
-
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	return a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
deleted file mode 100644
index 3d9a4447be..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_TEXT_H__
-#define __GAL_A11Y_E_CELL_TEXT_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-text.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
-#define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
-#define GAL_A11Y_E_CELL_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellTextClass))
-#define GAL_A11Y_IS_E_CELL_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TEXT))
-#define GAL_A11Y_IS_E_CELL_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TEXT))
-
-typedef struct _GalA11yECellText GalA11yECellText;
-typedef struct _GalA11yECellTextClass GalA11yECellTextClass;
-typedef struct _GalA11yECellTextPrivate GalA11yECellTextPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellTextPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellText {
-	GalA11yECell object;
-};
-
-struct _GalA11yECellTextClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_text_get_type   (void);
-AtkObject *gal_a11y_e_cell_text_new        (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
deleted file mode 100644
index f3b5bf2879..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#include <gtk/gtk.h>
-#include "gal-a11y-e-cell-toggle.h"
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-table-model.h>
-
-#define PARENT_TYPE  (gal_a11y_e_cell_get_type ())
-static GObjectClass *parent_class;
-
-static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass);
-
-static void
-gal_a11y_e_cell_toggle_dispose (GObject *object)
-{
-	GalA11yECellToggle *a11y = GAL_A11Y_E_CELL_TOGGLE (object);
-
-	ETableModel *e_table_model = GAL_A11Y_E_CELL (a11y)->item->table_model;
-
-	if (e_table_model)
-		g_signal_handler_disconnect (e_table_model, a11y->model_id);
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-GType
-gal_a11y_e_cell_toggle_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      static const GTypeInfo tinfo =
-      {
-        sizeof (GalA11yECellToggleClass),
-        (GBaseInitFunc) NULL, /* base init */
-        (GBaseFinalizeFunc) NULL, /* base finalize */
-        (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */
-        (GClassFinalizeFunc) NULL, /* class finalize */
-        NULL, /* class data */
-        sizeof (GalA11yECellToggle), /* instance size */
-        0, /* nb preallocs */
-        NULL, /* instance init */
-        NULL /* value table */
-      };
-                                                                                
-
-      type = g_type_register_static (GAL_A11Y_TYPE_E_CELL,
-                                     "GalA11yECellToggle", &tinfo, 0);
-      gal_a11y_e_cell_type_add_action_interface (type);
-	
-    }
-  return type;
-}
-
-
-static void 
-gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->dispose      = gal_a11y_e_cell_toggle_dispose;
-	parent_class               = g_type_class_ref (PARENT_TYPE);
-}
-
-static void
-toggle_cell_action (GalA11yECell *cell)
-{
-	ECellToggle * ect;
-	gint finished;
-	GdkEventButton event;
-	gint x, y, width, height;
-	gint row, col;
-
-	row = cell->row;
-	col = cell->view_col;
-
-	e_table_item_get_cell_geometry (cell->item, &row, &col,
-					&x, &y, &width, &height);
-
-	event.x = x + width / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->x1);
-	event.y = y + height / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->y1);
-
-	event.type = GDK_BUTTON_PRESS;
-	event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;
-        event.button = 1;
-        event.send_event = TRUE;
-        event.time = GDK_CURRENT_TIME;
-        event.axes = NULL;
-
-	g_signal_emit_by_name (cell->item, "event", &event, &finished);
-}
-
-static void
-model_change_cb (ETableModel *etm,
-		 gint row,
-		 gint col,
-		 GalA11yECell *cell)
-{
-	gint value;
-
-	if (col == cell->model_col && row == cell->row) {
-
-	        value = GPOINTER_TO_INT (
-			e_table_model_value_at (cell->cell_view->e_table_model,
-						cell->model_col, cell->row));
-		if (value)
-			gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, TRUE);
-		else
-			gal_a11y_e_cell_remove_state (cell, ATK_STATE_CHECKED, TRUE);
-	}
-}
-
-
-AtkObject* 
-gal_a11y_e_cell_toggle_new (ETableItem *item,
-			    ECellView  *cell_view,
-			    AtkObject  *parent,
-			    int         model_col,
-			    int         view_col,
-			    int         row)
-{
-	AtkObject *a11y;
-	GalA11yECell *cell;
-	GalA11yECellToggle *toggle_cell;
-	gint value;
-
-	a11y = ATK_OBJECT(g_object_new (GAL_A11Y_TYPE_E_CELL_TOGGLE, NULL));
-
-	g_return_val_if_fail (a11y != NULL, NULL);
-
-	cell = GAL_A11Y_E_CELL(a11y);
-	toggle_cell = GAL_A11Y_E_CELL_TOGGLE(a11y);
-	a11y->role  = ATK_ROLE_TABLE_CELL;
-
-        gal_a11y_e_cell_construct (a11y,
-                                   item,
-                                   cell_view,
-                                   parent,
-                                   model_col,
-                                   view_col,
-                                   row);
-
-	gal_a11y_e_cell_add_action (cell, 
-				    "toggle",	       /* action name*/
-				    "toggle the cell", /* action description */
-				    NULL,              /* action keybinding */
-				    toggle_cell_action);
-
-	toggle_cell->model_id = g_signal_connect (item->table_model,
-						  "model_cell_changed",
-						  (GCallback) model_change_cb,
-						  a11y);
-
-	value = GPOINTER_TO_INT (
-			e_table_model_value_at (cell->cell_view->e_table_model,
-                                                cell->model_col, cell->row));
-	if (value)
-		gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, FALSE);
-	else
-		gal_a11y_e_cell_remove_state (cell, ATK_STATE_CHECKED, FALSE);
-
-	return a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
deleted file mode 100644
index 06f9448e02..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __GAL_A11Y_E_CELL_TOGGLE_H__
-#define __GAL_A11Y_E_CELL_TOGGLE_H__
-
-#include <atk/atk.h>
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-e-cell-toggle.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_A11Y_TYPE_E_CELL_TOGGLE            (gal_a11y_e_cell_toggle_get_type ())
-#define GAL_A11Y_E_CELL_TOGGLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE, GalA11yECellToggle))
-#define GAL_A11Y_E_CELL_TOGGLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_E_CELL_TOGGLE, GalA11yECellToggleClass))
-#define GAL_A11Y_IS_E_CELL_TOGGLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE))
-#define GAL_A11Y_IS_E_CELL_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TOGGLE))
-#define GAL_A11Y_E_CELL_TOGGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE, GalA11yECellToggleClass))
-
-typedef struct _GalA11yECellToggle                  GalA11yECellToggle;
-typedef struct _GalA11yECellToggleClass             GalA11yECellToggleClass;
-
-struct _GalA11yECellToggle
-{
-  GalA11yECell parent;
-  gint         model_id;
-};
-
-GType gal_a11y_e_cell_toggle_get_type (void);
-
-struct _GalA11yECellToggleClass
-{
-  GalA11yECellClass parent_class;
-};
-
-AtkObject *gal_a11y_e_cell_toggle_new  (ETableItem *item,
-                                        ECellView  *cell_view,
-                                        AtkObject  *parent,
-                                        int         model_col,
-                                        int         view_col,
-                                        int         row);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_A11Y_E_CELL_TOGGLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
deleted file mode 100644
index e6ff75667b..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include <atk/atk.h>
-#include "gal-a11y-e-cell-tree.h"
-#include "gal-a11y-util.h"
-#include "gal/e-table/e-cell-tree.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree-table-adapter.h"
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTreeClass))
-static AtkObjectClass *a11y_parent_class;
-#define A11Y_PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-static void
-ectr_model_row_changed_cb (ETableModel *etm,
-			   gint row,
-			   GalA11yECell *a11y)
-{
-	ETreePath node;
-	ETreeModel *tree_model;
-	ETreeTableAdapter *tree_table_adapter;
-
-	g_return_if_fail (a11y);
-	if (a11y->row != row)
-		return;
-
-	node = e_table_model_value_at (etm, -1, a11y->row);
-	tree_model = e_table_model_value_at (etm, -2, a11y->row);
-	tree_table_adapter = e_table_model_value_at (etm, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		gboolean is_exp = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-		if (is_exp)
-			gal_a11y_e_cell_add_state (a11y, ATK_STATE_EXPANDED, TRUE);
-		else
-			gal_a11y_e_cell_remove_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_subcell_weak_ref (GalA11yECellTree *a11y,
-		       GalA11yECell     *subcell_a11y)
-{
-	g_signal_handler_disconnect (GAL_A11Y_E_CELL (a11y)->item->table_model,
-				     a11y->model_row_changed_id);
-	g_object_unref (a11y);
-}
-
-static void
-ectr_do_action_expand (AtkAction *action)
-{
-	GalA11yECell *a11y;
-	ETableModel *table_model;
-        ETreePath node;
-	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
-        
-        a11y = GAL_A11Y_E_CELL (action);
-	table_model = a11y->item->table_model;
-	node = e_table_model_value_at (table_model, -1, a11y->row);
-	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
-	tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		e_tree_table_adapter_node_set_expanded (tree_table_adapter,
-							node,
-							TRUE);
-		gal_a11y_e_cell_add_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_do_action_collapse (AtkAction *action)
-{
-	GalA11yECell *a11y;
-	ETableModel *table_model;
-        ETreePath node;
-	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
-        
-        a11y = GAL_A11Y_E_CELL (action);
-	table_model = a11y->item->table_model;
-        node = e_table_model_value_at (table_model, -1, a11y->row);
-	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
-        tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		e_tree_table_adapter_node_set_expanded (tree_table_adapter,
-							node,
-							FALSE);
-		gal_a11y_e_cell_remove_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_class_init (GalA11yECellTreeClass *klass)
-{
-	a11y_parent_class        = g_type_class_ref (A11Y_PARENT_TYPE);
-}
-
-static void
-ectr_init (GalA11yECellTree *a11y)
-{
-}
-
-GType
-gal_a11y_e_cell_tree_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellTreeClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ectr_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellTree),
-			0,
-			(GInstanceInitFunc) ectr_init,
-			NULL /* value_cell_text */
-		};
-
-		type = g_type_register_static (A11Y_PARENT_TYPE, "GalA11yECellTree", &info, 0);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_tree_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *subcell_a11y;
-	GalA11yECellTree *a11y;
-        GtkWidget *e_table;
-
-        ETreePath node;
-        ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
- 
-	ECellView *subcell_view;
-	subcell_view = e_cell_tree_view_get_subcell_view (cell_view);
-
-	if (subcell_view->ecell) {
-		subcell_a11y = gal_a11y_e_cell_registry_get_object (NULL,
-								    item,
-								    subcell_view,
-								    parent,
-								    model_col,
-								    view_col,
-								    row);
-		gal_a11y_e_cell_add_action (subcell_a11y,
-					    "expand",
-					    "expands the row in the ETree containing this cell",
-					    NULL,
-					    (ACTION_FUNC)ectr_do_action_expand);
-
-		gal_a11y_e_cell_add_action (subcell_a11y,
-					    "collapse",
-					    "collapses the row in the ETree containing this cell",
-					    NULL,
-					    (ACTION_FUNC)ectr_do_action_collapse);
-
-		/* init AtkStates for the cell's a11y object */
-		node = e_table_model_value_at (item->table_model, -1, row);
-		tree_model = e_table_model_value_at (item->table_model, -2, row);
-		tree_table_adapter = e_table_model_value_at (item->table_model, -3, row);
-		if (e_tree_model_node_is_expandable (tree_model, node)) {
-			gal_a11y_e_cell_add_state (subcell_a11y, ATK_STATE_EXPANDABLE, FALSE);
-			if (e_tree_table_adapter_node_is_expanded (tree_table_adapter, node))
-				gal_a11y_e_cell_add_state (subcell_a11y, ATK_STATE_EXPANDED, FALSE);
-		}
-	}
-	else
-		subcell_a11y = NULL;
-
-	/* create a companion a11y object, this object has type GalA11yECellTree
-	   and it connects to some signals to determine whether a tree cell is
-	   expanded or collapsed */
-	a11y = g_object_new (gal_a11y_e_cell_tree_get_type (), NULL);
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	a11y->model_row_changed_id =
-		g_signal_connect (item->table_model, "model_row_changed",
-				  G_CALLBACK (ectr_model_row_changed_cb),
-				  subcell_a11y);
-	g_object_weak_ref (subcell_a11y, ectr_subcell_weak_ref, a11y);
-
-	return subcell_a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
deleted file mode 100644
index 355670b5a4..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_CELL_TREE_H__
-#define __GAL_A11Y_E_CELL_TREE_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-tree.h>
-#include "gal-a11y-e-cell.h"
-
-#define GAL_A11Y_TYPE_E_CELL_TREE            (gal_a11y_e_cell_tree_get_type ())
-#define GAL_A11Y_E_CELL_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TREE, GalA11yECellTree))
-#define GAL_A11Y_E_CELL_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_TREE, GalA11yECellTreeClass))
-#define GAL_A11Y_IS_E_CELL_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TREE))
-#define GAL_A11Y_IS_E_CELL_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TREE))
-
-typedef struct _GalA11yECellTree GalA11yECellTree;
-typedef struct _GalA11yECellTreeClass GalA11yECellTreeClass;
-typedef struct _GalA11yECellTreePrivate GalA11yECellTreePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellTreePrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellTree {
-	GalA11yECell object;
-
-	int model_row_changed_id;
-};
-
-struct _GalA11yECellTreeClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_tree_get_type   (void);
-AtkObject *gal_a11y_e_cell_tree_new	   (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
deleted file mode 100644
index 34a7429cd5..0000000000
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal/e-table/e-table.h"
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkaction.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellClass))
-static GObjectClass *parent_class;
-#define PARENT_TYPE (atk_object_get_type ())
-
-
-#if 0
-static void
-unref_item (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
-	a11y->item = NULL;
-	g_object_unref (a11y);
-}
-
-static void
-unref_cell (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
-	a11y->cell_view = NULL;
-	g_object_unref (a11y);
-}
-#endif 
-
-static void
-eti_dispose (GObject *object)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
-
-#if 0
-	if (a11y->item)
-		g_object_unref (G_OBJECT (a11y->item));  /*, unref_item, a11y); */
-	if (a11y->cell_view)
-		g_object_unref (G_OBJECT (a11y->cell_view)); /*, unref_cell, a11y); */
-	if (a11y->parent)
-		g_object_unref (a11y->parent);
-#endif
-
-	if (a11y->state_set)
-		g_object_unref (a11y->state_set);
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-/* Static functions */
-static AtkStateSet *
-eti_ref_state_set (AtkObject *accessible)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL (accessible);
-	g_return_val_if_fail (cell->state_set, NULL);
-
-	g_object_ref(cell->state_set);
-	return cell->state_set;
-}
-
-static AtkObject*
-eti_get_parent (AtkObject *accessible)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (accessible);
-	return a11y->parent;
-}
-
-static gint
-eti_get_index_in_parent (AtkObject *accessible)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (accessible);
-
-	return a11y->row * a11y->item->cols + a11y->view_col;
-}
-
-
-/* Component IFace */
-static void
-eti_get_extents (AtkComponent *component,
-		gint *x,
-		gint *y,
-		gint *width,
-		gint *height,
-		AtkCoordType coord_type)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (component);
-	int row;
-	int col;
-	int xval;
-	int yval;
-
-	row = a11y->row;
-	col = a11y->view_col;
-
-
-	e_table_item_get_cell_geometry (a11y->item,
-					&row, 
-					&col,
-					&xval,
-					&yval,
-					width,
-					height);
-
-	atk_component_get_position (ATK_COMPONENT (a11y->parent),
-				    x, y, coord_type);
-	if (x && *x != G_MININT)
-		*x += xval;
-	if (y && *y != G_MININT)
-		*y += yval;
-}
-
-static gboolean
-eti_grab_focus (AtkComponent *component)
-{
-	GalA11yECell *a11y;
-	gint view_row;
-	GtkWidget *e_table, *toplevel;
-
-	a11y = GAL_A11Y_E_CELL (component);
-	e_table = gtk_widget_get_parent (GNOME_CANVAS_ITEM (a11y->item)->canvas);
-	view_row = e_table_view_to_model_row (E_TABLE (e_table), a11y->row);
-
-	e_selection_model_select_single_row (a11y->item->selection, view_row);
-	e_selection_model_change_cursor (a11y->item->selection, view_row, a11y->view_col);
-
-	gtk_widget_grab_focus (e_table);
-	toplevel = gtk_widget_get_toplevel (e_table);
-	if (GTK_WIDGET_TOPLEVEL (toplevel))
-		gtk_window_present (toplevel);
-}
-
-/* Table IFace */
-
-static void
-eti_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->get_extents = eti_get_extents;
-	iface->grab_focus  = eti_grab_focus;
-}
-
-static void
-eti_class_init (GalA11yECellClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose                 = eti_dispose;
-
-	atk_object_class->get_parent          = eti_get_parent;
-	atk_object_class->get_index_in_parent = eti_get_index_in_parent;
-	atk_object_class->ref_state_set       = eti_ref_state_set;
-}
-
-static void
-eti_init (GalA11yECell *a11y)
-{
-	a11y->item = NULL;
-	a11y->cell_view = NULL;
-	a11y->parent = NULL;
-	a11y->model_col = -1;
-	a11y->view_col = -1;
-	a11y->row = -1;
-
-	a11y->state_set = atk_state_set_new ();
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED);
-}
-
-
-static ActionInfo *
-_gal_a11y_e_cell_get_action_info (GalA11yECell *cell,
-                            gint     index)
-{
-	GList *list_node;
-                                                                                
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), NULL);
-	if (cell->action_list == NULL)
-		return NULL;
-	list_node = g_list_nth (cell->action_list, index);
-	if (!list_node)
-		return NULL;
-	return (ActionInfo *) (list_node->data);
-}
-
-static void
-_gal_a11y_e_cell_destroy_action_info (gpointer action_info,
-				      gpointer user_data)
-{
-	ActionInfo *info = (ActionInfo *)action_info;
-
-	g_return_if_fail (info != NULL);
-	g_free (info->name);
-	g_free (info->description);
-	g_free (info->keybinding);
-	g_free (info);
-}
-
-
-gboolean
-gal_a11y_e_cell_add_action ( GalA11yECell * cell,
-			     const gchar *action_name,
-			     const gchar *action_description,
-			     const gchar *action_keybinding,
-			     ACTION_FUNC action_func)
-{
-	ActionInfo *info;
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	info = g_new (ActionInfo, 1);
-                                                                              
-	if (action_name != NULL)
-		info->name = g_strdup (action_name);
-	else
-		info->name = NULL;
-
-	if (action_description != NULL)
-		info->description = g_strdup (action_description);
-	else
-		info->description = NULL;
-	if (action_keybinding != NULL)
-		info->keybinding = g_strdup (action_keybinding);
-	else
-		info->keybinding = NULL;
-	info->do_action_func = action_func;
-
-	cell->action_list = g_list_append (cell->action_list, (gpointer) info);
-	return TRUE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_action (GalA11yECell *cell,
-			       gint     action_index)
-{
-	GList *list_node;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	list_node = g_list_nth (cell->action_list, action_index);
-	if (!list_node)
-		return FALSE;
-	g_return_val_if_fail (list_node->data != NULL, FALSE);
-	_gal_a11y_e_cell_destroy_action_info (list_node->data, NULL);
-	cell->action_list = g_list_remove_link (cell->action_list, list_node);
-
-	return TRUE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
-				       const gchar *action_name)
-{
-	GList *list_node;
-	gboolean action_found= FALSE;
-                                                                               
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	for (list_node = cell->action_list; list_node && !action_found;
-          	          list_node = list_node->next) {
-		if (!g_strcasecmp (((ActionInfo *)(list_node->data))->name, action_name)) {
-			action_found = TRUE;
-			break;
-		}
-	}
-
-	g_return_val_if_fail (action_found, FALSE);
-	_gal_a11y_e_cell_destroy_action_info (list_node->data, NULL);
-	cell->action_list = g_list_remove_link (cell->action_list, list_node);
-
-	return TRUE;
-}
-
-static gint
-gal_a11y_e_cell_action_get_n_actions (AtkAction *action)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	if (cell->action_list != NULL)
-		return g_list_length (cell->action_list);
-	else
-		return 0;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_name (AtkAction *action,
-                           gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-                                                                                
-	if (info == NULL)
-		return NULL;
-	return info->name;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_description (AtkAction *action,
-					gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-
-	if (info == NULL)
-		return NULL;
-	return info->description;
-}
-
-static gboolean
-gal_a11y_e_cell_action_set_description (AtkAction   *action,
-					gint        index,
-					const gchar *desc)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-                                                                                
-	if (info == NULL)
-		return FALSE;
-	g_free (info->description);
-	info->description = g_strdup (desc);
-	return TRUE;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_keybinding (AtkAction *action,
-				       gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-	if (info == NULL)
-		return NULL;
-
-	return info->keybinding;
-}
-                                                                                
-static gboolean
-idle_do_action (gpointer data)
-{
-	GalA11yECell *cell;
-
-	cell = GAL_A11Y_E_CELL (data);
-	cell->action_idle_handler = 0;
-	cell->action_func (cell);
-                                                                                
-	return FALSE;
-}
-
-static gboolean
-gal_a11y_e_cell_action_do_action (AtkAction *action,
-				  gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-
-	if (info == NULL)
-		return FALSE;
-	g_return_val_if_fail (info->do_action_func, FALSE);
-	if (cell->action_idle_handler)
-		return FALSE;
-	cell->action_func = info->do_action_func;
-	cell->action_idle_handler = g_idle_add (idle_do_action, cell);
-
-	return TRUE;
-}
-
-static void
-gal_a11y_e_cell_atk_action_interface_init (AtkActionIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-                                                                                
-  iface->get_n_actions = gal_a11y_e_cell_action_get_n_actions;
-  iface->do_action = gal_a11y_e_cell_action_do_action;
-  iface->get_name = gal_a11y_e_cell_action_get_name;
-  iface->get_description = gal_a11y_e_cell_action_get_description;
-  iface->set_description = gal_a11y_e_cell_action_set_description;
-  iface->get_keybinding = gal_a11y_e_cell_action_get_keybinding;
-}
-
-void
-gal_a11y_e_cell_type_add_action_interface (GType type)
-{
-	static const GInterfaceInfo atk_action_info =
-	{
-	(GInterfaceInitFunc) gal_a11y_e_cell_atk_action_interface_init,
-	(GInterfaceFinalizeFunc) NULL,
-	NULL
-	};
-
-	g_type_add_interface_static (type, ATK_TYPE_ACTION,
-				     &atk_action_info);
-}
-
-gboolean
-gal_a11y_e_cell_add_state (GalA11yECell     *cell,
-			   AtkStateType state_type,
-			   gboolean     emit_signal)
-{
-	if (!atk_state_set_contains_state (cell->state_set, state_type)) {
-		gboolean rc;
-                                                                                
-		rc = atk_state_set_add_state (cell->state_set, state_type);
-		/*
-		 * The signal should only be generated if the value changed,
-		 * not when the cell is set up.  So states that are set
-		 * initially should pass FALSE as the emit_signal argument.
-		 */
-                                                                                
-		if (emit_signal) {
-			atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE);
-			/* If state_type is ATK_STATE_VISIBLE, additional 
-			   notification */
-			if (state_type == ATK_STATE_VISIBLE)
-				g_signal_emit_by_name (cell, "visible_data_changed");
-		}
-
-		return rc;
-	}
-	else
-		return FALSE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_state (GalA11yECell     *cell,
-			      AtkStateType state_type,
-			      gboolean     emit_signal)
-{
-	if (atk_state_set_contains_state (cell->state_set, state_type)) {
-		gboolean rc;
-                                                                                                                              
-		rc = atk_state_set_remove_state (cell->state_set, state_type);
-		/*
-		 * The signal should only be generated if the value changed,
-		 * not when the cell is set up.  So states that are set
-		 * initially should pass FALSE as the emit_signal argument.
-		 */
-
-		if (emit_signal) {
-			atk_object_notify_state_change (ATK_OBJECT (cell), state_type, FALSE);
-			/* If state_type is ATK_STATE_VISIBLE, additional notification */
-			if (state_type == ATK_STATE_VISIBLE)
-				g_signal_emit_by_name (cell, "visible_data_changed");
-		}
-
-		return rc;
-	}
-	else
-		return FALSE;
-}
-
-/**
- * gal_a11y_e_cell_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECell class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECell class.
- **/
-GType
-gal_a11y_e_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) eti_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECell),
-			0,
-			(GInstanceInitFunc) eti_init,
-			NULL /* value_cell */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) eti_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECell", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_new (ETableItem *item,
-		     ECellView  *cell_view,
-		     AtkObject  *parent,
-		     int         model_col,
-		     int         view_col,
-		     int         row)
-{
-	AtkObject *a11y;
-
-	a11y = g_object_new (gal_a11y_e_cell_get_type (), NULL);
-
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	return a11y;
-}
-
-void
-gal_a11y_e_cell_construct (AtkObject  *object,
-			   ETableItem *item,
-			   ECellView  *cell_view,
-			   AtkObject  *parent,
-			   int         model_col,
-			   int         view_col,
-			   int         row)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
-	a11y->item      = item;
-	a11y->cell_view = cell_view;
-	a11y->parent    = parent;
-	a11y->model_col = model_col;
-	a11y->view_col  = view_col;
-	a11y->row       = row;
-	ATK_OBJECT (a11y) ->role	= ATK_ROLE_TABLE_CELL;
-
-#if 0
-	if (parent)
-		g_object_ref (parent);
-
-	if (item)
-		g_object_ref (G_OBJECT (item)); /*,
-						  unref_item,
-						  a11y);*/
-	if (cell_view)
-		g_object_ref (G_OBJECT (cell_view)); /*,
-						  unref_cell,
-						  a11y);*/
-#endif
-}
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
deleted file mode 100644
index 53a6c0089d..0000000000
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_H__
-#define __GAL_A11Y_E_CELL_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL            (gal_a11y_e_cell_get_type ())
-#define GAL_A11Y_E_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL, GalA11yECell))
-#define GAL_A11Y_E_CELL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL, GalA11yECellClass))
-#define GAL_A11Y_IS_E_CELL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL))
-#define GAL_A11Y_IS_E_CELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL))
-
-typedef struct _GalA11yECell GalA11yECell;
-typedef struct _GalA11yECellClass GalA11yECellClass;
-typedef struct _GalA11yECellPrivate GalA11yECellPrivate;
-typedef struct _ActionInfo ActionInfo;
-typedef void (*ACTION_FUNC) (GalA11yECell *cell);
-
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECell {
-	AtkObject object;
-
-	ETableItem *item;
-	ECellView  *cell_view;
-	AtkObject  *parent;
-	int         model_col;
-	int         view_col;
-	int         row;
-	AtkStateSet *state_set;
-	GList       *action_list;
-	gint         action_idle_handler;
-	ACTION_FUNC  action_func;
-};
-
-struct _GalA11yECellClass {
-	AtkObjectClass parent_class;
-};
-
-struct _ActionInfo {
-	gchar *name;
-	gchar *description;
-	gchar *keybinding;
-	ACTION_FUNC do_action_func;
-};
-
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_get_type   (void);
-AtkObject *gal_a11y_e_cell_new        (ETableItem *item,
-				       ECellView  *cell_view,
-				       AtkObject  *parent,
-				       int         model_col,
-				       int         view_col,
-				       int         row);
-void       gal_a11y_e_cell_construct  (AtkObject  *object,
-				       ETableItem *item,
-				       ECellView  *cell_view,
-				       AtkObject  *parent,
-				       int         model_col,
-				       int         view_col,
-				       int         row);
-
-void	gal_a11y_e_cell_type_add_action_interface (GType type);
-                                                                                
-gboolean gal_a11y_e_cell_add_action	(GalA11yECell	*cell,
-				         const gchar     *action_name,
-					 const gchar     *action_description,
-					 const gchar     *action_keybinding,
-					 ACTION_FUNC     action_func);
-                                                                                
-gboolean gal_a11y_e_cell_remove_action	(GalA11yECell	*cell,
-                                         gint           action_id);
-                                                                                
-gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell        *cell,
-                                          	const gchar     *action_name);
-
-gboolean gal_a11y_e_cell_add_state     (GalA11yECell *cell,
-					AtkStateType state_type,
-					gboolean     emit_signal);
-
-gboolean gal_a11y_e_cell_remove_state  (GalA11yECell *cell,
-					AtkStateType state_type,
-					gboolean     emit_signal);
-
-
-#endif /* ! __GAL_A11Y_E_CELL_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c
deleted file mode 100644
index 14eaca3d19..0000000000
--- a/a11y/e-table/gal-a11y-e-table-factory.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-factory.h"
-#include "gal-a11y-e-table.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_table_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TABLE;
-}
-
-static AtkObject*
-gal_a11y_e_table_factory_create_accessible (GObject *obj)
-{
-	AtkObject *accessible;
-
-	accessible = gal_a11y_e_table_new (obj);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_table_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_table_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_table_factory_init (GalA11yETableFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_table_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableFactory class.
- **/
-GType
-gal_a11y_e_table_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETableFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_table_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_table_factory_init,
-			NULL /* value_table */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETableFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h
deleted file mode 100644
index eb8eb55414..0000000000
--- a/a11y/e-table/gal-a11y-e-table-factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_FACTORY_H__
-#define __GAL_A11Y_E_TABLE_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_FACTORY            (gal_a11y_e_table_factory_get_type ())
-#define GAL_A11Y_E_TABLE_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_FACTORY, GalA11yETableFactory))
-#define GAL_A11Y_E_TABLE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_FACTORY, GalA11yETableFactoryClass))
-#define GAL_A11Y_IS_E_TABLE_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_FACTORY))
-#define GAL_A11Y_IS_E_TABLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_FACTORY))
-
-typedef struct _GalA11yETableFactory GalA11yETableFactory;
-typedef struct _GalA11yETableFactoryClass GalA11yETableFactoryClass;
-
-struct _GalA11yETableFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETableFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_table_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
deleted file mode 100644
index c5fd5c410c..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-item-factory.h"
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-e-table.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-tree.h>
-#include <atk/atk.h>
-
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableItemFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_table_item_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TABLE_ITEM;
-}
-
-static AtkObject*
-gal_a11y_e_table_item_factory_create_accessible (GObject *obj)
-{
-	AtkObject * accessible;
-	ETableItem * eti;
-	GnomeCanvas * gc;
-	GtkWidget * table;
-
-	g_return_if_fail (E_IS_TABLE_ITEM(obj));
-	eti = E_TABLE_ITEM(obj);
-	gc = GNOME_CANVAS_ITEM(eti)->canvas;
-
-	table = gtk_widget_get_parent(GTK_WIDGET(gc));
-
-	accessible = gtk_widget_get_accessible (table);
-	accessible = atk_object_ref_accessible_child (accessible, 0);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_table_item_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_table_item_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_table_item_factory_init (GalA11yETableItemFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_table_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableFactory class.
- **/
-GType
-gal_a11y_e_table_item_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETableItemFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_table_item_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableItemFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_table_item_factory_init,
-			NULL /* value_table */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETableItemFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h
deleted file mode 100644
index cbbff9fb18..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item-factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Authors: *   Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
-#define __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
-#define GAL_A11Y_E_TABLE_ITEM_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactory))
-#define GAL_A11Y_E_TABLE_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactoryClass))
-#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
-#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
-
-typedef struct _GalA11yETableItemFactory GalA11yETableItemFactory;
-typedef struct _GalA11yETableItemFactoryClass GalA11yETableItemFactoryClass;
-
-struct _GalA11yETableItemFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETableItemFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_table_item_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
deleted file mode 100644
index fcfa1cc0e6..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ /dev/null
@@ -1,1285 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *   Bolian Yin <bolian.yin@sun.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table-subset.h>
-
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableItemClass))
-static GObjectClass *parent_class;
-static AtkComponentIface *component_parent_iface;
-static GType parent_type;
-static gint priv_offset;
-static GQuark		quark_accessible_object = 0;
-#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETableItemPrivate {
-	AtkObject *parent;
-	gint index_in_parent;
-	gint cols;
-	gint rows;
-	gpointer *cell_data;
-	int selection_change_id;
-	int cursor_change_id;
-	ETableCol ** columns;
-	ESelectionModel *selection;
-};
-
-static gboolean gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
-						     ESelectionModel *selection);
-static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
-
-#if 0
-static void
-unref_accessible (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
-	GET_PRIVATE (a11y)->item = NULL;
-	g_object_unref (a11y);
-}
-#endif
-
-inline static gint
-view_to_model_row(ETableItem *eti, int row)
-{
-	if (eti->uses_source_model) {
-		ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
-		if (row >= 0 && row < etss->n_map) {
-			eti->row_guess = row;
-			return etss->map_table[row];
-		} else
-			return -1;
-	} else
-		return row;
-}
-
-inline static gint
-view_to_model_col(ETableItem *eti, int col)
-{
-	ETableCol *ecol = e_table_header_get_column (eti->header, col);
-	return ecol ? ecol->col_idx : -1;
-}
-
-inline static GObject *
-eti_a11y_get_gobject (AtkObject *accessible)
-{
-	return atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible));
-}
-
-static void
-eti_dispose (GObject *object)
-{
-	gint i,j;
-	GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (object);
-	GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
-
-	priv->parent = NULL;
-
-	if ( priv->cell_data != NULL ) {
-		g_free(priv->cell_data);
-		priv->cell_data = NULL;
-	}
-
-	if (priv->columns) {
-		g_free(priv->columns);
-		priv->columns = NULL;
-	}
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-	if (priv->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-}
-
-/* Static functions */
-static AtkObject *
-eti_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GalA11yETableItem *a11y;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), NULL);
-	if (!eti_a11y_get_gobject (accessible))
-		/* defunct */
-		return NULL;
-
-	a11y = GAL_A11Y_E_TABLE_ITEM (accessible);
-	return GET_PRIVATE (a11y)->parent;
-}
-
-static gint
-eti_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), 0);
-	if (!eti_a11y_get_gobject (accessible))
-		return 0;
-
-	return atk_table_get_n_columns (ATK_TABLE (accessible)) *
-		atk_table_get_n_rows (ATK_TABLE (accessible));
-}
-
-static AtkObject*
-eti_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	ETableItem *item;
-	gint col, row;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), NULL);
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (accessible));
-	if (!item)
-		return NULL;
-
-	if (index < item->cols) {
-		AtkObject *child;
-
-		/* A column header is required */
-		child = atk_table_get_column_header (ATK_TABLE (accessible), index);
-		if (child)
-			g_object_ref (child);
-		return child;
-	}
-
-	index -= item->cols;
-	col = index % item->cols;
-	row = index / item->cols;
-
-	return atk_table_ref_at (ATK_TABLE (accessible), row, col);
-}
-
-static gint
-eti_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GalA11yETableItem *a11y;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), -1);
-	if (!eti_a11y_get_gobject (accessible))
-		return -1;
-
-	a11y = GAL_A11Y_E_TABLE_ITEM (accessible);
-	return GET_PRIVATE (a11y)->index_in_parent;
-}
-
-static void
-eti_get_extents (AtkComponent *component,
-		 gint *x,
-		 gint *y,
-		 gint *width,
-		 gint *height,
-		 AtkCoordType coord_type)
-{
-	ETableItem *item;
-	double real_width;
-	double real_height;
-	int fake_width;
-	int fake_height;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (component)));
-	if (!item)
-		return;
-
-	if (component_parent_iface &&
-	    component_parent_iface->get_extents)
-		component_parent_iface->get_extents (component,
-						     x,
-						     y,
-						     &fake_width,
-						     &fake_height,
-						     coord_type);
-
-	gtk_object_get (GTK_OBJECT (item),
-			"width", &real_width,
-			"height", &real_height,
-			NULL);
-
-	if (width)
-		*width = real_width;
-	if (height) 
-		*height = real_height;
-}
-
-static AtkObject*
-eti_ref_accessible_at_point (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	int row = -1;
-	int col = -1;
-	int x_origin, y_origin;
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (component)));
-	if (!item)
-		return;
-
-	atk_component_get_position (component,
-				    &x_origin,
-				    &y_origin,
-				    coord_type);
-	x -= x_origin;
-	y -= y_origin;
-
-	e_table_item_compute_location (item, &x, &y,
-				       &row, &col);
-
-	if (row != -1 && col != -1) {
-		return atk_table_ref_at (ATK_TABLE (component), row, col);
-	} else {
-		return NULL;
-	}
-}
-
-
-static void
-cell_destroyed (gpointer data)
-{
-	AtkObject *parent;
-	gint index, n_cols;
-	GalA11yETableItem * item;
-	GalA11yECell * cell;
-
-	g_return_if_fail (GAL_A11Y_IS_E_CELL (data));
-	cell = GAL_A11Y_E_CELL (data);
-		
-	item =	atk_gobject_accessible_for_object (GAL_A11Y_E_CELL(data)->item);
-
-	g_return_if_fail (item && GAL_A11Y_IS_E_TABLE_ITEM (item));
-
-	g_return_if_fail (cell->row < GET_PRIVATE(item)->rows && cell->view_col < GET_PRIVATE(item)->cols);
-
-	index = cell->row * cell->item->cols + cell->view_col;
-                                                                   
-	if (GET_PRIVATE (item)->cell_data && GET_PRIVATE (item)->cell_data [index] == data)
-		GET_PRIVATE (item)->cell_data [index] = NULL;
-}
-
-/* atk table */
-static AtkObject*
-eti_ref_at (AtkTable *table, gint row, gint column)
-{
-	ETableItem *item;
-	AtkObject* ret;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	if (column >= 0 &&
-	    column < item->cols &&
-	    row >= 0 &&
-	    row < item->rows &&
-	    item->cell_views_realized) {
-		ECellView *cell_view = item->cell_views[column];
-		ETableCol *ecol = e_table_header_get_column (item->header, column);
-		gpointer * cell_data;
-
-		cell_data = GET_PRIVATE (table)->cell_data;
-
-		if (cell_data[row*item->cols + column] == NULL) {
-			ret = gal_a11y_e_cell_registry_get_object (NULL,
-							    item,
-							    cell_view,
-							    ATK_OBJECT (table),
-							    ecol->col_idx,
-							    column,
-							    row);
-			cell_data[row*item->cols + column] = ret;
-			if (ATK_IS_OBJECT (ret))
-				g_object_weak_ref (G_OBJECT (ret),
-						   (GWeakNotify) cell_destroyed,
-						   ret);
-
-			else
-				ret = NULL;
-		} else {
-			ret = (AtkObject *) cell_data[row*item->cols + column];
-			if (ATK_IS_OBJECT (ret)) {
-				g_object_ref (ret);
-			} else { 
-				ret = NULL;
-			}
-		}
-
-
-		return ret;
-	}
-
-	return NULL;
-}
-
-static gint
-eti_get_index_at (AtkTable *table, gint row, gint column)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return column + row * item->cols;
-}
-
-static gint
-eti_get_column_at_index (AtkTable *table, gint index)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return index % item->cols;
-}
-
-static gint
-eti_get_row_at_index (AtkTable *table, gint index)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return index / item->cols;
-}
-
-static gint
-eti_get_n_columns (AtkTable *table)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return item->cols;
-}
-
-static gint
-eti_get_n_rows (AtkTable *table)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return item->rows;
-}
-
-static gint
-eti_get_column_extent_at (AtkTable *table,
-			  gint row,
-			  gint column)
-{
-	ETableItem *item;
-	int width;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	e_table_item_get_cell_geometry (item,
-					&row, 
-					&column,
-					NULL,
-					NULL,
-					&width,
-					NULL);
-
-	return width;
-}
-
-static gint
-eti_get_row_extent_at (AtkTable *table,
-		       gint row,
-		       gint column)
-{
-	ETableItem *item;
-	int height;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	e_table_item_get_cell_geometry (item,
-					&row, 
-					&column,
-					NULL,
-					NULL,
-					NULL,
-					&height);
-
-	return height;
-}
-
-static AtkObject *
-eti_get_caption (AtkTable *table)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar *
-eti_get_column_description (AtkTable *table,
-			    gint column)
-{
-	ETableItem *item;
-	ETableCol *ecol;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	ecol = e_table_header_get_column (item->header, column);
-
-	return ecol->text;
-}
-
-static AtkObject *
-eti_get_column_header (AtkTable *table, gint column)
-{
-	ETableItem *item;
-	ETableCol *ecol;
-	AtkObject *atk_obj = NULL;
-	ECell *ecell;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	ecol = e_table_header_get_column (item->header, column);
-	ecell = ecol->ecell;
-	if (ecell)
-		atk_obj = atk_gobject_accessible_for_object (G_OBJECT (ecell));
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar *
-eti_get_row_description (AtkTable *table,
-			 gint row)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static AtkObject *
-eti_get_row_header (AtkTable *table,
-		    gint row)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static AtkObject *
-eti_get_summary (AtkTable *table)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gboolean 
-table_is_row_selected (AtkTable *table, gint row)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	return e_selection_model_is_row_selected(item->selection, row);
-}
-
-static gboolean 
-table_is_selected (AtkTable *table, gint row, gint column)
-{
-	return table_is_row_selected (table, row);
-}
-
-static gint
-table_get_selected_rows (AtkTable *table, gint **rows_selected)
-{
-	ETableItem *item;
-	gint n_selected, row, index_selected;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return 0;
-
-	n_selected = e_selection_model_selected_count (item->selection);
-	if (rows_selected) {
-		*rows_selected = (gint *) g_malloc (n_selected * sizeof (gint));
-
-		index_selected = 0;
-		for (row = 0; row < item->rows && index_selected < n_selected; ++row) {
-			if (atk_table_is_row_selected (table, row)) {
-				(*rows_selected)[index_selected] = row;
-				++index_selected;
-			}
-		}
-	}
-	return n_selected;
-}
-
-static gboolean 
-table_add_row_selection (AtkTable *table, gint row)
-{
-	ETableItem *item;
-	gint cursor_row, cursor_col, row_count;
-	GdkModifierType state = GDK_CONTROL_MASK;
-	ESelectionModel *selection;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	if (table_is_row_selected (table, row))
-		return TRUE;
-	e_selection_model_toggle_single_row (item->selection,
-					     view_to_model_row (item, row));
-
-	return TRUE;
-}
-
-static gboolean 
-table_remove_row_selection (AtkTable *table, gint row)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	if (!atk_table_is_row_selected (table, row))
-		return TRUE;
-	e_selection_model_toggle_single_row (item->selection, row);
-	return TRUE;
-}
-
-static void
-eti_atk_table_iface_init (AtkTableIface *iface)
-{
-	iface->ref_at = eti_ref_at;
-	iface->get_index_at = eti_get_index_at;
-	iface->get_column_at_index = eti_get_column_at_index;
-	iface->get_row_at_index = eti_get_row_at_index;
-	iface->get_n_columns = eti_get_n_columns;
-	iface->get_n_rows = eti_get_n_rows;
-	iface->get_column_extent_at = eti_get_column_extent_at;
-	iface->get_row_extent_at = eti_get_row_extent_at;
-	iface->get_caption = eti_get_caption;
-	iface->get_column_description = eti_get_column_description;
-	iface->get_column_header = eti_get_column_header;
-	iface->get_row_description = eti_get_row_description;
-	iface->get_row_header = eti_get_row_header;
-	iface->get_summary = eti_get_summary;
-
-	iface->is_row_selected = table_is_row_selected;
-	iface->is_selected = table_is_selected;
-	iface->get_selected_rows = table_get_selected_rows;
-	iface->add_row_selection = table_add_row_selection;
-	iface->remove_row_selection = table_remove_row_selection;
-}
-
-static void
-eti_atk_component_iface_init (AtkComponentIface *iface)
-{
-	component_parent_iface         = g_type_interface_peek_parent (iface);
-
-	iface->ref_accessible_at_point = eti_ref_accessible_at_point;
-	iface->get_extents             = eti_get_extents;
-}
-
-static void
-eti_rows_inserted (ETableModel * model, int row, int count, 
-		   AtkObject * table_item)
-{
-	gint n_cols,n_rows,i,j;
-	gint size;
-	gpointer *cell_data;
-	ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item)));
-	GalA11yETableItem * item_a11y;
-	gint old_nrows;
-
-	g_return_if_fail (table_item);
- 	item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item);
-
-        n_cols = atk_table_get_n_columns (ATK_TABLE(table_item));
-	n_rows = atk_table_get_n_rows (ATK_TABLE(table_item));
-
-	old_nrows = GET_PRIVATE(item_a11y)->rows;
-	
-	g_return_if_fail (n_cols > 0 && n_rows > 0);
-	g_return_if_fail (old_nrows == n_rows - count);
-
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-	GET_PRIVATE(table_item)->cell_data = g_realloc (cell_data, (n_rows*n_cols) * sizeof(gpointer));
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-
-	GET_PRIVATE(table_item)->rows = n_rows; 
-
-	/* If rows are insert in the middle of a table. */
-	if (row + count < n_rows ) {
-		memmove(&cell_data[(row+count)*n_cols], &cell_data[row*n_cols],
-			(old_nrows-row)*n_cols*sizeof(gpointer));
-
-		/* Update cell's index. */
-		for (i = row + count; i < n_rows; i ++) {
-			for (j = 0; j < n_cols; j ++)
-				if (cell_data[i*n_cols + j] != NULL) {
-					AtkObject * a11y;
-
-					a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-                                        GAL_A11Y_E_CELL(a11y)->row = i;
-				}
-		}
-	}
-
-	/* Clear cache for the new added rows. */
-	for (i = row ; i < row+count; i ++)
-		for (j = 0 ;  j < n_cols; j ++)
-			cell_data [i*n_cols + j] = NULL;
-
-	g_signal_emit_by_name (table_item, "row-inserted", row,
-			       count, NULL);
-
-        for (i = row; i < (row + count); i ++) {
-                for (j = 0; j < n_cols; j ++) {
-			g_signal_emit_by_name (table_item,
-					       "children_changed::add",
-                                               ( (i*n_cols) + j), NULL, NULL);
-		}
-        }
-
-	g_signal_emit_by_name (table_item, "visible-data-changed");
-}
-
-static void
-eti_rows_deleted (ETableModel * model, int row, int count, 
-		  AtkObject * table_item)
-{
-	gint i,j, n_rows, n_cols, old_nrows;
-	gpointer *cell_data;
-	ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item)));
-	
-	n_rows = atk_table_get_n_rows (ATK_TABLE(table_item));
-        n_cols = atk_table_get_n_columns (ATK_TABLE(table_item));
-
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-	old_nrows = GET_PRIVATE(table_item)->rows;
-
-	g_return_if_fail ( row+count <= old_nrows);
-	g_return_if_fail (old_nrows == n_rows + count);
-	GET_PRIVATE(table_item)->rows = n_rows;
-
-	/* DEFUNCT the deleted cells. */
-	for (i = row; i < row+count; i ++) {
-		for (j = 0; j < n_cols; j ++) {
-			if (cell_data[i*n_cols + j] != NULL) {
-				AtkObject * a11y;
-
-				a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-				gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL(a11y), ATK_STATE_DEFUNCT, TRUE);
-				cell_data[i*n_cols + j] = NULL;
-			}
-		}
-	}
-
-	/* If more rows left, update the a11y object. */
-	if (old_nrows > row + count) {
-
-		/* Remove the defunct cells in cache. */
-		memmove (&cell_data[row*n_cols], &cell_data[(row+count)*n_cols],
-			( old_nrows-row-count)*n_cols*sizeof(gpointer));
-
-		GET_PRIVATE(table_item)->cell_data = g_realloc (cell_data, n_rows*n_cols*sizeof(gpointer));
-		cell_data = GET_PRIVATE(table_item)->cell_data;
-
-		/* Update index of cells below the deleted rows. */
-		for (i = row; i < n_rows; i ++) {
-			for (j = 0; j < n_cols; j ++) {
-				if (cell_data[i*n_cols + j] != NULL) {
-					AtkObject * a11y;
-
-					a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-					GAL_A11Y_E_CELL(a11y)->row = i;
-				}
-			}
-		}
-	}
-
-	g_signal_emit_by_name (table_item, "row-deleted", row,
-			       count, NULL);
-
-        for (i = row; i < (row + count); i ++) {
-                for (j = 0; j < n_cols; j ++) {
-			g_signal_emit_by_name (table_item,
-					       "children_changed::remove",
-                                               ( (i*n_cols) + j), NULL, NULL);
-		}
-        }
-	g_signal_emit_by_name (table_item, "visible-data-changed");
-}
-
-enum {
-        ETI_HEADER_UNCHANGED = 0,
-        ETI_HEADER_REORDERED,
-        ETI_HEADER_NEW_ADDED,
-        ETI_HEADER_REMOVED,
-};
-                                                                                
-/*
- * 1. Check what actually happened: column reorder, remove or add
- * 2. Update cache
- * 3. Emit signals
- */
-static void
-eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
-{
-                                                                                
-        gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE;
-        GalA11yETableItem * a11y_item;
-        ETableCol ** cols, **prev_cols;
-        GalA11yETableItemPrivate *priv;
-        gint *state = NULL, *prev_state = NULL, *reorder = NULL;
-        gint i,j,n_rows,n_cols, prev_n_cols;
-        gpointer * cell_data, * tmp;
-                                                                                
-        a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y);
-        priv = GET_PRIVATE (a11y_item);
-                                                                                
-	g_return_if_fail (priv && priv->cell_data);
-	cell_data = priv->cell_data ;
-
-	/* Assume rows do not changed. */
-        n_rows = priv->rows;
-
-        prev_n_cols = priv->cols;
-        prev_cols = priv->columns;
-
-        cols = e_table_header_get_columns (eth);
-	n_cols = eth->col_count;
-                                                                                
-        g_return_if_fail (cols && prev_cols && n_cols > 0);
-                                                                                
-        /* Init to ETI_HEADER_UNCHANGED. */
-        state = g_malloc0 (sizeof (gint) * n_cols);
-        prev_state = g_malloc0 (sizeof (gint) * prev_n_cols);
-        reorder = g_malloc0 (sizeof (gint) * n_cols);
-
-        /* Compare with previously saved column headers. */
-        for ( i = 0 ; i < n_cols && cols[i]; i ++ ) {
-                for ( j = 0 ; j < prev_n_cols && prev_cols[j]; j ++ ) {
-                        if ( prev_cols [j] == cols[i] && i != j ) {
-
-                                reorder_found = TRUE;
-                                state [i] = ETI_HEADER_REORDERED;
-				reorder [i] = j;
-
-                                break;
-                        } else if (prev_cols[j] == cols[i]) {
-                                /* OK, this column is not changed. */
-                                break;
-                        }
-                }
-                                                                                
-                /* cols[i] is new added column. */
-                if ( j == prev_n_cols ) {
-			gint row;
-
-			added_found = TRUE;
-                        state[i] = ETI_HEADER_NEW_ADDED;
-                }
-        }
-
-        /* Now try to find if there are removed columns. */
-        for (i = 0 ; i < prev_n_cols && prev_cols[i]; i ++) {
-                for (j = 0 ; j < n_cols && cols[j]; j ++)
-                        if ( prev_cols [j] == cols[i] )
-				break;
-                                                                                
-                /* Removed columns found. */
-                if ( j == n_cols ) {
-			removed_found = TRUE;
-			prev_state[j] = ETI_HEADER_REMOVED;
-                }
-        }
-
-	/* If nothing interesting just return. */
-	if (!reorder_found && !added_found && !removed_found)
-		return;
-
-	/* Now update our cache. */
-	tmp = g_malloc0 (n_rows*n_cols*sizeof(gpointer));
-	g_return_if_fail (tmp);
-
-	for (i = 0 ; i < n_rows; i ++) {
-		for ( j = 0 ; j < n_cols; j ++ ) {
-			if ( state[j] == ETI_HEADER_REORDERED ) {
-				tmp [i*n_cols+j] = cell_data[i*prev_n_cols+reorder[j]];
-				if (tmp[i*n_cols+j] &&  ATK_IS_OBJECT(tmp[i*n_cols+j])) {
-					GAL_A11Y_E_CELL(tmp[i*n_cols+j])->view_col = j;
-				}
-			} else if (state[j] == ETI_HEADER_UNCHANGED) {
-				tmp [i*n_cols+j] = cell_data[i*prev_n_cols+j];
-			} /* else: new added, keep NULL. */
-		}
-	}
-
-	g_free (cell_data);
-	priv->cell_data = tmp;
-
-	/* Emit signals */
-	if (reorder_found)
-        	g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
-
-
-	if (removed_found) {
-		for (i = 0; i < prev_n_cols; i ++ ) {
-			if (prev_state[i] == ETI_HEADER_REMOVED) {
-				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-deleted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
-					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::remove", (j*prev_n_cols+i), NULL, NULL);
-			}
-		}
-	}
-
-	if (added_found) {
-		for ( i = 0; i < n_cols; i ++ ) {
-			if (state[i] == ETI_HEADER_NEW_ADDED) {
-				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-inserted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
-					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::add", (j*n_cols+i), NULL, NULL);
-			}
-		}
-	}
-
-	priv->cols = n_cols;
-
-	g_free (state);
-	g_free (reorder);
-	g_free (prev_state);
-
-	g_free (priv->columns);
-	priv->columns = cols;
-}
-
-
-static void
-eti_real_initialize (AtkObject *obj, 
-		     gpointer data)
-{
-	ETableItem * eti;
-	ETableModel * model;
-
-	ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
-	eti = E_TABLE_ITEM (data);
-
-	model = eti->table_model;
-
-	g_signal_connect (model, "model-rows-inserted",
-			  G_CALLBACK (eti_rows_inserted),
-			  obj);
-	g_signal_connect (model, "model-rows-deleted",
-			  G_CALLBACK (eti_rows_deleted),
-			  obj);
-	g_signal_connect (G_OBJECT (eti->header), "structure_change",
-			  G_CALLBACK (eti_header_structure_changed), obj);
-
-}
-
-static void
-eti_class_init (GalA11yETableItemClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	quark_accessible_object               = g_quark_from_static_string ("gtk-accessible-object");
-
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose                 = eti_dispose;
-
-	atk_object_class->get_parent          = eti_get_parent;
-	atk_object_class->get_n_children      = eti_get_n_children;
-	atk_object_class->ref_child           = eti_ref_child;
-	atk_object_class->get_index_in_parent = eti_get_index_in_parent;
-	atk_object_class->initialize	      = eti_real_initialize;
-}
-
-static void
-eti_init (GalA11yETableItem *a11y)
-{
-	GalA11yETableItemPrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->parent = NULL;
-	priv->index_in_parent = -1;
-	priv->selection_change_id = 0;
-	priv->cursor_change_id = 0;
-	priv->selection = NULL;
-}
-
-/* atk selection */
-
-static void             atk_selection_interface_init    (AtkSelectionIface      *iface);
-static gboolean         selection_add_selection    (AtkSelection           *selection,
-						    gint                   i);
-static gboolean         selection_clear_selection  (AtkSelection           *selection);
-static AtkObject*       selection_ref_selection    (AtkSelection           *selection,
-						    gint                   i);
-static gint             selection_get_selection_count (AtkSelection           *selection);
-static gboolean         selection_is_child_selected (AtkSelection           *selection,
-						     gint                   i);
-
-/* callbacks */
-static void eti_a11y_selection_model_removed_cb (ETableItem *eti,
-						 ESelectionModel *selection,
-						 gpointer data);
-static void eti_a11y_selection_model_added_cb (ETableItem *eti,
-					       ESelectionModel *selection,
-					       gpointer data);
-static void eti_a11y_selection_changed_cb (ESelectionModel *selection,
-					   GalA11yETableItem *a11y);
-static void eti_a11y_cursor_changed_cb (ESelectionModel *selection,
-					int row, int col,
-					GalA11yETableItem *a11y);
-
-/**
- * gal_a11y_e_table_item_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableItem class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableItem class.
- **/
-GType
-gal_a11y_e_table_item_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETableItemClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) eti_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableItem),
-			0,
-			(GInstanceInitFunc) eti_init,
-			NULL /* value_table_item */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) eti_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) eti_atk_table_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETableItem", &info, 0,
-								   sizeof (GalA11yETableItemPrivate), &priv_offset);
-
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE, &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION, &atk_selection_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_table_item_new (AtkObject *parent,
-			   ETableItem *item,
-			   int index_in_parent)
-{
-	GalA11yETableItem *a11y;
-	int n;
-
-	a11y = g_object_new (gal_a11y_e_table_item_get_type (), NULL);
-
-	atk_object_initialize (ATK_OBJECT (a11y), item);
-
-	GET_PRIVATE (a11y)->parent = parent;
-	GET_PRIVATE (a11y)->index_in_parent = index_in_parent;
-
-	g_return_val_if_fail (item->cols >= 0 && item->rows >= 0, NULL);
-	/* Initialize cell data. */
-	n = item->cols * item->rows;
-	GET_PRIVATE (a11y)->cols = item->cols;
-	GET_PRIVATE (a11y)->rows = item->rows;
-	if (n > 0) {
-		GET_PRIVATE (a11y)->cell_data = g_malloc0(n*sizeof(gpointer));
-		/* memory error. */
-		if ( GET_PRIVATE (a11y)->cell_data == NULL)
-			return NULL;
-	} else
-		GET_PRIVATE (a11y)->cell_data = NULL;
-		
-
-        GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header);                                                                                
-        if ( GET_PRIVATE (a11y)->columns == NULL)
-                return NULL;
-
-	if (item) {
-		g_signal_connect (G_OBJECT(item), "selection_model_removed",
-				  G_CALLBACK (eti_a11y_selection_model_removed_cb), NULL);
-		g_signal_connect (G_OBJECT(item), "selection_model_added",
-				  G_CALLBACK (eti_a11y_selection_model_added_cb), NULL);
-		if (item->selection)
-			gal_a11y_e_table_item_ref_selection (a11y,
-							     item->selection);
-	}
-	if (parent)
-		g_object_ref (parent);
-
-#if 0
-	if (item)
-		g_object_weak_ref (G_OBJECT (item),
-				   unref_accessible,
-				   a11y);
-#endif
-
-	return ATK_OBJECT (a11y);
-}
-
-static gboolean
-gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
-				     ESelectionModel *selection)
-{
-	GalA11yETableItemPrivate *priv;
-
-	g_return_val_if_fail (a11y && selection, FALSE);
-
-	priv = GET_PRIVATE (a11y);
-	priv->selection_change_id = g_signal_connect (
-	    G_OBJECT(selection), "selection_changed",
-	    G_CALLBACK (eti_a11y_selection_changed_cb), a11y);
-	priv->cursor_change_id = g_signal_connect (
-            G_OBJECT(selection), "cursor_changed",
-	    G_CALLBACK (eti_a11y_cursor_changed_cb), a11y);
-
-	priv->selection = selection;
-	g_object_ref (selection);
-
-	return TRUE;
-}
-
-static gboolean
-gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y)
-{
-	GalA11yETableItemPrivate *priv;
-
-	g_return_val_if_fail (a11y, FALSE);
-
-	priv = GET_PRIVATE (a11y);
-
-	g_return_val_if_fail (priv->selection_change_id != 0, FALSE);
-	g_return_val_if_fail (priv->cursor_change_id != 0, FALSE);
-
-
-	g_signal_handler_disconnect (priv->selection,
-				     priv->selection_change_id);
-	g_signal_handler_disconnect (priv->selection,
-				     priv->cursor_change_id);
-	priv->cursor_change_id = 0;
-	priv->selection_change_id = 0;
-
-	g_object_unref (priv->selection);
-	priv->selection = NULL;
-
-	return TRUE;
-}
-
-/* callbacks */
-
-static void
-eti_a11y_selection_model_removed_cb (ETableItem *eti, ESelectionModel *selection,
-				     gpointer data)
-{
-	AtkObject *atk_obj;
-	GalA11yETableItem *a11y;
-
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	g_return_if_fail (E_IS_SELECTION_MODEL (selection));
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (eti));
-	a11y = GAL_A11Y_E_TABLE_ITEM (atk_obj);
-
-	if (selection == GET_PRIVATE (a11y)->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-}
-
-static void
-eti_a11y_selection_model_added_cb (ETableItem *eti, ESelectionModel *selection,
-				   gpointer data)
-{
-	AtkObject *atk_obj;
-	GalA11yETableItem *a11y;
-
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	g_return_if_fail (E_IS_SELECTION_MODEL (selection));
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (eti));
-	a11y = GAL_A11Y_E_TABLE_ITEM (atk_obj);
-
-	if (GET_PRIVATE (a11y)->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-	gal_a11y_e_table_item_ref_selection (a11y, selection);
-}
-
-static void
-eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a11y)
-{
-	g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y));
-
-	g_signal_emit_by_name (a11y, "selection_changed");
-}
-
-static void
-eti_a11y_cursor_changed_cb (ESelectionModel *selection,
-			    int row, int col,  GalA11yETableItem *a11y)
-{
-	AtkObject * cell;
-	g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y));
-
-	g_signal_emit_by_name (a11y, "selection_changed");
-
-        cell = atk_table_ref_at (ATK_TABLE (a11y), row, col);
-        if (ATK_IS_OBJECT (cell))
-                g_signal_emit_by_name  (a11y,
-                                        "active-descendant-changed",
-                                        cell);
-}
-
-/* atk selection */
-
-static void atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-	iface->add_selection = selection_add_selection;
-	iface->clear_selection = selection_clear_selection;
-	iface->ref_selection = selection_ref_selection;
-	iface->get_selection_count = selection_get_selection_count;
-	iface->is_child_selected = selection_is_child_selected;
-}
-
-static gboolean
-selection_add_selection (AtkSelection *selection, gint index)
-{
-	AtkTable *table;
-	gint row, col;
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (selection)));
-	if (!item)
-		return FALSE;
-
-	table = ATK_TABLE (selection);
-
-	row = atk_table_get_row_at_index (table, index);
-	atk_table_add_row_selection (table, row);
-
-	col = atk_table_get_column_at_index (table, index);
-	e_selection_model_change_cursor (item->selection,
-					 view_to_model_row (item, row),
-					 view_to_model_col (item, col));
-	e_selection_model_cursor_changed (item->selection,
-					  view_to_model_row (item, row),
-					  view_to_model_col (item, col));
-	e_selection_model_cursor_activated (item->selection,
-					    view_to_model_row (item, row),
-					    view_to_model_col (item, col));
-	return TRUE;
-}
-
-static gboolean
-selection_clear_selection (AtkSelection *selection)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (selection)));
-	if (!item)
-		return FALSE;
-
-	e_selection_model_clear (item->selection);
-	return TRUE;
-}
-
-static AtkObject *
-selection_ref_selection (AtkSelection *selection, gint index)
-{
-	AtkTable *table;
-	gint row, col;
-
-	table = ATK_TABLE (selection);
-	row = atk_table_get_row_at_index (table, index);
-	col = atk_table_get_column_at_index (table, index);
-	if (!atk_table_is_row_selected (table, row))
-		return NULL;
-
-	return atk_table_ref_at (table, row, col);
-}
-
-static gint
-selection_get_selection_count (AtkSelection *selection)
-{
-	AtkTable *table;
-	gint n_selected;
-
-	table = ATK_TABLE (selection);
-	n_selected = atk_table_get_selected_rows (table, NULL);
-	if (n_selected > 0)
-		n_selected *= atk_table_get_n_columns (table);
-	return n_selected;
-}
-
-static gboolean
-selection_is_child_selected (AtkSelection *selection, gint i)
-{
-	gint row;
-
-	row = atk_table_get_row_at_index (ATK_TABLE (selection), i);
-	return atk_table_is_row_selected (ATK_TABLE (selection), row);
-}
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
deleted file mode 100644
index f3a447131d..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_ITEM_H__
-#define __GAL_A11Y_E_TABLE_ITEM_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_ITEM            (gal_a11y_e_table_item_get_type ())
-#define GAL_A11Y_E_TABLE_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM, GalA11yETableItem))
-#define GAL_A11Y_E_TABLE_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM, GalA11yETableItemClass))
-#define GAL_A11Y_IS_E_TABLE_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM))
-#define GAL_A11Y_IS_E_TABLE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM))
-
-typedef struct _GalA11yETableItem GalA11yETableItem;
-typedef struct _GalA11yETableItemClass GalA11yETableItemClass;
-typedef struct _GalA11yETableItemPrivate GalA11yETableItemPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETableItemPrivate comes right after the parent class structure.
- **/
-struct _GalA11yETableItem {
-	AtkGObjectAccessible parent;
-};
-
-struct _GalA11yETableItemClass {
-	AtkGObjectAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_table_item_get_type  (void);
-AtkObject *gal_a11y_e_table_item_new       (AtkObject  *parent,
-					    ETableItem *item,
-					    int         index_in_parent);
-
-#endif /* ! __GAL_A11Y_E_TABLE_ITEM_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
deleted file mode 100644
index 6cd87f41c6..0000000000
--- a/a11y/e-table/gal-a11y-e-table.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table.h"
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-group-leaf.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass))
-static AtkObjectClass *parent_class;
-static GType parent_type;
-static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETablePrivate {
-	AtkObject *child_item;
-};
-
-/* Static functions */
-
-static void
-init_child_item (GalA11yETable *a11y)
-{
-	GalA11yETablePrivate *priv = GET_PRIVATE (a11y);
-	ETable *table = E_TABLE (GTK_ACCESSIBLE (a11y)->widget);
-	if (priv->child_item == NULL) {
-		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y), E_TABLE_GROUP_LEAF (table->group)->item, 0);
-		priv->child_item->role = ATK_ROLE_TABLE;
-	}
-}
-
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	GalA11yETable *a11y = GAL_A11Y_E_TABLE (component);
-	init_child_item (a11y);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static gint
-et_get_n_children (AtkObject *accessible)
-{
-	return 1;
-}
-
-static AtkObject*
-et_ref_child (AtkObject *accessible,
-	      gint i)
-{
-	GalA11yETable *a11y = GAL_A11Y_E_TABLE (accessible);
-	if (i != 0)
-		return NULL;
-	init_child_item (a11y);
-	g_object_ref (GET_PRIVATE (a11y)->child_item);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static void
-et_class_init (GalA11yETableClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-	parent_class                              = g_type_class_ref (PARENT_TYPE);
-
-	atk_object_class->get_n_children          = et_get_n_children;
-	atk_object_class->ref_child               = et_ref_child;
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->ref_accessible_at_point = et_ref_accessible_at_point;
-}
-
-static void
-et_init (GalA11yETable *a11y)
-{
-	GalA11yETablePrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->child_item = NULL;
-}
-
-/**
- * gal_a11y_e_table_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETable class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETable class.
- **/
-GType
-gal_a11y_e_table_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETableClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETable),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_WIDGET);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETable", &info, 0,
-								   sizeof (GalA11yETablePrivate), &priv_offset);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_table_new (GObject *widget)
-{
-	GalA11yETable *a11y;
-	ETable *table;
-
-	table = E_TABLE (widget);
-
-	a11y = g_object_new (gal_a11y_e_table_get_type (), NULL);
-
-	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
-
-	return ATK_OBJECT (a11y);
-}
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
deleted file mode 100644
index 0a0901e3bc..0000000000
--- a/a11y/e-table/gal-a11y-e-table.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_H__
-#define __GAL_A11Y_E_TABLE_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TABLE            (gal_a11y_e_table_get_type ())
-#define GAL_A11Y_E_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE, GalA11yETable))
-#define GAL_A11Y_E_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE, GalA11yETableClass))
-#define GAL_A11Y_IS_E_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE))
-#define GAL_A11Y_IS_E_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE))
-
-typedef struct _GalA11yETable GalA11yETable;
-typedef struct _GalA11yETableClass GalA11yETableClass;
-typedef struct _GalA11yETablePrivate GalA11yETablePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETablePrivate comes right after the parent class structure.
- **/
-struct _GalA11yETable {
-	GtkAccessible object;
-};
-
-struct _GalA11yETableClass {
-	GtkAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_table_get_type  (void);
-AtkObject *gal_a11y_e_table_new       (GObject *table);
-
-#endif /* ! __GAL_A11Y_E_TABLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c
deleted file mode 100644
index 2fa34c5fbc..0000000000
--- a/a11y/e-table/gal-a11y-e-tree-factory.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-tree-factory.h"
-#include "gal-a11y-e-tree.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETreeFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_tree_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TREE;
-}
-
-static AtkObject*
-gal_a11y_e_tree_factory_create_accessible (GObject *obj)
-{
-	AtkObject *accessible;
-
-	accessible = gal_a11y_e_tree_new (obj);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_tree_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_tree_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_tree_factory_init (GalA11yETreeFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_tree_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETreeFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETreeFactory class.
- **/
-GType
-gal_a11y_e_tree_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETreeFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_tree_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETreeFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_tree_factory_init,
-			NULL /* value_tree */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETreeFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h
deleted file mode 100644
index 434e526db9..0000000000
--- a/a11y/e-table/gal-a11y-e-tree-factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@ximian.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TREE_FACTORY_H__
-#define __GAL_A11Y_E_TREE_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TREE_FACTORY            (gal_a11y_e_table_factory_get_type ())
-#define GAL_A11Y_E_TREE_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactory))
-#define GAL_A11Y_E_TREE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactoryClass))
-#define GAL_A11Y_IS_E_TREE_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY))
-#define GAL_A11Y_IS_E_TREE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY))
-
-typedef struct _GalA11yETreeFactory GalA11yETreeFactory;
-typedef struct _GalA11yETreeFactoryClass GalA11yETreeFactoryClass;
-
-struct _GalA11yETreeFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETreeFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_tree_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TREE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
deleted file mode 100644
index dc7755c6f2..0000000000
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-tree.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-tree.h>
-#include <gal/e-table/e-table-item.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
-static AtkObjectClass *parent_class;
-static GType parent_type;
-static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETreePrivate {
-	AtkObject *child_item;
-};
-
-/* Static functions */
-
-static void
-init_child_item (GalA11yETree *a11y)
-{
-	GalA11yETreePrivate *priv = GET_PRIVATE (a11y);
-	ETree *tree = E_TREE (GTK_ACCESSIBLE (a11y)->widget);
-	ETableItem * eti;
-
-	g_return_if_fail (tree);
-	eti = e_tree_get_item (tree);
-	if (priv->child_item == NULL) {
-		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y),eti, 0);
-		g_return_if_fail (priv->child_item);
-		priv->child_item->role = ATK_ROLE_TREE_TABLE;
-	}
-}
-
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	GalA11yETree *a11y = GAL_A11Y_E_TREE (component);
-	init_child_item (a11y);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static gint
-et_get_n_children (AtkObject *accessible)
-{
-	return 1;
-}
-
-static AtkObject*
-et_ref_child (AtkObject *accessible,
-	      gint i)
-{
-	GalA11yETree *a11y = GAL_A11Y_E_TREE (accessible);
-	if (i != 0)
-		return NULL;
-	init_child_item (a11y);
-	g_object_ref (GET_PRIVATE (a11y)->child_item);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static void
-et_class_init (GalA11yETreeClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-	parent_class                              = g_type_class_ref (PARENT_TYPE);
-
-	atk_object_class->get_n_children          = et_get_n_children;
-	atk_object_class->ref_child               = et_ref_child;
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->ref_accessible_at_point = et_ref_accessible_at_point;
-}
-
-static void
-et_init (GalA11yETree *a11y)
-{
-	GalA11yETreePrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->child_item = NULL;
-}
-
-/**
- * gal_a11y_e_tree_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETree class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETree class.
- **/
-GType
-gal_a11y_e_tree_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETreeClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETree),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_tree */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_WIDGET);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETree", &info, 0,
-								   sizeof (GalA11yETreePrivate), &priv_offset);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_tree_new (GObject *widget)
-{
-	GalA11yETree *a11y;
-	ETree *tree;
-	AtkObject * item;
-
-	tree = E_TREE (widget);
-
-	a11y = g_object_new (gal_a11y_e_tree_get_type (), NULL);
-
-	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
-
-	return ATK_OBJECT (a11y);
-}
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
deleted file mode 100644
index 65b8deb6cf..0000000000
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TREE_H__
-#define __GAL_A11Y_E_TREE_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TREE            (gal_a11y_e_tree_get_type ())
-#define GAL_A11Y_E_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree))
-#define GAL_A11Y_E_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE, GalA11yETreeClass))
-#define GAL_A11Y_IS_E_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE))
-#define GAL_A11Y_IS_E_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE))
-
-typedef struct _GalA11yETree GalA11yETree;
-typedef struct _GalA11yETreeClass GalA11yETreeClass;
-typedef struct _GalA11yETreePrivate GalA11yETreePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETablePrivate comes right after the parent class structure.
- **/
-struct _GalA11yETree {
-	GtkAccessible object;
-};
-
-struct _GalA11yETreeClass {
-	GtkAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_tree_get_type  (void);
-AtkObject *gal_a11y_e_tree_new       (GObject *tree);
-
-#endif /* ! __GAL_A11Y_E_TREE_H__ */
diff --git a/a11y/e-text/.cvsignore b/a11y/e-text/.cvsignore
deleted file mode 100644
index 5b48d3f593..0000000000
--- a/a11y/e-text/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.libs
-Makefile.in
-Makefile
-*.la
diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c
deleted file mode 100644
index 24e3c28116..0000000000
--- a/a11y/e-text/gal-a11y-e-text-factory.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal/e-text/e-text.h"
-#include "gal-a11y-e-text-factory.h"
-#include "gal-a11y-e-text.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETextFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_text_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TEXT;
-}
-
-static AtkObject*
-gal_a11y_e_text_factory_create_accessible (GObject *obj)
-{
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
-
-	atk_object = g_object_new (GAL_A11Y_TYPE_E_TEXT, NULL);
-	atk_object_initialize (atk_object, obj);
-
-	return atk_object;
-}
-
-static void
-gal_a11y_e_text_factory_class_init (GalA11yETextFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_text_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_text_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_text_factory_init (GalA11yETextFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_text_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETextFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETextFactory class.
- **/
-GType
-gal_a11y_e_text_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETextFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_text_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETextFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_text_factory_init,
-			NULL /* value_text */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETextFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h
deleted file mode 100644
index 56a8d29ab9..0000000000
--- a/a11y/e-text/gal-a11y-e-text-factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TEXT_FACTORY_H__
-#define __GAL_A11Y_E_TEXT_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TEXT_FACTORY            (gal_a11y_e_text_factory_get_type ())
-#define GAL_A11Y_E_TEXT_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT_FACTORY, GalA11yETextFactory))
-#define GAL_A11Y_E_TEXT_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TEXT_FACTORY, GalA11yETextFactoryClass))
-#define GAL_A11Y_IS_E_TEXT_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TEXT_FACTORY))
-#define GAL_A11Y_IS_E_TEXT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TEXT_FACTORY))
-
-typedef struct _GalA11yETextFactory GalA11yETextFactory;
-typedef struct _GalA11yETextFactoryClass GalA11yETextFactoryClass;
-
-struct _GalA11yETextFactory {
-	AtkObjectFactory object;
-};
-
-struct _GalA11yETextFactoryClass {
-	AtkObjectFactoryClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_text_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TEXT_FACTORY_H__ */
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
deleted file mode 100644
index be7835e17d..0000000000
--- a/a11y/e-text/gal-a11y-e-text.c
+++ /dev/null
@@ -1,1121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-text.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
-#include "gal/e-text/e-text.h"
-#include "gal/e-text/e-text-model-repos.h"
-#include <gtk/gtkmain.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETextClass))
-static GObjectClass *parent_class;
-static AtkComponentIface *component_parent_iface;
-static GType parent_type;
-static gint priv_offset;
-static GQuark		quark_accessible_object = 0;
-#define GET_PRIVATE(object) ((GalA11yETextPrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETextPrivate {
-	int dummy;
-};
-
-static void
-et_dispose (GObject *object)
-{
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-/* Static functions */
-
-static void
-et_get_extents (AtkComponent *component,
-		gint *x,
-		gint *y,
-		gint *width,
-		gint *height,
-		AtkCoordType coord_type)
-{
-	EText *item = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component)));
-	double real_width;
-	double real_height;
-	int fake_width;
-	int fake_height;
-
-	if (component_parent_iface &&
-	    component_parent_iface->get_extents)
-		component_parent_iface->get_extents (component,
-						     x,
-						     y,
-						     &fake_width,
-						     &fake_height,
-						     coord_type);
-
-	gtk_object_get (GTK_OBJECT (item),
-			"text_width", &real_width,
-			"text_height", &real_height,
-			NULL);
-
-	if (width)
-		*width = real_width;
-	if (height) 
-		*height = real_height;
-}
-
-static const gchar *
-et_get_full_text (AtkText *text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	ETextModel *model;
-	const char *full_text;
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"model", &model,
-			NULL);
-
-	full_text = e_text_model_get_text (model);
-
-	return full_text;
-}
-
-static void
-et_set_full_text (AtkEditableText *text,
-		  const char *full_text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	ETextModel *model;
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"model", &model,
-			NULL);
-
-	e_text_model_set_text (model, full_text);
-}
-
-static gchar *
-et_get_text (AtkText *text,
-	     gint start_offset,
-	     gint end_offset)
-{
-        gint start, end, real_start, real_end, len;
-	const char *full_text = et_get_full_text (text);
-        if (full_text == NULL)
-                return;
-        len = g_utf8_strlen (full_text, -1);
-
-        start = MIN (MAX (0, start_offset), len);
-        end = MIN (MAX (-1, end_offset), len);
-
-	if (end_offset == -1)
-		end = strlen (full_text);
-	else
-		end = g_utf8_offset_to_pointer (full_text, end) - full_text;
-
-	start = g_utf8_offset_to_pointer (full_text, start) - full_text;
-
-	real_start = MIN (start, end);
-	real_end = MAX (start, end);
-
-	return g_strndup (full_text + real_start, real_end - real_start);
-}
-
-static gboolean
-is_a_seperator (gunichar c)
-{
-	return g_unichar_ispunct(c) || g_unichar_isspace(c);
-}
-
-static gint
-find_word_start (const char *text,
-		 gint begin_offset,
-		 gint step)
-{
-	gint offset;
-	char *at_offset;
-	gunichar current, previous;
-	gint len;
-
-	offset = begin_offset;
-	len = g_utf8_strlen (text, -1);
-
-	while (offset > 0 && offset < len) {
-		at_offset = g_utf8_offset_to_pointer (text, offset);
-		current = g_utf8_get_char_validated (at_offset, -1);
-		at_offset = g_utf8_offset_to_pointer (text, offset-1);
-		previous = g_utf8_get_char_validated (at_offset, -1);
-		if ((! is_a_seperator (current)) && is_a_seperator (previous))
-			break;
-		offset += step;
-	}
-
-	return offset;
-}
-
-static gint
-find_word_end (const char *text,
-	       gint begin_offset,
-	       gint step)
-{
-	gint offset;
-	char *at_offset;
-	gunichar current, previous;
-	gint len;
-
-	offset = begin_offset;
-	len = g_utf8_strlen (text, -1);
-
-	while (offset > 0 && offset < len) {
-		at_offset = g_utf8_offset_to_pointer (text, offset);
-		current = g_utf8_get_char_validated (at_offset, -1);
-		at_offset = g_utf8_offset_to_pointer (text, offset-1);
-		previous = g_utf8_get_char_validated (at_offset, -1);
-		if (is_a_seperator (current) && (! is_a_seperator (previous)))
-			break;
-		offset += step;
-	}
-
-	return offset;
-}
-
-static gint
-find_sentence_start (const char *text,
-		     gint begin_offset,
-		     gint step)
-{
-	gint offset, last_word_end, len;
-	char *at_offset;
-	gunichar ch;
-	int i;
-	
-	offset = find_word_start (text, begin_offset, step);
-	len = g_utf8_strlen (text, -1);
-
-	while (offset>0 && offset <len) {
-		last_word_end = find_word_end (text, offset - 1, -1);
-		if (last_word_end == 0)
-			break;
-		for (i = last_word_end; i < offset; i++) {
-			at_offset = g_utf8_offset_to_pointer (text, i);
-			ch = g_utf8_get_char_validated (at_offset, -1);
-			if (ch == '.' || ch == '!' || ch == '?')
-				return offset;
-		}
-
-		offset = find_word_start (text, offset + step, step);
-	}
-
-	return offset;
-}
-
-static gint
-find_sentence_end (const char *text,
-                   gint begin_offset,
-                   gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar previous;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset > 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset - 1);
-                previous = g_utf8_get_char_validated (at_offset, -1);
-                if (previous == '.' || previous == '!' || previous == '?')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gint
-find_line_start (const char *text,
-                     gint begin_offset,
-                     gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar previous;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset > 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset - 1);
-                previous = g_utf8_get_char_validated (at_offset, -1);
-                if (previous == '\n' || previous == '\r')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gint
-find_line_end (const char *text,
-                     gint begin_offset,
-                     gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar current;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset >= 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset);
-                current = g_utf8_get_char_validated (at_offset, -1);
-                if (current == '\n' || current == '\r')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gchar *
-et_get_text_after_offset (AtkText *text,
-			  gint offset,
-			  AtkTextBoundary boundary_type,
-			  gint *start_offset,
-			  gint *end_offset)
-{
-        gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset + 1;
-		end = offset + 2;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		start = find_word_start (full_text, offset + 1, 1);
-		end = find_word_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		start = find_word_end (full_text, offset + 1, 1);
-		end = find_word_end (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		start = find_sentence_start (full_text, offset + 1, 1);
-		end = find_sentence_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-		start = find_sentence_end (full_text, offset + 1, 1);
-		end = find_sentence_end (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-		start = find_line_start (full_text, offset + 1, 1);
-		end = find_line_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-		start = find_line_end (full_text, offset + 1, 1);
-		end = find_line_end (full_text, start + 1, 1);
-		break;
-	defalut:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gchar *
-et_get_text_at_offset (AtkText *text,
-		       gint offset,
-		       AtkTextBoundary boundary_type,
-		       gint *start_offset,
-		       gint *end_offset)
-{
-	gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset;
-		end = offset + 1;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		start = find_word_start (full_text, offset - 1, -1);
-		end = find_word_start (full_text, offset, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		start = find_word_end (full_text, offset, -1);
-		end = find_word_end (full_text, offset + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		start = find_sentence_start (full_text, offset - 1, -1);
-                end = find_sentence_start (full_text, offset, 1);
- 		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-	        start = find_sentence_end (full_text, offset, -1);
-                end = find_sentence_end (full_text, offset + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-	        start = find_line_start (full_text, offset - 1, -1);
-                end = find_line_start (full_text, offset, 1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-		start = find_line_end (full_text, offset, -1);
-                end = find_line_end (full_text, offset + 1, 1);
- 		break;
-	defalut:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gunichar
-et_get_character_at_offset (AtkText *text,
-			    gint offset)
-{
-	const char *full_text = et_get_full_text (text);
-	char *at_offset;
-
-	at_offset = g_utf8_offset_to_pointer (full_text, offset);
-	return g_utf8_get_char_validated (at_offset, -1);
-}
-
-
-static gchar*
-et_get_text_before_offset (AtkText *text,
-			   gint offset,
-			   AtkTextBoundary boundary_type,
-			   gint *start_offset,
-			   gint *end_offset)
-{
-        gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset - 1;
-		end = offset;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		end = find_word_start (full_text, offset - 1, -1);
-		start = find_word_start (full_text, end - 1, -1) ;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		end = find_word_end (full_text, offset, -1);
-		start = find_word_end (full_text, end - 1, -1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		end = find_sentence_start (full_text, offset, -1);
-		start = find_sentence_start (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-	        end = find_sentence_end (full_text, offset, -1);
-                start = find_sentence_end (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-	        end = find_line_start (full_text, offset, -1);
-                start = find_line_start (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-	        end = find_line_end (full_text, offset, -1);
-                start = find_line_end (full_text, end - 1, -1);
- 		break;
-	default:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gint
-et_get_caret_offset (AtkText *text)
-{
-	GObject *obj;
-	EText *etext;
-	int offset;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return -1;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), -1);
-	etext = E_TEXT (obj);
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"cursor_pos", &offset,
-			NULL);
-	return offset;
-}
-
-
-static AtkAttributeSet*
-et_get_run_attributes (AtkText *text,
-		       gint offset,
-		       gint *start_offset,
-		       gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static AtkAttributeSet*
-et_get_default_attributes (AtkText *text)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static void
-et_get_character_extents (AtkText *text,
-			  gint offset,
-			  gint *x,
-			  gint *y,
-			  gint *width,
-			  gint *height,
-			  AtkCoordType coords)
-{
-        GObject *obj;
-        EText *etext;
-        GnomeCanvas *canvas;
-        gint x_widget, y_widget, x_window, y_window;
-        GdkWindow *window;
-        GtkWidget *widget;
-        int index;
-        int trailing;
-	PangoRectangle pango_pos;
-
-        g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text));
-        obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-        if (obj == NULL)
-            return;
-        g_return_if_fail (E_IS_TEXT (obj));
-        etext = E_TEXT(obj);
-        canvas = GNOME_CANVAS_ITEM(etext)->canvas;
-        widget = GTK_WIDGET(canvas);
-        window = widget->window;
-        gdk_window_get_origin (window, &x_widget, &y_widget);
-
-	pango_layout_index_to_pos (etext->layout, offset, &pango_pos);
-	pango_pos.x = PANGO_PIXELS (pango_pos.x);
-	pango_pos.y = PANGO_PIXELS (pango_pos.y);
-	pango_pos.width = (pango_pos.width + PANGO_SCALE / 2) / PANGO_SCALE;
-	pango_pos.height = (pango_pos.height + PANGO_SCALE / 2) / PANGO_SCALE;
-
-        *x = pango_pos.x + x_widget;
-        *y = pango_pos.y + y_widget;
-
-	*width  = pango_pos.width;
-	*height = pango_pos.height;
-
-        if (etext->draw_borders) {
-                *x += 3; /*BORDER_INDENT;*/
-                *y += 3; /*BORDER_INDENT;*/
-        }
-
-        *x += etext->xofs;
-        *y += etext->yofs;
-
-        if (etext->editing) {
-                *x -= etext->xofs_edit;
-                *y -= etext->yofs_edit;
-        }
-
-        *x += etext->cx;
-        *y += etext->cy;
-
-	if (coords == ATK_XY_WINDOW) {
-		window = gdk_window_get_toplevel (window);
-		gdk_window_get_origin (window, &x_window, &y_window);
-		*x -= x_window;
-	        *y -= y_window;
-    	}
-	else if (coords == ATK_XY_SCREEN) {
-	}
-	else {
-		*x = 0;
-		*y = 0;
-		*height = 0;
-		*width = 0;
-	}
-}
-
-
-static gint
-et_get_character_count (AtkText *text)
-{
-	const char *full_text = et_get_full_text (text);
-
-	return g_utf8_strlen (full_text, -1);
-}
-
-
-static gint
-et_get_offset_at_point (AtkText *text,
-			gint x,
-			gint y,
-			AtkCoordType coords)
-{
-        GObject *obj;
-        EText *etext;
-        GnomeCanvas *canvas;
-	gint x_widget, y_widget, x_window, y_window;
-	GdkWindow *window;
-        GtkWidget *widget;
-        int index;
-        int trailing;
-
-        g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1);
-        obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-        if (obj == NULL)
-            return -1;
-        g_return_val_if_fail (E_IS_TEXT (obj), -1);
-        etext = E_TEXT(obj);
-        canvas = GNOME_CANVAS_ITEM(etext)->canvas;
-        widget = GTK_WIDGET(canvas);
-	window = widget->window;
-	gdk_window_get_origin (window, &x_widget, &y_widget);
-
-	if (coords == ATK_XY_SCREEN) {
-		x = x - x_widget;
-		y = y - y_widget;
-	}
-	else if (coords == ATK_XY_WINDOW) {
-		window = gdk_window_get_toplevel (window);
-		gdk_window_get_origin (window, &x_window, &y_window);
-		x = x - x_widget + x_window;
-		y = y - y_widget + y_window;
-	}
-	else
-		return -1;
-
-        if (etext->draw_borders) {
-                x -= 3; /*BORDER_INDENT;*/
-                y -= 3; /*BORDER_INDENT;*/
-        }
-
-        x -= etext->xofs;
-        y -= etext->yofs;
-
-        if (etext->editing) {
-                x += etext->xofs_edit;
-                y += etext->yofs_edit;
-        }
-
-        x -= etext->cx;
-        y -= etext->cy;
-
-        pango_layout_xy_to_index (etext->layout,
-				  x * PANGO_SCALE - PANGO_SCALE / 2,
-				  y * PANGO_SCALE - PANGO_SCALE / 2,
-				  &index,
-				  &trailing);
-
-        return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing);
-}
-
-
-static gint 
-et_get_n_selections (AtkText *text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	if (etext->selection_start !=
-	    etext->selection_end)
-		return 1;
-	return 0;
-}
-
-
-static gchar*
-et_get_selection (AtkText *text,
-		  gint selection_num,
-		  gint *start_offset,
-		  gint *end_offset)
-{
-	gint start, end, real_start, real_end, len;
-	EText *etext;
-	if (selection_num == 0) {
-		const char *full_text = et_get_full_text (text);
-		if (full_text == NULL)
-			return NULL;
-		len = g_utf8_strlen (full_text, -1);
-		etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-		start = MIN (etext->selection_start, etext->selection_end);
-		end = MAX (etext->selection_start, etext->selection_end);
-		start = MIN (MAX (0, start), len);
-		end = MIN (MAX (0, end), len);
-		if (start != end) {
-			if (start_offset)
-				*start_offset = start;
-			if (end_offset)
-				*end_offset = end;
-			real_start = g_utf8_offset_to_pointer (full_text, start) - full_text;
-			real_end = g_utf8_offset_to_pointer (full_text, end) - full_text;
-			return g_strndup (full_text + real_start, real_end - real_start);
-		}
-	}
-
-	return NULL;
-}
-
-
-static gboolean
-et_add_selection (AtkText *text,
-		  gint start_offset,
-		  gint end_offset)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-
-	g_return_val_if_fail (start_offset >= 0, FALSE);
-	g_return_val_if_fail (start_offset >= -1, FALSE);
-	if (end_offset == -1)
-		end_offset = et_get_character_count (text);
-
-	if (start_offset != end_offset) {
-		gint real_start, real_end;
-		real_start = MIN (start_offset, end_offset);
-		real_end = MAX (start_offset, end_offset);
-		etext->selection_start = real_start;
-		etext->selection_end = real_end;
-
-		gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (etext));
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (etext));
-
-		g_signal_emit_by_name (ATK_OBJECT (text), "text_selection_changed");
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-et_remove_selection (AtkText *text,
-		     gint selection_num)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-
-	if (selection_num == 0 
-	    && etext->selection_start != etext->selection_end) {
-		etext->selection_end = etext->selection_start;
-		g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-et_set_selection (AtkText *text,
-		  gint selection_num,
-		  gint start_offset,
-		  gint end_offset)
-{
-	GObject *obj;
-	EText *etext;
-	int offset;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-	if (selection_num == 0)
-                return et_add_selection (text, start_offset, end_offset);
-        return FALSE;
-}
-
-
-static gboolean
-et_set_caret_offset (AtkText *text,
-		     gint offset)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-                                                                                
-	if (offset < -1)
-		return FALSE;
-	else {
-		ETextEventProcessorCommand command;
-
-		if (offset == -1)
-			offset = et_get_character_count (text);
-
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_VALUE;
-		command.value = offset;
-		command.time = GDK_CURRENT_TIME;
-		g_signal_emit_by_name (etext->tep, "command", &command);
-		return TRUE;
-	}
-}
-
-static gboolean
-et_set_run_attributes (AtkEditableText *text,
-		       AtkAttributeSet *attrib_set,
-		       gint start_offset,
-		       gint end_offset)
-{
-	/* Unimplemented */
-	return FALSE;
-}
-
-static void
-et_set_text_contents (AtkEditableText *text,
-		      const gchar *string)
-{
-	et_set_full_text (text, string);
-}
-
-static void
-et_insert_text (AtkEditableText *text,
-		const gchar *string,
-		gint length,
-		gint *position)
-{
-	/* Utf8 unimplemented */
-	char *result;
-
-	const char *full_text = et_get_full_text (ATK_TEXT (text));
-	if (full_text == NULL)
-		return;
-
-	result = g_strdup_printf ("%.*s%.*s%s", *position, full_text, length, string, full_text + *position);
-
-	et_set_full_text (text, result);
-
-	*position += length;
-
-	g_free (result);
-}
-
-static void
-et_copy_text (AtkEditableText *text,
-	      gint start_pos,
-	      gint end_pos)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	if (start_pos != end_pos) {
-		etext->selection_start = start_pos;
-		etext->selection_end = end_pos;
-		e_text_copy_clipboard (etext);
-	}
-}
-
-static void
-et_delete_text (AtkEditableText *text,
-		gint start_pos,
-		gint end_pos)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	etext->selection_start = start_pos;
-	etext->selection_end = end_pos;
-
-	e_text_delete_selection (etext);
-}
-
-static void
-et_cut_text (AtkEditableText *text,
-	     gint start_pos,
-	     gint end_pos)
-{
-	et_copy_text (text, start_pos, end_pos);
-	et_delete_text (text, start_pos, end_pos);
-}
-
-static void
-et_paste_text (AtkEditableText *text,
-	       gint position)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	gtk_object_set (GTK_OBJECT (etext),
-			"cursor_pos", position,
-			NULL);
-	e_text_paste_clipboard (etext);
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->get_extents = et_get_extents;
-}
-
-static void
-et_atk_text_iface_init (AtkTextIface *iface)
-{
-	iface->get_text                = et_get_text;
-	iface->get_text_after_offset   = et_get_text_after_offset;
-	iface->get_text_at_offset      = et_get_text_at_offset;
-	iface->get_character_at_offset = et_get_character_at_offset;
-	iface->get_text_before_offset  = et_get_text_before_offset;
-	iface->get_caret_offset        = et_get_caret_offset;
-	iface->get_run_attributes      = et_get_run_attributes;
-	iface->get_default_attributes  = et_get_default_attributes;
-	iface->get_character_extents   = et_get_character_extents;
-	iface->get_character_count     = et_get_character_count;
-	iface->get_offset_at_point     = et_get_offset_at_point;
-	iface->get_n_selections        = et_get_n_selections;
-	iface->get_selection           = et_get_selection;
-	iface->add_selection           = et_add_selection;
-	iface->remove_selection        = et_remove_selection;
-	iface->set_selection           = et_set_selection;
-	iface->set_caret_offset        = et_set_caret_offset;
-}
-
-static void
-et_atk_editable_text_iface_init (AtkEditableTextIface *iface)
-{
-	iface->set_run_attributes = et_set_run_attributes;
-	iface->set_text_contents  = et_set_text_contents;
-	iface->insert_text        = et_insert_text;
-	iface->copy_text          = et_copy_text;
-	iface->cut_text           = et_cut_text;
-	iface->delete_text        = et_delete_text;
-	iface->paste_text         = et_paste_text;
-}
-
-static void
-_et_reposition_cb (ETextModel *model,
-		   ETextModelReposFn fn,
-		   gpointer repos_data,
-		   gpointer user_data)
-{
-	AtkObject *accessible;
-	AtkText *text;
-
-	accessible = ATK_OBJECT (user_data);
-	text = ATK_TEXT (accessible);
-
-	if (fn == e_repos_delete_shift) {
-		EReposDeleteShift *info = (EReposDeleteShift *) repos_data;
-		g_signal_emit_by_name (text, "text-changed::delete", info->pos, info->len);
-	}
-	else if (fn == e_repos_insert_shift) {
-		EReposInsertShift *info = (EReposInsertShift *) repos_data;
-		g_signal_emit_by_name (text, "text-changed::insert", info->pos, info->len);
-	}
-}
-
-static void
-_et_command_cb (ETextEventProcessor *tep,
-		ETextEventProcessorCommand *command,
-		gpointer user_data)
-{
-	AtkObject *accessible;
-	AtkText *text;
-
-	accessible = ATK_OBJECT (user_data);
-	text = ATK_TEXT (accessible);
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		g_signal_emit_by_name (text, "text-caret-moved", et_get_caret_offset (text));
-		break;
-	case E_TEP_SELECT:
-		g_signal_emit_by_name (text, "text-selection-changed");
-		break;
-	}
-}
-
-static void
-et_real_initialize (AtkObject *obj,
-                    gpointer  data)
-{
-	GalA11yEText *a11y;
-	EText *etext;
-
-	ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
-
-	g_return_if_fail (GAL_A11Y_IS_E_TEXT (obj));
-	g_return_if_fail (E_IS_TEXT (data));
-
-	a11y = GAL_A11Y_E_TEXT (obj);
-	etext = E_TEXT (data);
-
-	/* Set up signal callbacks */
-	g_signal_connect (etext->model, "reposition",
-		G_CALLBACK (_et_reposition_cb), obj);
-
-	g_signal_connect_after (etext->tep, "command",
-		(GCallback) _et_command_cb, obj);
-                                                                              
-	obj->role = ATK_ROLE_TEXT;
-}
-
-static void
-et_class_init (GalA11yETextClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
-
-	quark_accessible_object               = g_quark_from_static_string ("gtk-accessible-object");
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-	component_parent_iface                = g_type_interface_peek(parent_class, ATK_TYPE_COMPONENT);
-	object_class->dispose                 = et_dispose;
-	atk_class->initialize                 = et_real_initialize;
-}
-
-static void
-et_init (GalA11yEText *a11y)
-{
-#if 0
-	GalA11yETextPrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-#endif
-}
-
-/**
- * gal_a11y_e_text_get_type:
- * @void: 
- * 
- * Registers the &GalA11yEText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yEText class.
- **/
-GType
-gal_a11y_e_text_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETextClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yEText),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_text */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc) et_atk_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_editable_text_info = {
-			(GInterfaceInitFunc) et_atk_editable_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yEText", &info, 0,
-								   sizeof (GalA11yETextPrivate), &priv_offset);
-
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
-	}
-
-	return type;
-}
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
deleted file mode 100644
index 66d2d6283b..0000000000
--- a/a11y/e-text/gal-a11y-e-text.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TEXT_H__
-#define __GAL_A11Y_E_TEXT_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-
-#define GAL_A11Y_TYPE_E_TEXT            (gal_a11y_e_text_get_type ())
-#define GAL_A11Y_E_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT, GalA11yEText))
-#define GAL_A11Y_E_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TEXT, GalA11yETextClass))
-#define GAL_A11Y_IS_E_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TEXT))
-#define GAL_A11Y_IS_E_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TEXT))
-
-typedef struct _GalA11yEText GalA11yEText;
-typedef struct _GalA11yETextClass GalA11yETextClass;
-typedef struct _GalA11yETextPrivate GalA11yETextPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETextPrivate comes right after the parent class structure.
- **/
-struct _GalA11yEText {
-	AtkObject object;
-};
-
-struct _GalA11yETextClass {
-	AtkObject parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_text_get_type  (void);
-
-#endif /* ! __GAL_A11Y_E_TEXT_H__ */
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
deleted file mode 100644
index 80f5ecbaaa..0000000000
--- a/a11y/ea-cell-table.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cell-table.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cell-table.h"
-
-EaCellTable *
-ea_cell_table_create (gint rows, gint columns, gboolean column_first)
-{
-	EaCellTable * cell_data;
-	gint index;
-
-	g_return_val_if_fail (((columns > 0) && (rows > 0)), NULL);
-
-	cell_data = g_new0 (EaCellTable, 1);
-
-	cell_data->column_first = column_first;
-	cell_data->columns = columns;
-	cell_data->rows = rows;
-
-	cell_data->column_labels = g_new0 (gchar*, columns);
-	for (index = columns -1; index >= 0; --index)
-		cell_data->column_labels [index] = NULL;
-
-	cell_data->row_labels = g_new0 (gchar*, rows);
-	for (index = rows -1; index >= 0; --index)
-		cell_data->row_labels [index] = NULL;
-
-	cell_data->cells = g_new0(gpointer, (columns * rows));
-	for (index = (columns * rows) -1; index >= 0; --index)
-		cell_data->cells [index] = NULL;
-	return cell_data;
-}
-
-void
-ea_cell_table_destroy (EaCellTable * cell_data)
-{
-	gint index;
-	g_return_if_fail (cell_data);
-
-	g_print ("destroy cell table (%d, %d)\n", cell_data->rows,
-		  cell_data->columns);
-	for (index = 0; index < cell_data->columns; ++index)
-		if (cell_data->column_labels [index])
-			g_free (cell_data->column_labels [index]);
-	g_free (cell_data->column_labels);
-
-	for (index = 0; index < cell_data->rows; ++index)
-		if (cell_data->row_labels [index])
-			g_free (cell_data->row_labels [index]);
-	g_free (cell_data->row_labels);
-
-	for (index = (cell_data->columns * cell_data->rows) -1;
-	     index >= 0; --index)
-		if (cell_data->cells[index] &&
-		    G_IS_OBJECT (cell_data->cells[index]))
-			g_object_unref (cell_data->cells[index]);
-
-	g_free (cell_data->cells);
-}
-
-gpointer
-ea_cell_table_get_cell (EaCellTable * cell_data,
-			gint row, gint column)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, NULL);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return NULL;
-
-	return cell_data->cells[index];
-}
-
-gboolean
-ea_cell_table_set_cell (EaCellTable * cell_data,
-			gint row, gint column, gpointer cell)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, FALSE);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-gpointer
-ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-				 gint index)
-{
-	g_return_val_if_fail (cell_data, NULL);
-
-	if (index >=0 && index < (cell_data->columns * cell_data->rows))
-		return cell_data->cells [index];
-	return NULL;
-}
-
-gboolean
-ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-				 gint index, gpointer cell)
-{
-	g_return_val_if_fail (cell_data, FALSE);
-
-	if (index < 0 || index >=cell_data->columns * cell_data->rows)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data,
-				gint column)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((column >= 0 && column < cell_data->columns), NULL);
-
-	return cell_data->column_labels[column];
-}
-
-void
-ea_cell_table_set_column_label (EaCellTable * cell_data,
-				gint column, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((column >= 0 && column < cell_data->columns));
-
-	if (cell_data->column_labels[column])
-		g_free (cell_data->column_labels[column]);
-	cell_data->column_labels[column] = g_strdup(label);
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data,
-			     gint row)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((row >= 0 && row < cell_data->rows), NULL);
-
-	return cell_data->row_labels[row];
-}
-
-void
-ea_cell_table_set_row_label (EaCellTable * cell_data,
-			     gint row, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((row >= 0 && row < cell_data->rows));
-
-	if (cell_data->row_labels[row])
-		g_free (cell_data->row_labels[row]);
-	cell_data->row_labels[row] = g_strdup(label);
-}
-
-gint
-ea_cell_table_get_index (EaCellTable *cell_data,
-			 gint row, gint column)
-{
-	g_return_val_if_fail (cell_data, -1);
-	if (row < 0 || row >= cell_data->rows ||
-	    column < 0 || column >= cell_data->columns)
-		return -1;
-
-	if (cell_data->column_first)
-		return column * cell_data->rows + row;
-	else
-		return row * cell_data->columns + column;
-}
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
deleted file mode 100644
index 932fe8b4fd..0000000000
--- a/a11y/ea-cell-table.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-table-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* EaCellTable */
-
-#include <glib.h>
-#include <glib-object.h>
-
-struct _EaCellTable {
-	gint columns;
-	gint rows;
-	gboolean column_first;     /* index order */
-	gchar **column_labels;
-	gchar **row_labels;
-	gpointer *cells;
-};
-
-typedef struct _EaCellTable EaCellTable;
-
-EaCellTable * ea_cell_table_create (gint rows, gint columns,
-				    gboolean column_first);
-void ea_cell_table_destroy (EaCellTable * cell_data);
-gpointer ea_cell_table_get_cell (EaCellTable * cell_data,
-				   gint row, gint column);
-gboolean ea_cell_table_set_cell (EaCellTable * cell_data,
-				 gint row, gint column, gpointer cell);
-gpointer ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-					  gint index);
-gboolean ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-					  gint index, gpointer cell);
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data, gint column);
-void ea_cell_table_set_column_label (EaCellTable * cell_data,
-				     gint column, const gchar *label);
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data, gint row);
-void ea_cell_table_set_row_label (EaCellTable * cell_data,
-				  gint row, const gchar *label);
-gint ea_cell_table_get_index (EaCellTable *cell_data,
-			      gint row, gint column);
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
deleted file mode 100644
index 06ae612d6f..0000000000
--- a/a11y/ea-factory.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-factory.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_FACTORY_H__
-#define _EA_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-
-#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  AtkObject *accessible;							\
-  g_return_val_if_fail (G_IS_OBJECT (obj), NULL);				\
-  accessible = opt_create_accessible (G_OBJECT (obj));	                 	\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  GtkWidget *widget;								\
-  AtkObject *accessible;							\
-                                                                                \
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);				\
-										\
-  widget = GTK_WIDGET (obj);							\
-										\
-  accessible = opt_create_accessible (widget);					\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)	        \
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    char *name;									\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),				         	\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,	\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
-    g_free (name);								\
-  }										\
-										\
-  return t;									\
-}
-
-#define EA_FACTORY(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_SET_FACTORY(obj_type, type_as_function)		         	\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       obj_type,				\
-				       type_as_function ## _factory_get_type ())
-
-#endif /* _EA_FACTORY_H__ */
diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h
deleted file mode 100644
index 22da85eca8..0000000000
--- a/a11y/gal-a11y-factory.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GAL A11Y
- * gal-a11y-factory.h
- *
- * Copyright 2003 Ximian Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *  Gilbert Fang <gilbert.fang@sun.com>, Sun Microsystem Inc. 2003.
- *
- * This file is mainly from the gailfactory.h of GAIL. 
- */
-
-#ifndef _GAL_A11Y_FACTORY_H__
-#define _GAL_A11Y_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible)	\
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{										\
-  GtkWidget *widget;								\
-  AtkObject *accessible;							\
-										\
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);				\
-										\
-  widget = GTK_WIDGET (obj);							\
-										\
-  accessible = opt_create_accessible (widget);					\
-										\
-  return accessible;								\
-}										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    char *name;									\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),					\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
-    g_free (name);								\
-  }										\
-										\
-  return t;									\
-}
-
-#define GAL_A11Y_WIDGET_SET_FACTORY(widget_type, type_as_function)			\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       widget_type,				\
-				       type_as_function ## _factory_get_type ())
-
-#endif /* _GAL_A11Y_FACTORY_H__ */
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
deleted file mode 100644
index 0cf7c69dbb..0000000000
--- a/a11y/gal-a11y-util.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-util.h"
-
-GType
-gal_a11y_type_register_static_with_private  (GType            parent_type,
-					     const gchar     *type_name,
-					     GTypeInfo *info,
-					     GTypeFlags       flags,
-					     gint             priv_size,
-					     gint            *priv_offset)
-{
-	GTypeQuery query;
-
-	g_type_query (parent_type, &query);
-
-	info->class_size = query.class_size;
-	info->instance_size = query.instance_size + priv_size;
-
-	if (priv_offset)
-		*priv_offset = query.instance_size;
-
-	return g_type_register_static (parent_type, type_name, info, flags);
-}
diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
deleted file mode 100644
index b7f742b122..0000000000
--- a/a11y/gal-a11y-util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_UTIL_H__
-#define __GAL_A11Y_UTIL_H__
-
-#include <glib-object.h>
-
-GType  gal_a11y_type_register_static_with_private  (GType        parent_type,
-						    const gchar *type_name,
-						    GTypeInfo   *info,
-						    GTypeFlags   flags,
-						    int          priv_size,
-						    gint        *priv_offset);
-
-#endif /* ! __GAL_A11Y_UTIL_H__ */
diff --git a/a11y/widgets/.cvsignore b/a11y/widgets/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/widgets/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am
deleted file mode 100644
index 2480c3bba7..0000000000
--- a/a11y/widgets/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-widgets-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_widgets_a11y_la_SOURCES =		\
-	ea-calendar-item.c			\
-	ea-calendar-item.h			\
-	ea-calendar-cell.c			\
-	ea-calendar-cell.h			\
-	ea-widgets.c				\
-	ea-widgets.h
-
-libevolution_widgets_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-                                                                                
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
deleted file mode 100644
index 4b0fe75156..0000000000
--- a/a11y/widgets/ea-calendar-cell.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-calendar-cell.h"
-#include "ea-calendar-item.h"
-#include "ea-factory.h"
-
-/* ECalendarCell */
-
-static void e_calendar_cell_class_init (ECalendarCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_CELL, ea_calendar_cell, ea_calendar_cell_new)
-
-GType
-e_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (ECalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (ECalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "ECalendarCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_calendar_cell_class_init (ECalendarCellClass *class)
-{
-    EA_SET_FACTORY (e_calendar_cell_get_type (), ea_calendar_cell);
-}
-
-ECalendarCell *
-e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column)
-{
-	GObject *object;
-	ECalendarCell *cell;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), NULL);
-
-	object = g_object_new (E_TYPE_CALENDAR_CELL, NULL);
-	cell = E_CALENDAR_CELL (object);
-	cell->calitem = calitem;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	g_print ("EvoAcc: e_calendar_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaCalendarCell */
-
-static void ea_calendar_cell_class_init (EaCalendarCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_calendar_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_cell_get_description (AtkObject *accessible);
-static AtkObject * ea_calendar_cell_get_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_cell_created = 0, n_ea_calendar_cell_destroyed = 0;
-static void ea_calendar_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaCalendarCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_cell_class_init (EaCalendarCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_calendar_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_cell_get_name;
-	class->get_description = ea_calendar_cell_get_description;
-
-	class->get_parent = ea_calendar_cell_get_parent;
-}
-
-AtkObject* 
-ea_calendar_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_CALENDAR_CELL (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE_CELL;
-
-#ifdef ACC_DEBUG
-	++n_ea_calendar_cell_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_created = %d\n",
-		n_ea_calendar_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_calendar_cell_finalize (GObject *object)
-{
-	++n_ea_calendar_cell_destroyed;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
-		n_ea_calendar_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	if (!accessible->name) {
-		AtkObject *atk_obj;
-		EaCalendarItem *ea_calitem;
-		ECalendarCell *cell;
-		gint day_index;
-		gint year, month, day;
-		gchar buffer[128];
-
-		cell = E_CALENDAR_CELL (g_obj);
-		atk_obj = ea_calendar_cell_get_parent (accessible);
-		ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-		day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-						    cell->row, cell->column);
-		e_calendar_item_get_date_for_offset (cell->calitem, day_index,
-						     &year, &month, &day);
-
-		g_snprintf (buffer, 128, "%d-%d-%d", year, month + 1, day);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, buffer);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_description (AtkObject *accessible)
-{
-	return ea_calendar_cell_get_name (accessible);
-}
-
-static AtkObject *
-ea_calendar_cell_get_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	return atk_gobject_accessible_for_object (G_OBJECT (calitem));
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj, *atk_canvas;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-	EaCalendarItem *ea_calitem;
-	gint day_index;
-	gint year, month, day;
-	gint canvas_x, canvas_y, canvas_width, canvas_height;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_CALENDAR_CELL (component));
-
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-	day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-					    cell->row, cell->column);
-	e_calendar_item_get_date_for_offset (calitem, day_index,
-					     &year, &month, &day);
-
-	if (!e_calendar_item_get_day_extents (calitem,
-					      year, month, day,
-					      x, y, width, height))
-	    return;
-	atk_canvas = atk_object_get_parent (ATK_OBJECT (ea_calitem));
-	atk_component_get_extents (ATK_COMPONENT (atk_canvas),
-					     &canvas_x, &canvas_y,
-					     &canvas_width, &canvas_height,
-					     coord_type);
-	*x += canvas_x;
-	*y += canvas_y;
-}
diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h
deleted file mode 100644
index f87ede90a7..0000000000
--- a/a11y/widgets/ea-calendar-cell.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_CELL_H__
-#define __EA_CALENDAR_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "misc/e-calendar-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_CALENDAR_CELL                     (e_calendar_cell_get_type ())
-#define E_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CALENDAR_CELL, ECalendarCell))
-#define E_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-#define E_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CALENDAR_CELL))
-#define E_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CALENDAR_CELL))
-#define E_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-
-typedef struct _ECalendarCell                   ECalendarCell;
-typedef struct _ECalendarCellClass              ECalendarCellClass;
-
-struct _ECalendarCell
-{
-	GObject parent;
-	ECalendarItem *calitem;
-	gint row;
-	gint column;
-};
-
-GType e_calendar_cell_get_type (void);
-
-struct _ECalendarCellClass
-{
-	GObjectClass parent_class;
-};
-
-ECalendarCell * e_calendar_cell_new (ECalendarItem *calitem,
-				     gint row, gint column);
-
-#define EA_TYPE_CALENDAR_CELL                     (ea_calendar_cell_get_type ())
-#define EA_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCell))
-#define EA_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-#define EA_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_CELL))
-#define EA_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_CELL))
-#define EA_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-
-typedef struct _EaCalendarCell                   EaCalendarCell;
-typedef struct _EaCalendarCellClass              EaCalendarCellClass;
-
-struct _EaCalendarCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_calendar_cell_get_type (void);
-
-struct _EaCalendarCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_calendar_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CALENDAR_CELL_H__ */
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
deleted file mode 100644
index 6170e7f50c..0000000000
--- a/a11y/widgets/ea-calendar-item.c
+++ /dev/null
@@ -1,1247 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <libgnomecanvas/gnome-canvas.h>
-#include <glib/gdate.h>
-#include "ea-calendar-item.h"
-#include "ea-calendar-cell.h"
-#include "ea-cell-table.h"
-
-#define EA_CALENDAR_COLUMN_NUM E_CALENDAR_COLS_PER_MONTH
-
-/* EaCalendarItem */
-static void ea_calendar_item_class_init (EaCalendarItemClass *klass);
-static void ea_calendar_item_finalize (GObject *object);
-
-static G_CONST_RETURN gchar* ea_calendar_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_item_get_description (AtkObject *accessible);
-static gint ea_calendar_item_get_n_children (AtkObject *accessible);
-static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index);
-
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* callbacks */
-static void selection_preview_change_cb (ECalendarItem *calitem);
-static void date_range_changed_cb (ECalendarItem *calitem);
-static void selection_changed_cb (ECalendarItem *calitem);
-
-/* helpers */
-static EaCellTable *ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem);
-static void ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem);
-static gboolean ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem,
-						   gint column,
-						   gchar *buffer,
-						   gint buffer_size);
-static gboolean ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem,
-						gint row,
-						gchar *buffer,
-						gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_item_created = 0;
-static gint n_ea_calendar_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_calendar_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_item_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GNOME_TYPE_CANVAS_ITEM);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalendarItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_item_class_init (EaCalendarItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_calendar_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_item_get_name;
-	class->get_description = ea_calendar_item_get_description;
-
-	class->get_n_children = ea_calendar_item_get_n_children;
-	class->ref_child = ea_calendar_item_ref_child;
-}
-
-AtkObject* 
-ea_calendar_item_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_ITEM, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE;
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_item_created = %d\n",
-		n_ea_calendar_item_created);
-#endif
-	/* connect signal handlers */
-	g_signal_connect (obj, "selection_preview_changed",
-			  G_CALLBACK (selection_preview_change_cb),
-			  atk_object);
-	g_signal_connect (obj, "date_range_changed",
-			  G_CALLBACK (date_range_changed_cb),
-			  atk_object);
-	g_signal_connect (obj, "selection_preview_changed",
-			  G_CALLBACK (selection_changed_cb),
-			  atk_object);
-
-	return atk_object;
-}
-
-static void
-ea_calendar_item_finalize (GObject *object)
-{
-	EaCalendarItem *ea_calitem;
-
-	g_return_if_fail (EA_IS_CALENDAR_ITEM (object));
-
-	ea_calitem = EA_CALENDAR_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_calendar_item_destory_cell_data (ea_calitem);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_calendar_item_destroyed = %d\n",
-		n_ea_calendar_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	static gchar new_name[256] = "";
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	if (accessible->name)
-		return accessible->name;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (e_calendar_item_get_date_range (calitem,
-					    &start_year, &start_month, &start_day,
-					    &end_year, &end_month, &end_day)) {
-		++start_month;
-		++end_month;
-		sprintf (new_name, "calendar (from %d-%d-%d to %d-%d-%d)",
-			 start_year, start_month, start_day,
-			 end_year, end_month, end_day);
-	}
-
-#if 0
-	if (e_calendar_item_get_selection (calitem, &select_start, &select_end)) {
-		GDate select_start, select_end;
-		gint year1, year2, month1, month2, day1, day2;
-
-		year1 = g_date_get_year (&select_start);
-		month1  = g_date_get_month (&select_start);
-		day1 = g_date_get_day (&select_start);
-
-		year2 = g_date_get_year (&select_end);
-		month2  = g_date_get_month (&select_end);
-		day2 = g_date_get_day (&select_end);
-
-		sprintf (new_name + strlen (new_name),
-			 " : current selection: from %d-%d-%d to %d-%d-%d.",
-			 year1, month1, day1,
-			 year2, month2, day2);
-	}
-#endif
-
-	return new_name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return "evolution calendar item";
-}
-
-static gint
-ea_calendar_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children = 0;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return 0;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (end_day, end_month + 1, end_year);
-
-	n_children = g_date_days_between (start_date, end_date) + 1;
-	g_free (start_date);
-	g_free (end_date);
-	return n_children;
-}
-
-static AtkObject *
-ea_calendar_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children;
-	ECalendarCell *cell;
-	EaCellTable *cell_data;
-	EaCalendarItem *ea_calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	n_children = ea_calendar_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_calitem = EA_CALENDAR_ITEM (accessible);
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		cell = e_calendar_cell_new (calitem,
-					    index / EA_CALENDAR_COLUMN_NUM,
-					    index % EA_CALENDAR_COLUMN_NUM);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-
-#ifdef ACC_DEBUG
-	g_print ("AccDebug: ea_calendar_item children[%d]=%p\n", index,
-		 (gpointer)cell);
-#endif
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	index = EA_CALENDAR_COLUMN_NUM * row + column;
-	return ea_calendar_item_ref_child (ATK_OBJECT (ea_calitem), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	return (n_children - 1) / EA_CALENDAR_COLUMN_NUM + 1;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return EA_CALENDAR_COLUMN_NUM;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return row * EA_CALENDAR_COLUMN_NUM + column;
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index % EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index / EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable *table,
-				   gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_height;
-}
-
-/* any day in the row is selected, the row is selected */
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows;
-	ECalendarItem *calitem;
-	gint row_index_start, row_index_end;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-
-	row_index_start = row * EA_CALENDAR_COLUMN_NUM;
-	row_index_end = row_index_start + EA_CALENDAR_COLUMN_NUM - 1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	sel_index_start =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&start_date),
-						     g_date_get_month (&start_date),
-						     g_date_get_day (&start_date));
-	sel_index_end =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&end_date),
-						     g_date_get_month (&end_date),
-						     g_date_get_day (&end_date));
-
-	if ((sel_index_start < row_index_start &&
-	     sel_index_end >= row_index_start) ||
-	    (sel_index_start >= row_index_start &&
-	     sel_index_start <= row_index_end))
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows, n_columns;
-	ECalendarItem *calitem;
-	gint index;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-	n_columns = table_interface_get_n_columns (table);
-	if (column < 0 || column >= n_columns)
-		return FALSE;
-
-	index = table_interface_get_index_at (table, row, column);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	sel_index_start =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&start_date),
-						     g_date_get_month (&start_date),
-						     g_date_get_day (&start_date));
-	sel_index_end =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&end_date),
-						     g_date_get_month (&end_date),
-						     g_date_get_day (&end_date));
-
-	if (sel_index_start <= index && sel_index_end >= index)
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint column)
-{
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint **rows_selected)
-{
-	*rows_selected = NULL;
-	return -1;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	*columns_selected = NULL;
-	return -1;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_columns;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_columns = table_interface_get_n_columns (table);
-	if (in_col < 0 || in_col >= n_columns)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128] = "column description";
-		ea_calendar_item_get_column_label (ea_calitem, in_col,
-						   buffer, sizeof (buffer));
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data,
-							      in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_rows;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128] = "row description";
-		ea_calendar_item_get_row_label (ea_calitem, row,
-						buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-							   row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint year, month, day;
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	/* FIXME: not support mulit-selection */
-	g_date_set_dmy (&start_date, day, month + 1, year);
-	end_date = start_date;
-	e_calendar_item_set_selection (calitem, &start_date, &end_date);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_set_selection (calitem, NULL, NULL);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint count, sel_offset;
-	GDate start_date, end_date;
-
-	count = selection_interface_get_selection_count (selection);
-	if (i < 0 || i >= count)
-		return NULL;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_calitem));
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-	sel_offset = e_calendar_item_get_offset_for_date (calitem,
-							  g_date_get_year (&start_date),
-							  g_date_get_month (&start_date),
-							  g_date_get_day (&start_date));
-
-	return ea_calendar_item_ref_child (ATK_OBJECT (selection), sel_offset + i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	return g_date_days_between (&start_date, &end_date) + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint row, column, n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_children = atk_object_get_n_accessible_children (ATK_OBJECT (selection));
-	if (index < 0 || index >= n_children)
-		return FALSE;
-
-	row = index / EA_CALENDAR_COLUMN_NUM;
-	column = index % EA_CALENDAR_COLUMN_NUM;
-
-	return table_interface_is_selected (ATK_TABLE (selection), row, column);
-}
-
-/* callbacks */
-
-static void
-selection_preview_change_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-
-	g_signal_emit_by_name (atk_obj, "selection_changed");
-}
-
-static void
-date_range_changed_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calendar_item_destory_cell_data (EA_CALENDAR_ITEM (atk_obj));
-
-	g_signal_emit_by_name (atk_obj, "model_changed");
-}
-
-static void
-selection_changed_cb (ECalendarItem *calitem)
-{
-	selection_preview_change_cb (calitem);
-}
-
-/* helpers */
-
-static EaCellTable *
-ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_calitem, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-
-	if (!cell_data) {
-		gint n_cells = ea_calendar_item_get_n_children (ATK_OBJECT(ea_calitem));
-		cell_data = ea_cell_table_create (n_cells/EA_CALENDAR_COLUMN_NUM,
-						  EA_CALENDAR_COLUMN_NUM,
-						  FALSE);
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_calitem);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", NULL);
-	}
-}
-
-static gboolean
-ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, gint row,
-				gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint index, week_num;
-	gint year, month, day;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	index = atk_table_get_index_at (ATK_TABLE (ea_calitem), row, 0);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	week_num = e_calendar_item_get_week_number (calitem,
-						    day, month, year);
-
-	g_snprintf (buffer, buffer_size, "week number : %d", week_num);
-	return TRUE;
-}
-
-static gboolean
-ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column,
-				   gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gchar *week_char;
-	gint char_size;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	week_char = g_utf8_offset_to_pointer (calitem->days, column);
-	char_size = strlen (calitem->days) -
-		strlen (g_utf8_find_next_char (calitem->days, NULL));
-
-	if (week_char && char_size < buffer_size) {
-		memcpy (buffer, week_char, char_size);
-		buffer[char_size] = '\0';
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/* the coordinate the e-calendar canvas coord */
-gboolean
-e_calendar_item_get_day_extents (ECalendarItem *calitem,
-				 gint year, gint month, gint date,
-				 gint *x, gint *y,
-				 gint *width, gint *height)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	gint char_height, xthickness, ythickness, text_y;
-	gint new_year, new_month, num_months, months_offset;
-	gint month_x, month_y, month_cell_x, month_cell_y;
-	gint month_row, month_col;
-	gint day_row, day_col;
-	gint days_from_week_start;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-
-	/* Set up Pango prerequisites */
-	font_desc = calitem->font_desc;
-	if (!font_desc)
-		font_desc = style->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-
-	char_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
-
-	xthickness = style->xthickness;
-	ythickness = style->ythickness;
-
-	new_year = year;
-	new_month = month;
-	e_calendar_item_normalize_date	(calitem, &new_year, &new_month);
-	num_months = calitem->rows * calitem->cols;
-	months_offset = (new_year - calitem->year) * 12
-		+ new_month - calitem->month;
-
-	if (months_offset > num_months || months_offset < 0)
-		return FALSE;
-
-	month_row = months_offset / calitem->cols;
-	month_col = months_offset % calitem->cols;
-
-	month_x = item->x1 + xthickness + calitem->x_offset
-		+ month_col * calitem->month_width;
-	month_y = item->y1 + ythickness + month_row * calitem->month_height;
-
-	month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
- 		+ calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-	text_y = month_y + ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS + calitem->month_tpad;
-
-	month_cell_y = text_y + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-
-	days_from_week_start =
-		e_calendar_item_get_n_days_from_week_start (calitem, new_year,
-							    new_month);
-	day_row = (date + days_from_week_start - 1) / EA_CALENDAR_COLUMN_NUM;
-	day_col = (date + days_from_week_start - 1) % EA_CALENDAR_COLUMN_NUM;
-
-	*x = month_cell_x + day_col * calitem->cell_width;
-	*y = month_cell_y + day_row * calitem->cell_height;
-	*width = calitem->cell_width;
-	*height = calitem->cell_height;
-
-	return TRUE;
-}
-
-/* month is from 0 to 11 */
-gboolean
-e_calendar_item_get_date_for_offset (ECalendarItem *calitem, gint day_offset,
-				     gint *year, gint *month, gint *day)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-
-	g_date_add_days (start_date, day_offset);
-
-	*year = g_date_get_year (start_date);
-	*month = g_date_get_month (start_date) - 1;
-	*day = g_date_get_day (start_date);
-
-	return TRUE;
-}
-
-/* month is from 0 to 11 */
-gint
-e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-				     gint year, gint month, gint day)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-	gint n_days;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), -1);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (day, month + 1, year);
-
-	n_days = g_date_days_between (start_date, end_date);
-	g_free (start_date);
-	g_free (end_date);
-	return n_days;
-}
-
-gint
-e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-					    gint year, gint month)
-{
-	struct tm tmp_tm;
-	gint start_weekday, days_from_week_start;
-
-	memset (&tmp_tm, 0, sizeof (tmp_tm));
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-	start_weekday = (tmp_tm.tm_wday + 6) % 7;   /* 0 to 6 */
-	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
-		% 7;
-	return days_from_week_start;
-}
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
deleted file mode 100644
index 04df5f94ac..0000000000
--- a/a11y/widgets/ea-calendar-item.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_ITEM_H__
-#define __EA_CALENDAR_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include <misc/e-calendar-item.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CALENDAR_ITEM                   (ea_calendar_item_get_type ())
-#define EA_CALENDAR_ITEM(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItem))
-#define EA_CALENDAR_ITEM_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-#define EA_IS_CALENDAR_ITEM(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_ITEM))
-#define EA_IS_CALENDAR_ITEM_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_ITEM))
-#define EA_CALENDAR_ITEM_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-
-typedef struct _EaCalendarItem                   EaCalendarItem;
-typedef struct _EaCalendarItemClass              EaCalendarItemClass;
-
-struct _EaCalendarItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_calendar_item_get_type (void);
-
-struct _EaCalendarItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_calendar_item_new (GObject *obj);
-gboolean e_calendar_item_get_day_extents (ECalendarItem *calitem,
-					  gint year, gint month, gint date,
-					  gint *x, gint *y,
-					  gint *width, gint *height);
-gboolean e_calendar_item_get_date_for_offset (ECalendarItem *calitem,
-					      gint day_offset,
-					      gint *year, gint *month,
-					      gint *day);
-gint e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-					  gint year, gint month, gint day);
-gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-						 gint year, gint month);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CALENDAR_ITEM_H__ */
diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c
deleted file mode 100644
index edead1b785..0000000000
--- a/a11y/widgets/ea-widgets.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-factory.h"
-#include "widgets/ea-calendar-item.h"
-#include "ea-widgets.h"
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new)
-
-void e_calendar_item_a11y_init (void)
-{
-    EA_SET_FACTORY (e_calendar_item_get_type (), ea_calendar_item);
-}
diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h
deleted file mode 100644
index e9ec9b3ad9..0000000000
--- a/a11y/widgets/ea-widgets.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_WIDGETS_H__
-#define _EA_WIDGETS_H__
-
-void e_calendar_item_a11y_init (void);
-
-#endif /* _EA_WIDGETS_H__ */
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 63008b790d..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,182 +0,0 @@
-# evolution/acinclude.m4
-# shared configure.in hacks between Evolution and Connector
-
-# EVO_CHECK_LIB(dispname, pkgname, minvers[, maxvers])
-# Checks if the package with human-readable name @dispname, known
-# to gnome-config as @pkgname exists and has an appropriate version.
-# The version must be >= @minvers. If @maxvers is equal to @minvers,
-# it must be exactly that version. Otherwise, if @maxvers is set,
-# the version must be LESS THAN @maxvers (not less than or equal).
-AC_DEFUN(EVO_CHECK_LIB, [
-	dispname="$1"
-	pkgname="$2"
-	minvers="$3"
-	maxvers="$4"
-
-	AC_MSG_CHECKING(for $dispname)
-
-	if gnome-config --libs $pkgname > /dev/null 2>&1; then
-		pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[[^0-9]]*//'`
-	else
-		pkgvers=not
-	fi
-	AC_MSG_RESULT($pkgvers found)
-
-	pkgvers=`echo $pkgvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`
-	cmpminvers=`echo $minvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`
-	cmpmaxvers=`echo $maxvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`
-	ok=yes
-	if test "$pkgvers" -lt $cmpminvers; then
-		ok=no
-	elif test -n "$maxvers"; then
-		if test "$pkgvers" -gt $cmpmaxvers; then
-			ok=no
-		elif test "$maxvers" != "$minvers" -a "$cmpmaxvers" -eq "$pkgvers"; then
-			ok=no
-		fi
-	fi
-	if test $ok = no; then
-		case $maxvers in
-		"")
-			dispvers="$minvers or higher"
-			;;
-		$minvers)
-			dispvers="$minvers (exactly)"
-			;;
-		*)
-			dispvers="$minvers or higher, but less than $maxvers,"
-			;;
-		esac
-
-		AC_MSG_ERROR([
-""
-"You need $dispname $dispvers to build $PACKAGE"
-"If you think you already have this installed, consult the README."])
-	fi
-])
-
-
-# EVO_PURIFY_SUPPORT
-# Add --enable-purify. If the user turns it on, subst PURIFY and set
-# the automake conditional ENABLE_PURIFY
-AC_DEFUN(EVO_PURIFY_SUPPORT, [
-	AC_ARG_ENABLE(purify, 
-	[  --enable-purify=[no/yes]      Enable support for building executables with Purify.],,enable_purify=no)
-	AC_PATH_PROG(PURIFY, purify, impure)
-	AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])
-	if test "x$with_purify_options" = "xno"; then
-		with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
-	fi
-	if test "x$PURIFYOPTIONS" = "x"; then
-		PURIFYOPTIONS=$with_purify_options
-	fi
-	AC_SUBST(PURIFY)
-	AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")
-	PURIFY="$PURIFY $PURIFYOPTIONS"
-])
-
-
-# EVO_LDAP_CHECK(default)
-# Add --with-openldap and --with-static-ldap options. --with-openldap
-# defaults to the given value if not specified. If LDAP support is
-# configured, HAVE_LDAP will be defined and the automake conditional
-# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
-# appropriately.
-AC_DEFUN(EVO_LDAP_CHECK, [
-	default="$1"
-
-	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
-	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
-	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
-	case $ac_cv_with_openldap in
-	no|"")
-		with_openldap=no
-		;;
-	yes)
-		with_openldap=/usr
-		;;
-	*)
-		with_openldap=$ac_cv_with_openldap
-		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
-		;;
-	esac
-
-	if test "$with_openldap" != no; then
-		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-
-		case $with_static_ldap in
-		no|"")
-			with_static_ldap=no
-			;;
-		*)
-			with_static_ldap=yes
-			;;
-		esac
-
-		AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [
-			CPPFLAGS_save="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
-			AC_EGREP_CPP(yes, [
-				#include "ldap.h"
-				#if LDAP_VENDOR_VERSION > 20000
-				yes
-				#endif
-			], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)
-			CPPFLAGS="$CPPFLAGS_save"
-		])
-		if test "$ac_cv_openldap_version2" = no; then
-			AC_MSG_ERROR(evolution requires OpenLDAP version >= 2)
-		fi
-
-		AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
-		AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
-		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
-		AC_CHECK_LIB(lber, ber_get_tag, [
-			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
-
-				# libldap might depend on OpenSSL... We need to pull
-				# in the dependency libs explicitly here since we're
-				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-				fi
-			else
-				LDAP_LIBS="-llber $LDAP_LIBS"
-			fi
-			AC_CHECK_LIB(ldap, ldap_open, [
-					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
-					else
-						LDAP_LIBS="-lldap $LDAP_LIBS"
-					fi],
-				LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
-		], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-
-		if test -z "$LDAP_LIBS"; then
-			AC_MSG_ERROR(could not find OpenLDAP libraries)
-		fi
-
-		AC_SUBST(LDAP_CFLAGS)
-		AC_SUBST(LDAP_LIBS)
-	fi
-	AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no)
-])
-
-# EVO_PTHREAD_CHECK
-AC_DEFUN([EVO_PTHREAD_CHECK],[
-	PTHREAD_LIB=""
-	AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-		[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
-		    [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
-				[AC_CHECK_FUNC(pthread_create)]
-			)]
-		    )]
-		)]
-	)
-	AC_SUBST(PTHREAD_LIB)
-	AC_PROVIDE([EVO_PTHREAD_CHECK])
-])
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 a68d11b86c..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,2951 +0,0 @@
-2003-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): change prototype to fix warning, and change the
-	comment to read load_source instead of load_uri (which isn't what
-	we use anymore.)
-	(update_completion_books): just use our source list for this.
-	check the "completion" source property.
-	(source_list_changed): recreate the completion books.
-	(e_select_names_manager_init): connect to the source_list's
-	changed signal.
-	(e_select_names_manager_dispose): don't need to free the
-	completion_uids list anymore.
-
-	* gui/component/select-names/e-select-names-config.c
-	(e_select_names_config_get_completion_books,
-	e_select_names_config_set_completion_books,
-	e_select_names_config_add_notification_completion_books): remove.
-
-	* gui/component/select-names/e-select-names-config.h: remove the
-	completion books calls, since we can just use the source list.
-
-	* gui/component/component-factory.c (factory): create the
-	autocompletion control.
-
-	* gui/component/autocompletion-config.[ch]: new config control for
-	selecting completion folders.  Uses e-source-selector.  Could
-	probably be beautified a bit.
-	
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add autocompletion-config.[ch]
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the ldap config control server, and add the autocompletion one.
-
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: no more custom
-	widget for the selection of the search source
-
-	* gui/component/select-names/e-select-names.h: add member
-
-	* gui/component/select-names/e-select-names.etspec: update model
-	column
-
-	* gui/component/select-names/e-select-names.c (find_first_source):
-	find the first source in the list
-	(addressbook_model_set_source): we have the source to set directly
-	now
-	(source_selected): listen for the source item to change
-	(e_select_names_init): create a source option menu and hook it up
-	(e_select_names_dispose): destroy the source list
-	(e_select_names_new): do away with the config setup here
-
-	* gui/component/select-names/e-select-names-manager.h: update
-	members
-
-	* gui/component/select-names/e-select-names-manager.c
-	(update_completion_books): add books based on source uid
-	(config_completion_books_changed_cb): handle the completion list
-	changing
-	(config_min_query_length_changed_cb): handle minimum query length
-	changing
-	(e_select_names_manager_new): we don't do the settings stuff here
-	any more
-	(e_select_names_manager_init): do the initial set up here for the
-	book loaded and listen for changes
-	(e_select_names_manager_dispose): destroy the new stuff
-
-	* gui/component/select-names/e-select-names-config.[hc]: config
-	information
-
-	* gui/component/select-names/e-select-names-config-keys.h: the
-	config keys
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): do away with the shell client
-	stuff
-
-	* gui/component/select-names/Makefile.am: build new files
-
-2003-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (book_view_loaded): call
-	remove_book_view/free_data here as well, to guard against multiple
-	book_view's being loaded.
-
-2003-12-05  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.etspec: Clean up and sync with
-	current model columns.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c
-	(retrieve_shell_view_interface_from_control): Remove.
-	(set_folder_bar_label): Remove.
-	(addressbook_new_control): Don't connect.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c: Do not depend on
-	e-folder-list.
-
-	* gui/component/select-names/e-select-names.c: Remove dependency
-	on evolution-folder-selector-button.
-	(e_addressbook_create_folder_selector): Just return a FIXME label
-	for now.
-	(folder_selected): #if 0 out.
-	(e_select_names_init): Do not connect.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Don't get a shell_client
-	arg anymore.
-	(load_completion_books): Stub out.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't get an EvolutionShellClient anymore.
-	Don't create the folder selector button for now.
-
-	* gui/component/select-names/e-select-names.h: Remove dependency
-	on evolution-shell-client.
-
-	* gui/component/select-names/e-select-names-bonobo.c: Remove
-	dependency on evolution-shell-client.
-	(impl_SelectNames_activate_dialog): Stub out.
-
-	* gui/widgets/eab-gui-util.c: Remove dependency on
-	evolution-shell-client.
-	(eab_transfer_contacts): Stub out.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/Makefile.am: Version the schemas
-	* gui/component/apps_evolution_addressbook.schemas: Removed
-	* gui/component/apps_evolution_addressbook.schemas.in.in: Added
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): Call
-	e_activity_handler_operation_finished() on the current activity ID
-	when done.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (struct AddressbookView): Replace
-	activity_client with activity_id.
-	(set_status_message): Use the EActivityHandler from the
-	AddressbookComponent.
-
-	* gui/component/addressbook-component.c (struct
-	_AddressbookComponentPrivate): New member activity_handler.
-	(addressbook_component_init): Init.
-	(impl_dispose): Unref.
-	(addressbook_component_peek_activity_handler): New.
-	(impl_createControls): Return an ETaskBar as the statusbar control
-	and attach it to the activity handler.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Pass a label for the status bar control for now.
-
-2003-12-01  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): remove
-	GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
-	* gui/component/addressbook-config.c:
-	* gui/component/addressbook.c:
-	* gui/component/component-factory.c:
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/component/select-names/e-select-names-factory.c:
-	* gui/widgets/eab-gui-util.c:
-	* gui/widgets/eab-vcard-control.c: Use BASE_VERSION for repo_ids and
-	  OAFIIDs
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Fix start page text.
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/Makefile.am: use privconduitdir
-
-	* conduit/e-address.conduit.in: subst right thing
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: specify privlibdir as the location
-
-	* conduit/Makefile.am: install the conduit to privlibdir
-
-2003-12-01  JP Rosvear <jpr@ximian.com>
-
-	* conduit/Makefile.am: version the .conduit file
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/new-addressbook.glade: Remove this too.
-
-	* gui/component/Makefile.am (glade_DATA): Remove new-addressbook.glade.
-
-2003-12-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Remove addressbook-storage.[ch] and new-addressbook.[ch].
-
-	* gui/component/addressbook-storage.[ch]: Removed from repository.
-
-	* gui/component/new-addressbook.[ch]: Removed from repository.
-
-	* gui/component/addressbook-component.c (load_uri_for_selection):
-	Set source_uid property on view control, not folder_uri.
-	(new_addressbook_cb): Call addressbook_config_create_new_source ().
-	(edit_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Hook up edit_addressbook_cb ().
-	(addressbook_component_init): Create the LDAP source group.
-
-	* gui/component/addressbook-config.c (AddressbookSourceDialog):
-	Take out the NEW_ADVANCED_UI stuff and add ESource related vars.
-	(ldap_unparse_auth)
-	(ldap_parse_auth)
-	(ldap_unparse_scope)
-	(ldap_unparse_ssl)
-	(ldap_parse_ssl): Moved here from addressbook-storage.c.
-	(addressbook_dialog_get_source)
-	(addressbook_dialog_set_source)
-	(objectclasses_create_server_table)
-	(objectclasses_create_evolution_table)
-	(objectclasses_add_foreach)
-	(objectclasses_add)
-	(objectclasses_sever_double_click)
-	(objectclasses_remove_foreach)
-	(objectclasses_remove)
-	(objectclasses_evolution_double_click)
-	(objectclasses_restore_default)
-	(server_selection_model_changed)
-	(evolution_selection_model_changed)
-	(setup_objectclasses_tab): Nuke aging, unfinished NEW_ADVANCED_UI.
-	(add_source_clicked)
-	(edit_source_clicked)
-	(delete_server)
-	(delete_source_clicked)
-	(ldap_config_control_destroy_callback)
-	(ldap_config_control_apply_callback)
-	(sources_selection_changed)
-	(sources_table_row_activated)
-	(ldap_dialog_new)
-	(addressbook_dialog_create_sources_table)
-	(ldap_config_control_new)
-	(addressbook_config_control_new): Nuke config control.
-	(create_source_dir)
-	(dialog_to_source)
-	(dialog_to_temp_source)
-	(source_to_uri_parts)
-	(source_to_dialog)
-	(source_group_changed_cb)
-	(source_group_menu_add_groups)
-	(folder_page_forward)
-	(finish_page_back): Implement.
-	(addressbook_ldap_init): Take ESource instead of AddressbookSource.
-	(addressbook_ldap_auth): Don't take a source, not needed.
-	(addressbook_root_dse_query): Ditto.
-	(addressbook_source_dialog_destroy): Clean up destroy function.
-	(addressbook_add_server_druid_finish): Clean up, create ESource.
-	(general_tab_check): If it's not LDAP, these options don't matter.
-	(do_ldap_root_dse_query): Source no longer needed here.
-	(query_for_supported_bases): Use a temp source generated from
-	current dialog settings.
-	(display_name_page_prepare): Renamed to folder_page_prepare ().
-	(druid_display_name_page_modify_cb): Renamed to
-	druid_folder_page_modify_cb ().
-	(addressbook_add_server_druid): Set up source list, group selector.
-	Make LDAP pages optional, dependent on selected group. Use ESource.
-	(edit_dialog_store_change): Remove config control list stuff,
-	export settings to ESource.
-	(addressbook_edit_server_dialog): Renamed to
-	addressbook_config_edit_source (), which takes an ESource. Remove
-	config control list stuff, make LDAP pages show up only if we have
-	an LDAP source. Remove NEW_ADVANCED_UI cruft.
-	(addressbook_config_create_new_source): Just call
-	addressbook_add_server_druid ().
-
-	* gui/component/addressbook-config.h: Move LDAP enums here, from
-	addressbook-storage.h.
-
-	* gui/component/addressbook.c (control_activate_cb): uri -> source
-	(addressbook_view_clear): Unref source list.
-	(book_open_cb): Use ESource.
-	(load_uri_auth_cb): Renamed to load_source_auth_cb (), manipulate
-	ESource instead of URI.
-	(get_remember_password): Implement.
-	(set_remember_password): Implement.
-	(addressbook_authenticate): Use ESource properties.
-	(load_uri_cb): Renamed to load_source_cb (), ESource adaptation.
-	(addressbook_load_uri): Renamed to addressbook_load_source (), takes
-	ESource.
-	(addressbook_load_default_book): ESource adaptation.
-	(get_prop): folder_uri property -> source_uid property.
-	(set_prop): folder_uri property -> source_uid property. Find ESource
-	by UID.
-	(addressbook_new_control): Set up source_uid property and ESourceList.
-
-	* gui/component/component-factory.c (factory): Disable config control.
-
-	* gui/component/ldap-config.glade: Druid and notebook dialogs
-	generalized to deal with local sources as well as LDAP. This file
-	should probably be renamed...
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): Use addressbook_load_source (). However, this
-	needs a bit more work to get source UIDs instead of URIs.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Use addressbook_load_source (). However,
-	this needs a bit more work to get source UIDs instead of URIs.
-
-2003-11-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui
-	stuff
-
-	* gui/component/select-names/Makefile.am: turn on deprecated gtk
-	stuff
-
-	* gui/contact-editor/Makefile.am: ditto
-	
-2003-11-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Store
-	a ref to the source selector.
-	(impl_requestCreateItem): Implement.
-	(impl_dispose): Unref the source selector.
-	(addressbook_component_init): Set up default sources.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): If
-	the 'book' property is set, and editability changes, emit a signal
-	to that effect.
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/new-addressbook.c: include e-source from e-d-s
-
-2003-11-13  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_is_cell_editable): Return TRUE for all cells, for now.
-
-	* gui/widgets/e-addressbook-table-adapter.c (card_modified_cb):
-	Renamed to contact_modified_cb ().
-	(addressbook_set_value_at): Port to use EContact instead of ECard.
-	(addressbook_is_cell_editable): Ditto.
-	(addressbook_append_row): Ditto.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_property):
-	Make not editable, ever, and add a comment to this effect.
-	(e_minicard_label_realize): Ditto.
-
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Ditto.
-	(add_field): Ditto.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(impl__get_userCreatableItems): New, implementation for the
-	userCreatableItems property.
-	(impl_requestCreateItem): New, implementation for the
-	requestCreateItem method.
-	(addressbook_component_class_init): Install.
-
-2003-11-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add
-	component_alias of "contacts".
-
-2003-11-08  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	Add new-addressbook.[ch].
-	(glade_DATA): Add new-addressbook.glade.
-
-	* gui/component/addressbook-component.c (add_popup_menu_item):
-	Implement.
-	(new_addressbook_cb): Implement.
-	(delete_addressbook_cb): Implement (skeletal).
-	(fill_popup_menu_callback): Implement.
-	(impl_createControls): Hook up fill_popup_menu_callback().
-
-	* gui/component/new-addressbook.[ch]: New files.
-
-	* gui/component/new-addressbook.glade: New file.
-
-2003-11-07  Dan Winship  <danw@ximian.com>
-
-	* util/Makefile.am (INCLUDES): Remove some includes of directories
-	that don't exist any more
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-editor/Makefile.am: don't include the c marshaller
-	file twice
-
-	* gui/widgets/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/Makefile.am: make sure the marshal header is in the
-	source list
-
-	* gui/component/select-names/Makefile.am: ditto
-
-	* gui/contact-editor/Makefile.am: ditto
-
-	* gui/contact-list-editor/Makefile.am: ditto
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* util/Makefile.am: dist the marshal list
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (change_view_type): don't
-	destroy the widget here - its dead when removed from the paned
-	container
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	addressbook to evolution-data-server; it also deletes the old
-	backend files
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): fix cast.
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names-factory.c: Update
-	factory ID.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Version the SelectNames server IDs by appending a "_2".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Change
-	"evolution:config_item" into "evolution2:config_item".
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: add the
-	S/MIME config control here.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_new): change
-	the poa hint to PER_REQUEST.  fixes a couple of deadlocks.
-
-2003-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/component-factory.c (factory): ifdef the smime
-	code with HAVE_NSS.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	conditionally include libevolution-smime.la.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend
-	on libebook, but NOT on libpasfile, etc, since it needs to be
-	linked into all backends, not just the wombat.
-	(libpasfile_la_LIBADD): depend on libpas.la and libedb3util.la
-	(libpasvcf_la_LIBADD): depend on libpas.la
-	(libpasldap_la_LIBADD): depend on libpas.la and  $(LDAP_LIBS)
-
-2003-10-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_date_equal): new util func
-
-	* backend/pas/pas-backend-ldap.c (anniversary_compare,
-	birthday_compare): Use it
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_check_contact): Check if an ID exists in the
-	summary.
-
-2003-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/Makefile.am: convert 8 spaces to a tab.
-
-	* tools/.cvsignore: ignore evolution-addressbook-abuse and
-	evolution-addressbook-clean.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libevolution-smime.la.
-
-	* gui/component/component-factory.c (factory): add the certificate
-	manager config control stuff here, at least for now.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: same.
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_source_table): fixed typo in variable name.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_sort_order" property.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls):
-	Make the the scrolled window have an "in" shadow.
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_create_sources_table): Likewise.
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): Likewise.
-	(create_treeview_view): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_createControls): Set
-	the GtkScrolledWindow scrollbar policy to "automatic" for both the
-	horizontal and the vertical scrollbar.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c: make it work with the new ebook api
- 
- 	* backend/pas/pas-book.c (pas_book_respond_get_changes): put the
- 	vcard in for every change
- 
- 	* backend/pas/pas-backend.c (pas_backend_change_add_new): just use
- 	the vcard field
- 	(pas_backend_change_modify_new): ditto
- 	(pas_backend_change_delete_new): ditto
- 
- 	* backend/pas/pas-backend-file.c
- 	(pas_backend_file_changes_foreach_key): create a fake contact with
- 	the uid
- 	(pas_backend_file_get_changes): add the card to the changes
- 
- 	* backend/ebook/tests/ebook/test-changes.c (main): just print the
- 	uid
- 
- 	* backend/ebook/e-book.c (e_book_free_change_list): unref the
- 	contact
- 
- 	* backend/ebook/e-book-types.h: the change struct contains an
- 	EContact now
- 
- 	* backend/ebook/e-book-listener.c
- 	(impl_BookListener_respond_get_changes): create the contact from
- 	the vcard string
- 
- 	* backend/idl/addressbook.idl: Book change item is no longer a
- 	union, it always gives back a card
-	
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* tools/evolution-addressbook-abuse.c: use the synchronous api for
-	this.  simplifies it a bunch.
-
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): we can ill afford
-	bad debug spew.
-	(view_listener_died_cb): implement.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): hook up an
-	ORBit_small connection listener on the view's listener.
-	(pas_book_respond_create): use e_contact_get_const instead of
-	e_contact_get here.  fixes a leak.
-
-	* backend/pas/pas-book-view.c
-	(impl_GNOME_Evolution_Addressbook_BookView_stop): implement, call
-	pas_backend_stop_book_view.
-	(pas_book_view_get_listener): return the book view's listener.
-	(pas_book_view_class_init): fill in epv->stop.
-	(pas_book_view_init): use a #define for THRESHOLD_MAX instead of
-	the constant.
-
-	* backend/pas/pas-book-view.h: add prototype for
-	pas_book_view_get_listener.
-
-	* backend/pas/pas-backend.c (pas_backend_stop_book_view):
-	implement.
-	(pas_backend_remove_book_view): implement.
-
-	* backend/pas/pas-backend.h: add prototype for stop_book_view and
-	remove_book_view.
-
-	* backend/pas/pas-backend-vcf.c (load_file): pass in the fd and
-	use fdopen here.
-	(foreach_build_list): don't creat EContacts here, because we'll
-	just be converting them back to vcards anyway.
-	(save_file): use char*'s instead of EContacts, and split entries
-	with 2 blank lines.  Also, hold the lock over the entire function.
-	(do_create): hold the lock around uid generation and touching the
-	hash table.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_stop_book_view): new function, but leave
-	unimplemented for now.
-	(pas_backend_vcf_load_uri): the uri contains the directory name,
-	not the filename.
-	(pas_backend_vcf_dispose): grab the lock here just for sanity's
-	sake.  Also reorder things a bit, and free the hashtable and
-	mutex.
-	(pas_backend_vcf_init): init the mutex.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): don't unref the contact here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_stop_book_view): new function, but leave
-	unimplemented for now.
-
-	* backend/pas/pas-backend-file.c (build_summary): use an EContact
-	for this call.
-	(do_summary_query): nuke, the contents of this has been moved to
-	start_book_view.
-	(pas_backend_file_search_timeout): same.
-	(pas_backend_file_search): same.
-	(pas_backend_file_start_book_view): glom everything into here
-	involving searching.  This function could (and should) be renamed
-	and reused from both this function and _get_contact_list.
-	(pas_backend_file_stop_book_view): new function.
-	(pas_backend_file_class_init): fill in backend->stop_book_view.
-
-	* backend/pas/Makefile.am (LDAP_BACKEND): libpasldap.a ->
-	libpasldap.la
-	(noinst_LTLIBRARIES): *.a -> *.la.
-	(libpas_la_SOURCES): same.
-	(libpasfile_la_SOURCES): same.
-	(libpasvcf_la_SOURCES): same.
-	(libpasldap_la_SOURCES): same.
-
-	* backend/idl/addressbook.idl: add BookView::stop.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): fix GString
-	related leaks.
-	(read_attribute_params): same.
-	(parse): don't leak the EVCardAttributes corresponding to
-	BEGIN/END:vCard.
-	(free_gstring): new function
-	(e_vcard_attribute_remove_values): free the decoded_values list,
-	using free_gstring.
-
-	* backend/ebook/e-book.c (e_book_response_get_book_view): ref the
-	listener here.
-
-	* backend/ebook/e-book-view.h: add prototype for e_book_view_stop.
-
-	* backend/ebook/e-book-view.c (e_book_view_stop): new function.
-
-	* backend/ebook/e-book-async.c (_get_book_view_response_dtor):
-	unref the book view.
-
-2003-10-20  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-book-view.c: Queue up removes and modifies as
-	well as adds, and remove the calls that took a list of changes
-	rather than a single change, since no one was really using the
-	list versions. Keep a list of IDs currently in the view so we can
-	more easily figure out what changes count as adds, modifies, and
-	removes.
-	(send_pending_adds): Don't reset next_threshold if it's being
-	called from notify_add.
-	(send_pending_changes, send_pending_removes): New
-	(pas_book_view_notify_update): Simplified add/change interface.
-	Takes an EContact and figures out if it's new, modified, or
-	removed relative to this view.
-	(pas_book_view_notify_change, pas_book_view_notify_change_1,
-	pas_book_view_notify_add, pas_book_view_notify_add_1): Gone.
-	(pas_book_view_notify_remove): Now does what remove_1 used to do.
-	(pas_book_view_vcard_matches): Remove this; no longer used.
-
-	* backend/pas/pas-backend.c (pas_backend_notify_update): New.
-	Calls pas_book_view_notify_update() on each of the backend's views.
-	(pas_backend_notify_remove): Likewise for notify_remove().
-	(pas_backend_notify_complete): And notify_complete().
-
-	* backend/pas/pas-book.c (pas_book_respond_create): Take an
-	EContact instead of an id and a vcard. Use
-	pas_backend_notify_update.
-	(pas_book_respond_remove_contacts): Use pas_backend_notify_remove.
-	(pas_book_respond_modify): Take a single EContact instead of two
-	vcards. Use pas_backend_notify_update.
-
-	* backend/pas/pas-backend-sync.c
-	(pas_backend_sync_create_contact): Return an EContact rather than
-	an id.
-	(pas_backend_sync_modify_contact): Return an EContact rather than
-	the old_vcard.
-	(_pas_backend_create_contact, _pas_backend_modify_contact): Update
-
-	* backend/pas/pas-backend-file.c (do_summary_query): Use
-	pas_book_view_notify_update.
-	(pas_backend_file_search_timeout): Likewise
-	(pas_backend_file_create_contact): Update for API changes
-	(pas_backend_file_modify_contact): Likewise.
-
-	* backend/pas/pas-backend-ldap.c (create_contact_handler,
-	pas_backend_ldap_process_create_contact): Update for API changes
-	(modify_contact_modify_handler, modify_contact_search_handler,
-	pas_backend_ldap_process_modify_contact): Likewise
-	(ldap_search_handler): Use pas_book_view_notify_update
-
-	* backend/pas/pas-backend-vcf.c (foreach_search_compare): Use
-	pas_book_view_notify_update.
-	(pas_backend_vcf_process_create_contact): Update for API changes
-	(pas_backend_vcf_process_modify_contact): Likewise
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): Take an EContact instead of a
-	const char *vcard.
-
-	* backend/ebook/e-contact.c (photo_getter): s/malloc/g_malloc/
-
-2003-10-20  JP Rosevear <jpr@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_search): compiler
-	with non-c99 compilers
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (fn_getter): new function, just return
-	the full name value.
-	(fn_setter): rather distasteful hack.  set the N attribute if it's
-	not already present.
-	(n_setter): set the X-EVOLUTION-FILE-AS attribute if it's not
-	already set.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add PROP_WRITE_ONLY
-	flag for properties (right now just 'sn') that we don't want to
-	use when building the EContact - we only use it when storing the
-	contact out to the ldap server.
-	(build_contact_from_entry): skip WRITE_ONLY properties.
-
-2003-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): add the
-	minicard factory back in.
-	(display_view): add the minicard case back in.
-	(get_selection_model): same.
-	(minicard_right_click): resurrect.
-	(create_minicard_view): same.
-	(change_view_type): add the minicard case back in.
-	(eab_view_print): same.
-	(eab_view_print_preview): same.
-
-	* gui/widgets/e-addressbook-view.h (EABViewType): add MINICARD
-	back in.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_new):
-	E_TYPE_AB_MODEL -> EAB_TYPE_MODEL.
-
-	* gui/widgets/e-addressbook-model.h: rename E_TYPE_AB_MODEL to
-	EAB_TYPE_MODEL.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add the
-	minicard stuff back into the build.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch],
-	gui/widgets/e-minicard-label.[ch],
-	gui/widgets/e-minicard-view-widget.[ch],
-	gui/widgets/e-minicard-view.[ch], gui/widgets/e-minicard.[ch],
-	gui/widgets/gal-view-factory-minicard.[ch], gal-view-minicard.h:
-	resurrect the minicard stuff, in a new uneditable,
-	EContact-friendly state.  no in-place editing anymore.
-
-	
-2003-10-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_info): un-ifdef
-	the date handling code.
-	(extract_info): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): add the address
-	labels and dates to the build.
-	(anniversary_populate): un-ifdef and get this working.
-	(anniversary_ber): same.
-	(anniversary_compare): same.
-	(birthday_populate): same.
-	(birthday_ber): same.
-	(birthday_compare): same.
-
-	* backend/ebook/tests/ebook/.cvsignore,
-	backend/ebook/tests/ebook/Makefile.am
-	backend/ebook/tests/ebook/test-date.c: add a test for EContactDate
-	getting/setting.
-	
-	* backend/ebook/e-vcard.h: add EVC_BDAY.
-
-	* backend/ebook/e-contact.h: add prototypes for the
-	e_contact_date_* functions.
-
-	* backend/ebook/e-contact.c (field_info): add
-	BIRTH_DATE/ANNIVERSARY fields.
-	(date_getter): new
-	(date_setter): new
-	(e_contact_date_new): new
-	(e_contact_date_from_string): new
-	(e_contact_date_to_string): new
-	(e_contact_date_free): new
-
-2003-10-10  Not Zed  <NotZed@Ximian.com>
-
-	*
-	gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	Use the main factory on the .so file, so it can be found.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (contact_key): add a
-	descriptive comment about this "#if notyet".
-
-	* gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_thaw): add prorotype for
-	e_select_names_model_cancel_all_contact_load.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(_EntryPropertyID): remove the SIMPLE_CARD_LIST property.
-	(entry_get_property_fn): same.
-	(impl_SelectNames_get_entry_for_section): same.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_name_to_string.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-book-util.c: remove a bunch of ifdef'ed code (that's
-	going to be living in e-book.c)
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): un-ifdef some code.
-	(pas_backend_summary_get_summary_vcard): same.
-
-	* backend/pas/pas-backend-ldap.c (prop_info): remove the
-	query_prop field since we can get it from e_contact_field_name.
-	also remove it from all the macros and their uses.
-	(homephone_populate): un-ifdef.
-	(homephone_ber): same.
-	(homephone_compare): same.
-	(business_populate): same.
-	(business_ber): same.
-	(business_compare): same.
-	(query_prop_to_ldap): use e_contact_field_name to get the query
-	prop for a given attribute.
-	(add_oc_attributes_to_supported_fields): same.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_phone): use the new
-	EContactField constants to iterate over the phone list.
-
-	* backend/ebook/e-contact.h (EContactField): add some useful
-	constants for those pieces of code that iterate over
-	email/phones/addresses.
-
-2003-10-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-vcard-control.c (book_open_cb): un-ifdef this.
-	(eab_vcard_control_new): put the buttons above the vcard so they
-	don't move when it's expanded.
-
-	* gui/widgets/eab-popup-control.h: remove prototypes for
-	eab_popup_control_set_name and eab_popup_control_set_email.
-
-	* gui/widgets/eab-popup-control.c (email_table_ok_cb): remove the
-	stupid idle function and do the work here.
-	(eab_popup_control_set_name): make this static - noone uses it.
-	(eab_popup_control_set_email): same.
-
-	* gui/widgets/eab-gui-util.c (eab_show_contact_editor):
-	e_contact_editor_new is what we use for the time being.
-
-	* gui/widgets/eab-contact-display.c (render_string): abstract this
-	code out.
-	(render_url): same.
-	(eab_contact_display_render_normal): make use of render_string and
-	render_url.
-
-	* gui/widgets/e-addressbook-view.c (delete): un-ifdef this and get
-	it working.
-	(selection_received): same.
-
-	* gui/widgets/e-addressbook-model.c (get_view): nuke some code
-	that was moved to another function.
-	(eab_model_set_property): get the writable state when we set the
-	book - don't rely on the timing of signals.
-
-	* gui/contact/editor/contact-editor.glade: add the blog field
-	below the homepage url field.
-	
-	* gui/contact/editor/e-contact-editor-address.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact/editor/e-contact-editor-fullname.[ch]: get this
-	building with the new stuff.
-	
-	* gui/contact-editor/e-contact-editor.[ch]: get this most of the
-	way there.
-	
-	* gui/contact-editor/e-contact-quick-add.[ch]: get this building
-	with the new stuff.
-
-	* gui/contact-editor/Makefile.am (libecontacteditor_la_SOURCES):
-	remove e-contact-save-as.[ch].  They're in
-	addressbook/widgets/eab-gui-util.[ch] now.
-
-	* gui/merging/Makefile.am: track all the naming changes.
-	
-	* gui/merging/*.glade: gratuitous renaming.
-	
-	* gui/merging/eab-contact-compare.[ch]: gratuitous renaming, and
-	move this from the old ebook/
-
-	* gui/merging/eab-contact-merging.[ch]: gratuitous renaming.
-
-	* backend/ebook/e-contact.[ch]: lots of overly complicated changes
-	for an overly complicated piece of code.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event): remove
-	some ifdef'ed code.
-	(e_book_view_do_modified_event): same.
-
-	* backend/ebook/e-vcard.c (parse): plug a memory leak.
-	(escape_string): deal with @s being NULL.
-	(e_vcard_remove_attribute): new function.
-	(e_vcard_attribute_remove_params): same.
-	(e_vcard_attribute_param_free): same.
-	(e_vcard_attribute_param_remove_values): same.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_remove_attribute, e_vcard_attribute_remove_params, and
-	e_vcard_attribute_param_remove_values.
-
-	* backend/ebook/e-book.c (e_book_handle_response): cache the
-	writable state of the ebook before generating the signal.
-	(e_book_unload_uri): initialize cap to NULL and writable to FALSE.
-
-	* backend/ebook/e-book.h: add prototype for e_book_is_writable.
-
-	* backend/ebook/e-book-async.c (_get_fields_response_handler):
-	don't call the callback if it's NULL.
-	(_get_methods_response_handler): same.
-	(_auth_user_response_handler): same.
-	(_get_contact_response_handler): same.
-	(_remove_contacts_response_handler): same.
-	(_add_contact_response_handler): same.
-	(_commit_contact_response_handler): same.
-	(_get_book_view_response_handler): same.
-	(_get_contacts_response_handler): same.
-	(_remove_contacts_dtor): free the list.
-	(e_book_async_remove_contacts): duplicate the list.
-
-	* backend/pas/pas-backend.c (pas_backend_open): if we successfully
-	load the uri, report the writable status back.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_remove_contacts):
-	free the list of ids.
-
-	* backend/pas/pas-backend-file.c (do_create): return the contact
-	we create here.
-	(pas_backend_file_create_contact): format the newly created
-	contact as a string to add to the summary.
-	(pas_backend_file_remove_contacts): don't free the list of removed
-	cards here - it happens in pas-backend-sync.
-	(pas_backend_file_load_uri): pass NULL for @contact to do_create.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (render_address): move the :'s
-	inside the <b>'s.  Thanks for pointing this out, guenther. :)
-	(eab_contact_display_render_normal): same.
-	(eab_contact_display_render_compact): same.
-
-	* gui/widgets/eab-vcard-control.c (save_in_addressbook): track
-	change to address_load_default_book.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: remove some commented out crap about
-	e-address-popup.[ch].
-
-	* gui/component/component-factory.c (factory): use
-	eab_popup_control_new for the AddressPopup iid.
-
-	* gui/widgets/Makefile.am (libeabwidgets_la_SOURCES): add
-	eab-popup-control.[ch].
-
-	* backend/ebook/e-book.c (e_book_get_default_addressbook): hack
-	this so it at least sorta works - hardcode the
-	~/evolution/local/Contacts uri for now.
-
-	* gui/component/addressbook.[ch] (addressbook_load_default_book):
-	remove the EBook argument, and call
-	e_book_async_get_default_addressbook.
-
-	* gui/component/e-address-popup.[ch]: nuke.
-	
-	* gui/widgets/eab-popup-control.c: rename
-	gui/component/e-address-popup.c to this.
-
-	* gui/widgets/eab-popup-control.h: rename
-	gui/component/e-address-popup.h to this.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_get_default_addressbook.
-	
-	* backend/ebook/e-book-async.c
-	(e_book_async_get_default_addressbook): new function.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): create the
-	scrolled window to embed the EABContactDisplay widget inside of.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add scrolled;
-
-	* gui/widgets/eab-contact-display.h: add
-	EABContactDisplayRenderMode enum, and add @render_mode arg to
-	eab_contact_display_render.
-
-	* gui/widgets/eab-contact-display.c
-	(eab_contact_display_render_compact): new function, render a
-	compact format suitable for inclusion in the mail display.
-	(eab_contact_display_render_normal): move the previouw contents of
-	eab_contact_display_render here.
-	(eab_contact_display_render): render in either compact or normal
-	mode depending on @mode.
-	(eab_contact_display_new): remove the scrolled window stuff from
-	here, as in the compact mode we don't want it present.  push it up
-	into the e-addressbook-view.c code.
-	
-	* gui/widgets/eab-vcard-control.[ch]: bonobo control that wraps up
-	the EABContactDisplay stuff and lets us display vcards in a pretty
-	format in mail messages.
-	
-	* gui/component/component-factory.c (factory): replace the #if
-	notyet'ed minicard control code with the new vcard control.
-
-	* gui/component/Makefile.am (INCLUDES): remove gui/minicard.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
-	the MiniCard_Control iid, and replace it with VCard_Control.
-
-2003-10-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): use
-	eab_contact_list_from_string, and un-"#if notyet" this.
-
-	* gui/component/addressbook.c: remove #include
-	"e-contact-save-as.h"
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): use eab_contact_save.
-	(file_send_as_cb): use eab_send_contact, un-"#if notyet" this.
-	(file_send_to_cb): same.
-	(table_drag_data_received_cb): use eab_contact_list_from_string.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: nuke.  last
-	vestiges of the minicard view.
-	
-	* gui/widgets/e-addressbook-view.c (eab_view_init):
-	s/clipboard_cards/cliboard_contacts.
-	(eab_view_dispose): same.
-	(get_contact_list_1): s/card/contact
-	(get_contact_list): same.
-	(save_as): same, and use eab_contact_list_save.
-	(send_as): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(send_to): same.
-	(print): s/card/contact.
-	(delete): same.
-	(new_card): same, and un-"#if notyet" some code.
-	(selection_get): use eab_contact_list_to_string.
-	(selection_clear_event): s/card/contact
-	(selection_received): same.
-	(get_selected_contacts): same.
-	(eab_view_save_as): same, and use eab_contact_list_save.
-	(eab_view_view): same, and use eab_show_multiple_contacts.
-	(eab_view_send): reenable this code, s/card/contact, and use
-	eab_send_contact_list.
-	(eab_view_send_to): same.
-	(eab_view_copy): s/card/contact.
-	(view_transfer_contacts): same.
-	(eab_view_copy_to_folder): same.
-	(eab_view_move_to_folder): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EABView): rename
-	clipboard_cards to clipboard_contacts.
-
-	* gui/widgets/eab-gui-util.c (view_contacts): un-"#if notyet"
-	(file_exists): moved from e-contact-save-as.c
-	(save_it): same.
-	(close_it): same.
-	(destroy_it): same.
-	(make_safe_filename): same.
-	(eab_contact_save): same, and renamed from e_contact_save_as.
-	(eab_contact_list_save): same, and renamed from
-	e_contact_list_save_as.
-	(contact_deleted_cb): s/card/contact.
-	(do_delete): same, and use e_book_async.
-	(delete_contacts): s/card/contact.
-	(process_unref): same.
-	(contact_added_cb): same.
-	(do_copy): same, and use e_book_async.
-	(got_book_cb): same.
-	(eab_transfer_contacts): same, and use e_book_async.
-	(eab_send_contact_list): s/card/contact
-	(eab_send_contact): same.
-
-	* gui/widgets/eab-gui-util.h: some random s/card/contact work, and
-	move the contents of e-contact-save-as.h here.
-
-	* util/eab-book-util.c (eab_contact_list_from_string): rename
-	eab_load_contacts_from_string to this.
-	(eab_contact_list_to_string): new function.
-
-	* util/eab-book-util.h: add prototype for
-	eab_contact_list_to_string, and rename
-	eab_load_contacts_from_string to eab_contact_list_from_string.
-
-	* gui/contact-editor/e-contact-save-as.[ch]: nuke.  the contents
-	of these files has been wrapped up in
-	gui/widgets/eab-gui-util.[ch].
-	
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libecontactlisteditor.la back into the build.
-
-	* gui/component/addressbook-component.c (new_item_cb): enable the
-	contact list editor portion.
-
-	* util/eab-book-util.c (eab_load_contacts_from_string): new
-	function, return a GList of EContact*'s parsed from the string.
-
-	* util/eab-book-util.h: add prototype for
-	eab_load_contacts_from_string.
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the id of
-	the list-image widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): PROP_CARD -> PROP_CONTACT.
-	(e_contact_list_editor_init): initialize image_buf to null and
-	card -> contact.  also, hook up the dnd signals on the list_image
-	widget so we can drop images.
-	(e_contact_list_editor_dispose): free the image_buf.
-	(list_added_cb): card -> contact.
-	(list_modified_cb): same.
-	(save_contact): same, and use the ebook-async api.
-	(prompt_to_save_changes): card -> contact.
-	(file_save_cb): same.
-	(file_save_as_cb): same.
-	(file_send_as_cb): #if notyet for now.
-	(file_send_to_cb): same.
-	(tb_save_and_close_cb): card -> contact.
-	(list_deleted_cb): same.
-	(delete_cb): same.
-	(delete_cb): same, and use ebook-async.
-	(e_contact_list_editor_new): card -> contact.
-	(e_contact_list_editor_set_property): same.
-	(table_drag_motion_cb): use GDK_POINTER_TO_ATOM instead of
-	casting.
-	(table_drag_data_received_cb): use eab_load_contacts_from_string,
-	and card -> contact.
-	(set_image_from_data): new function. create a pixbuf from the
-	image data and composite it in an image that's the same size as
-	the initial list_image widget.
-	(image_drag_motion_cb): new function.
-	(image_drag_drop_cb): new function.
-	(image_drag_data_received_cb): new function.
-	(extract_info): port to EContact, and add support for the image.
-	(fill_in_info): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image stuff, and ECard -> EContact.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): e_destination -> eab_destination.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_destination): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_contact): same, and card -> contact.
-	(e_contact_list_model_remove_row): e_destination ->
-	eab_destination.
-	(e_contact_list_model_get_destination): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h: card -> contact,
-	and e-destination -> eab-destination.
-
-	* gui/widgets/e-addressbook-view.etspec: fix a couple of
-	fields.. this needs a completely once-over at some point soon.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): reenable
-	all of this.
-
-	* gui/widgets/eab-contact-display.c (render_address): use
-	e_text_to_html to convert the \n's to <br>'s.
-	(on_url_requested): get PHOTO if there is one, otherwise LOGO.
-	(eab_contact_display_render): escape all the text we're sending to
-	gtkhtml with e_text_to_html.  also, if it's a contact list, output
-	_("List Members") with the contents of _EMAIL.
-
-	* gui/widgets/eab-gui-util.h: rename eab_send_card{_list} to
-	eab_send_contact{_list}.
-
-2003-09-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add
-	test-string.
-
-	* backend/ebook/tests/ebook/test-string.c: test setting/getting a
-	string attribute.
-
-	* backend/ebook/e-contact.c (photo_setter): do gnome-vfs mime type
-	sniffing before we set the attribute value.
-	(e_contact_set_property): implement setting of MULTI list
-	attributes (like MAIL).
-	(e_contact_get_property): rework the ATTR_TYPE attribute handling
-	so we aren't calling g_value_set_pointer on a value that holds a
-	string (and vice versa).
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attributes): implement.
-	(e_vcard_attribute_add_param): use g_ascii_strcasecmp.
-
-	* backend/ebook/e-vcard.h: rename e_vcard_remove_attribute to
-	e_vcard_remove_attributes, since it removes all matching
-	attributes.
-
-	* backend/ebook/e-book.c (e_book_response_add_contact): we need to
-	strdup the id here since the listener frees it.
-	(e_book_handle_response): implement the WritableStatusEvent part
-	of the switch.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_report_writable): un-"#if notyet" this.
-
-	* backend/ebook/e-book-async.c (_add_contact_handler): fill in
-	response->id.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: card -> contact.
-
-	* printing/e-contact-print-envelope.h: card -> contact.
-
-	* printing/e-contact-print.c: card -> contact.
-
-	* printing/e-contact-print.h: card -> contact.
-
-	* printing/Makefile.am (contact_print_test_LDADD): add
-	libeabutil.la and reorder things so it links.
-	(contact_print_style_editor_test_LDADD): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/select-names/e-select-names-popup.c:
-	e-addressbook-util.h -> eab-gui-util.h.
-
-	* gui/component/e-address-popup.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/component-factory.c: #if notyet the minicard
-	control stuff, since it's been completely nuked from the tree.
-
-	* gui/component/addressbook.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/addressbook-component.c: e-addressbook-util.h ->
-	eab-gui-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	rename libeminicard to libeabwidgets.
-
-	* Makefile.am (SUBDIRS): add util/ to the build.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-treeview-adapter.c:
-	e-addressbook-util.h -> eab-gui-util.h, and convert some
-	EDestination code to EABDestination.
-
-	* gui/widgets/e-addressbook-table-adapter.c: e-addressbook-util.h
-	-> eab-gui-util.h, and include util/eab-destination.h.
-	(addressbook_value_at): un-#if 0 some code.
-
-	* gui/widgets/e-addressbook-model.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-addressbook-view.c: e-addressbook-util.h ->
-	eab-gui-util.h
-
-	* gui/widgets/e-minicard-control.c,
-	gui/widgets/e-minicard-control.h, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-label.h,
-	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-test.c,
-	gui/widgets/e-minicard-widget.c, gui/widgets/e-minicard-widget.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h,
-	test-minicard-label.c, test-minicard-view.c, test-minicard.c: nuke
-	all of the old minicard stuff.
-	
-	* gui/widgets/eab-gui-util.[ch]: rename e-addressbook-util.[ch] to
-	this and nuke e-addressbook-util.[ch].
-	
-	* gui/widgets/Makefile.am (INCLUDES): change G_LOG_DOMAIN to
-	eab-widgets, and add -I$(top_srcdir)/addressbook.
-	(noinst_LTLIBRARIES): rename to libeabwidgets.la
-	(libeabwidgets_la_SOURCES): rename e-addressbook-util.[ch] to
-	eab-gui-util.[ch].
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (eab_contact_display_new):
-	track change from E_TYPE_AB_CONTACT_DISPLAY to
-	EAB_TYPE_CONTACT_DISPLAY.
-
-	* gui/widgets/eab-contact-display.h: change from E_* type foo to
-	EAB_* type foo.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: convert everything
-	from e_addressbook_search_dialog to eab_search_dialog, and
-	EAddressbookSearchDialog to EABSearchDialog.
-
-	* gui/component/addressbook.c (search_cb):
-	e_addressbook_search_dialog -> eab_search_dialog.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_supported_fields):
-	don't free the fields here - the backends hold onto them.
-	(pas_book_respond_get_supported_auth_methods): don't free the
-	auth_methods here - the backends hold onto them.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): fields go from 1 to
-	E_CONTACT_FIELD_LAST, not 0.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: e-book-util.h -> eab-book-util.h
-
-	* gui/component/addressbook-component.c: e-book-util.h ->
-	eab-book-util.h.
-	(new_item_cb): enable the contact editor portion of this.
-	(user_create_new_item_cb): convert to async_load_uri api, and
-	ifdef the _use_default_book crap.
-	(ensure_completion_uris_exist): e_book_get_config_database ->
-	eab_get_config_database.
-
-	* gui/component/e-address-widget.h: e-book-util.h ->
-	eab-book-util.h.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add selectnames back in, and add util/libeabutil.la.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c: my head explodes from so many
-	changes.
-
-	* backend/ebook/e-contact.h: reorder fields such that all the
-	string fields are first in the enum (and add a
-	E_CONTACT_LAST_SIMPLE_STRING value, ala the old e-card-simple
-	stuff.)  Also, add E_CONTACT_LOGO, WANTS_HTML, IS_LIST, and
-	LIST_SHOW_ADDRESSES.  remove E_CONTACT_PHOTO_URI.
-
-	* backend/ebook/e-vcard.c (e_vcard_remove_attribute): rename from
-	e_card_remove_attribute, and add a g_assert_not_reached.
-	(_evc_base64_encode_simple): make this not static (we need it for
-	a test.)
-	(_evc_base64_decode_simple): same.
-
-	* backend/ebook/e-vcard.h: add LOGO, X-MOZILLA-HTML,
-	X-EVOLUTION-LIST, and X-EVOLUTION-LIST-SHOW_ADDRESSES #defines.
-																
-	* backend/ebook/e-book.c (EBookLoadState): change from
-	UriNotLoaded to E_BOOK_URI_NOT_LOADED, etc.
-	(e_book_add_contact): track _URI_ change.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_response_get_contact): remove the ifdefed call to
-	e_contact_set_book.
-	(e_book_remove_contacts): track _URI_ change.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_remove): same.
-	(e_book_unload_uri): same.
-	(e_book_load_uri): same.
-	(e_book_load_uri): same.
-	(e_book_get_self): start the implementation of this.
-	(e_book_get_default_addressbook): ifdef out a possible
-	implementation of this (it's broken.)
-	(e_book_init): track _URI_ change.
-	(e_book_dispose): same.
-																
-	* backend/ebook/e-book.h: move get_default_addressbook out of the
-	ifdef, and change get_default_addressbook/get_addressbooks to be
-	more like the rest of the api.
-																
-	* backend/ebook/e-book-util.[ch]: nuke.
-																
-	* backend/ebook/e-card-compare.[ch]: nuke.
-																
-	* backend/ebook/e-destination.[ch]: nuke.
-																
-	* backend/ebook/e-book-query.c (func_and): fix valgrind error.
-	(func_or): same.
-																
-	* backend/ebook/e-book-listener.h: drop #include of e-list.h
-																
-	* backend/ebook/e-book-async.c (_get_contacts_response_handler)
-	(_get_contacts_response_dtor, _get_contacts_handler)
-	(_get_contacts_dtor, e_book_async_get_contacts): new functions,
-	implementing e_book_async_get_contacts.
-																
-	* backend/ebook/e-book-async.h: add e_book_async_get_contacts.
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* util/eab-marshal.list: new file.
-
-	* util/eab-destination.[ch]: rename
-	backend/ebook/e-destination.[ch] to this, and change all the entry
-	point names too.
-
-	* util/eab-book-util.[ch]: rename backend/ebook/e-book-util.[ch]
-	to this, and change all the entry point names too.
-
-	* util/Makefile.am: new file, build libeabutil.la
-
-2003-09-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_addressbook_model -> eab_model.
-	(contact_key): e-contactify this, and remove the call to
-	e_contact_get_book since we don't have it.
-	(sync_one_model): card -> contact.
-	(real_add_address_cb): track various name changes.
-	(esn_get_key_fn): same.
-	(e_addressbook_create_ebook_table): same.
-	(folder_selected): same.
-	(select_entry_changed): same.
-	(e_select_names_new): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(dump_model): s/card/contact.
-	(e_select_names_text_model_insert_length): e-destination ->
-	eab-destination.
-	(e_select_names_text_model_delete): same.
-	(e_select_names_text_model_obj_count): same.
-	(nth_obj_index): same.
-	(e_select_names_text_model_activate_obj): ifdef this out since we
-	don't have e_contact_get_book in the new api.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): convert to e_contact/eab_destination.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(change_email_num_cb): e_destination -> eab_destination.
-	(populate_popup_contact): same, and ECard -> EContact.  Also, the
-	email attribute is a GList, not an EList.  lastly, rename from
-	populate_popup_card.
-	(populate_popup_nocontact): same, and rename from
-	populate_popup_nocard.
-	(e_select_names_populate_popup): same.
-
-	* gui/component/select-names/e-select-names-model.h: track changes
-	to e_destination, and rename the cardify methods to something mode
-	descriptive.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): e_destination ->
-	eab_destination.
-	(e_select_names_model_get_textification): same.
-	(e_select_names_model_get_address_text): same.
-	(e_select_names_model_get_destination): same.
-	(e_select_names_model_export_destinationv): same.
-	(send_changed): same.
-	(e_select_names_model_import_destinationv): same.
-	(e_select_names_model_get_contact): same, and rename from
-	_get_card
-	(e_select_names_model_get_string): same.
-	(connect_destination): same.
-	(disconnect_destination): same.
-	(e_select_names_model_contains): same.
-	(e_select_names_model_insert): same.
-	(e_select_names_model_append): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_delete): same.
-	(e_select_names_model_clean): same.
-	(delete_all_iter): same.
-	(e_select_names_model_overwrite_copy): same.
-	(e_select_names_model_merge): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-	(e_select_names_model_cardify): nuke.
-	(e_select_names_model_uncardify): nuke.
-	(e_select_names_model_cancel_cardify): nuke.
-	(e_select_names_model_load_all_contacts): rename _cardify_all to
-	this.
-	(e_select_names_model_cancel_all_contact_load): rename
-	_cancel_cardify to this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): cancel_cardify_all -> cancel_all_contact_load
-	(focus_out_cb): cardify_all -> load_all_contacts.
-	(completion_popup_cb): same.
-	(load_completion_books): no e_book_expand_uri anymore.
-	(e_select_names_manager_new): e_book_get_config_database ->
-	eab_get_config_database.
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.h: e-book.h
-	-> e-book-async.h
-
-	* gui/component/select-names/e-select-names-completion.c:
-	EContactify this.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): ifdef out the SIMPLE_CARD_LIST getter,
-	and cardify_all -> load_all_contacts.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	nuke all the SimpleCard stuff.  It's a horribly inefficient way to
-	deal with vcards, and since ebook is platform level now, we can
-	(and should) promote just linking to ebook to do this.
-
-2003-09-19  Gilbert Fang  <gilbert.fang@sun.com>
-
-       * addressbook/gui/component/addressbook-component.c (xfer_folder):
-         remove the "addressbook.db.summary" correctly. #48538
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove
-	libebook-static.la
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Use
-	non-static versions of libraries: the static ones were only needed
-	for libtool 1.3.
-
-2003-09-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_get_property): implement
-	getters for the address labels.  they aren't really synthetic, but
-	we can't handle them as normal strings because they switch off the
-	TYPE parameter, not the attribute name (go go vcard.)  Also add
-	getters for the structured address fields (ADR).  Also fix a spot
-	where we were using strcmp instead of strcasecmp.
-	(e_contact_address_free): new function.
-
-	* backend/ebook/e-contact.h: Add EContactAddress structure, which
-	will probably go away once i merge in my cool spiffy address
-	editor.  Add LABEL fields for the address labels, and add
-	prototype for e_contact_address_free.
-
-	* backend/ebook/e-vcard.h: add EVC_LABEL and EVC_X_BLOG_URL.
-
-	* backend/ebook/e-vcard.c (read_attribute_value): step to the next
-	character after unescaping \-escaped characters.  keeps commas
-	from multiplying.
-
-	* gui/widgets/eab-contact-display.c (render_address): new function
-	(eab_contact_display_render): display email, delivery addresses,
-	and the blog url.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_set_property): implement
-	E_CONTACT_EMAIL_*.
-
-	* backend/pas/pas-backend-ldap.c (email_ber): EContact-ify and
-	re-enable this code.
-	(email_compare): same.
-	(email_populate): same.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): use
-	XIMIAN_VCARD.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): use
-	XIMIAN_VCARD, and don't fail if the directory already exists.
-	just try to create the db anyway.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add ximian-vcard.h
-
-	* backend/pas/ximian-vcard.h (XIMIAN_VCARD): put the initial vcard
-	here, so we can share 1 #define between file/vcf backends.  Also,
-	add a jpeg photo.
-
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): add
-	eab-contact-display.[ch]
-
-	* gui/widgets/e-addressbook-view.c (eab_view_init): just init
-	everything to NULL.
-	(eab_view_new): move a bunch of stuff that was in eab_view_init
-	here.  create a vpaned to hold the contact display, and create the
-	contact display.
-	(render_contact): render the selected contact to the
-	contact_display.
-	(selection_changed): add logic to display the currently selected
-	contact in the preview pane.
-	(create_table_view): add the table to the paned.
-	(create_treeview_view): add the scrolled to the paned.
-	(change_view_type): remove view->widget from the paned.
-
-	* gui/widgets/e-addressbook-view.h: switch from using a GtkTable
-	to a GtkEventBox - we don't need the table logic anymore.
-
-	* gui/widgets/e-addressbook-model.c (create_contact): indent
-	(eab_model_get_contact): same.
-
-	* gui/widgets/eab-contact-display.[ch]: new files - this
-	implements the preview pane.
-	
-2003-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (BINARY_PROP): new type of
-	property, for specifying data coming back from the ldap server
-	with both data/length (like photos).
-	(photo_populate): set the contact's photo.
-	(build_contact_from_entry): add PROP_TYPE_BINARY handling.
-
-	* backend/ebook/e-vcard.c (EVCardEncoding): new enum for use with
-	the ENCODING attribute parameter.  Right now, just "raw",
-	"base64", and "quoted-printable".
-	(struct _EVCardAttribute): add a "decoded_values" list of
-	GString*'s, as well as fields to hold encoding/encoding_set.
-	(e_vcard_class_init): call _evc_base64_init.
-	(e_vcard_attribute_add_value_decoded): based on what encoding the
-	attribute uses, add the value properly.
-	(e_vcard_attribute_add_param): if the parameter is ENCODING, work
-	our magic.
-	(e_vcard_attribute_get_values_decoded): spit out properly decoded
-	values depending on the decoding type.
-	(_evc_base64*): copy the camel base64 routines here.
-
-	* backend/ebook/e-vcard.h: add prototypes for
-	e_vcard_attribute_add_value_decoded and
-	e_vcard_attribute_get_values_decoded.
-
-	* backend/ebook/e-contact.c (e_contact_get_first_attr): move this
-	to above _set_property so we can make use of it there.
-	(e_contact_set_property): fix up the generic STRING field handler,
-	and implement E_CONTACT_PHOTO setting.
-	(e_contact_get_property): add handling for
-	E_CONTACT_PHOTO/E_CONTACT_PHOTO_URI.
-	(e_contact_photo_free): new function.
-
-	* backend/ebook/e-contact.h: add EContactPhoto struct, a prototype
-	for e_contact_photo_free, and two new EContactField elements (PHOTO and
-	PHOTO_URI).
-
-	* backend/ebook/tests/ebook/.cvsignore: ignore test-photo
-
-	* backend/ebook/tests/ebook/Makefile.am (noinst_PROGRAMS): add test-photo
-
-	* backend/ebook/tests/ebook/test-photo.c: test for the photo
-	set/get routines (which do base64 encoding/decoding).
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: comment out a buncha stuff just to
-	get this building.
-
-	* gui/component/select-names/e-select-names.c: #include
-	e-book-async.h
-	(search_result): EAddressbookModel -> EABModel.
-	(addressbook_model_set_uri): same, and don't use
-	e_book_expand_uri, as it's dead.
-	(esn_get_key_fn): EAddressbookModel -> EABModel.
-	(e_addressbook_create_ebook_table): same.
-	(status_message): same.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): EAddressbookModel -> EABModel.
-
-	* gui/component/addressbook-component.c (new_item_cb): ifdef out
-	for now.
-	(dnd_drop_book_open_cb): s/card/contact.
-	(destination_folder_handle_drop): ifdef out.
-	(request_quit): same.
-
-	* gui/component/addressbook.c: track api changes - e_addressbook_
-	-> eab_, and e_book_* becomes e_book_async_*.
-
-	* gui/component/addressbook.h: #include e-book-async.h
-
-	* gui/component/e-address-widget.c (query_results_cb):
-	e/EBookSimpleQueryStatus/EBookStatus
-
-	* gui/component/e-address-widget.h: s/ECard/EContact.
-
-	* gui/component/e-cardlist-model.[ch]: nuke.
-	
-	* gui/component/e-address-popup.c: s/e-book.h/e-book-async.h
-
-	* gui/component/e-address-popup.h: s/ECard/EContact
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): remove
-	e-card.c,e-card.simple.c
-
-	* backend/ebook/tests/ebook/test-ebook.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/tests/ebook/test-changes.c: remove #include of
-	e-card-simple.h
-
-	* backend/ebook/e-card.[ch], backend/ebook/e-card-simple.[ch]:
-	nuke.
-
-	* backend/ebook/e-book-util.h: s/card/contact.
-
-	* backend/ebook/e-book-util.c: ifdef out an #include.
-
-	* backend/ebook/e-book-async.[ch]: stop doing the stupid #define
-	renaming trick, and just rename all the prototypes from e_book_*
-	to e_book_async_*. Also, get rid of the *_vcard variants.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]
-	(pas_backend_card_sexp_match_contact): rename
-	pas_backend_card_sexp_match_card, and it takes an EContact now.
-	Also, port this file to use EContact instead of ECard, and ifdef
-	out lots of stuff.
-
-	* backend/pas/pas-backend-ldap.c: convert this to use EContact
-	instead of ECard, and ifdef great swaths of code to make it
-	compile.
-
-	* backend/pas/pas-book.c (pas_book_respond_modify): convert this
-	from ECard to EContact.
-
-2003-09-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (libeminicard_la_SOURCES): remove all
-	the reflow/minicard stuff from the build.
-	(e-addressbook-marshal.[ch]): change the prefix on the marshallers to
-	eab_marshal.
-
-	* gui/widgets/e-addressbook-view.etspec: bring this more in line
-	with the field ids for EContact, and comment out a ton of them
-	that aren't there yet.
-
-	* gui/widgets/e-addressbook-view.[ch]: big renaming - rename
-	e_addressbook_view to eab_view, and EAddressbookView to EABView.
-
-	* gui/widgets/e-addressbook-util.c (eab_error_dialog): rename, and
-	change a few of the error strings s/Card/Contact.
-	(added_cb): E_BOOK_STATUS_SUCCESS => E_BOOK_ERROR_OK.
-	(modified_cb): same.
-	(e_addressbook_show_contact_editor): this takes an EContact now,
-	and track the change to the contact editor signal names.
-	(e_addressbook_show_contact_list_editor): this takes an EContact
-	now.
-	(view_contacts): rename view_cards to this, and ifdef the body.
-	(e_addressbook_show_multiple_contacts): rename
-	e_addressbook_show_multiple_cards to this, and s/card/contact.
-
-	* gui/widgets/e-addressbook-util.h: ifdef some things out, and
-	rename e_addressbook_error_dialog to eab_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: big renaming -
-	rename e_addressbook_table_adapter to eab_table_adapter, and
-	EAddressbookTableAdapter to EABTableAdapter.  Also, remove the
-	simple mapping - we can do ECardSimple-like operations directly on
-	the EContacts from the EABModel.
-
-	* gui/widgets/e-addressbook-model.[ch]: big renaming - rename
-	e_addressbook_model to eab_model, and EAddressbookModel to
-	EABModel.  Also, convert everything from ECard to EContact.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_new_from_string): omg i'm dumb.
-	don't call e_vcard_new here since it just turns around and calls
-	e_vcard_new_from_string again.
-
-2003-09-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_change): guard
-	pending adds foo.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): same.
-	(pas_book_view_notify_complete): same.
-	(pas_book_view_construct): init mutex
-	(pas_book_view_dispose): free mutex
-
-	* backend/pas/pas-backend-ldap.c (func_exists): new function.
-	(send_pending_adds): remove
-	(ldap_search_handler): let the BookView stuff handle the pending
-	adds for us.
-	(ldap_search_dtor): remove pending adds stuff.
-	(pas_backend_ldap_search): same
-
-	* backend/pas/pas-backend-card-sexp.c (func_exists): new function.
-	
-	* backend/ebook/tests/ebook/test-ebook.c (print_all_emails): use
-	an exists query.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-query.c (func_and, func_or, func_not)
-	(func_contains, func_is, func_beginswith, func_endswith)
-	(e_book_query_from_string): adapt the pas ldap backend sexp
-	parsing code to this, build up an EBookQuery that represents the
-	sexp.
-
-	* backend/ebook/e-contact.h (e_contact_field_id): add prototype.
-
-	* backend/ebook/e-contact.c (e_contact_field_id): new function.
-
-	* backend/ebook/Makefile.am (libebook_la_SOURCES): add
-	e-book-util.c back into the build, if only for the config_database
-	thingy.
-
-2003-08-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-contact.c (e_contact_duplicate): new function.
-
-	* backend/ebook/e-contact.h: add prototype for
-	e_contact_duplicate.
-
-	* backend/ebook/e-book-util.[ch]: massive ifdeffing.  most of this
-	is either gone or will be unnecessary soon.
-
-	* backend/ebook/e-book-query.c (e_book_query_from_string): hack
-	this so it'll at least generate a query.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_view): add some debug spew and
-	remove a c&p'ed comment.
-
-	* backend/ebook/e-book-async.h: add prototype for
-	e_book_async_unload_uri.
-
-	* backend/ebook/e-book-async.c (e_book_async_unload_uri): new
-	function.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): switch to
-	CORBA_Object_duplicate, ala pas_book.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_class_init):
-	fix typo and the build.
-
-2003-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response):
-	s/card/contact.
-	(pas_backend_ldap_process_create_contact): same.
-	(remove_contact_handler): same.
-	(remove_contact_dtor): same.
-	(pas_backend_ldap_process_remove_contacts): same.
-	(modify_contact_modify_handler): same.
-	(modify_contact_dtor): same.
-	(pas_backend_ldap_process_modify_contact): same.
-	(get_contact_handler): same.
-	(get_contact_dtor): same.
-	(pas_backend_ldap_process_get_contact): same.
-	(pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-summary.c
-	(pas_backend_summary_add_contact): s/card/contact, and mostly
-	switch from ECard{Simple} to EContact.
-	(pas_backend_summary_get_summary_vcard): same.
-	(pas_backend_summary_remove_contact): s/card/contact
-
-	* backend/pas/pas-backend-summary.h: s/card/contact.
-
-	* backend/pas/pas-backend-file.c (build_summary): fix g_warning,
-	and return immediately if the db->cursor call fails.
-	(pas_backend_file_create_contact): s/card/contact
-	(pas_backend_file_remove_contacts): same.
-	(pas_backend_file_modify_contact): same.
-	(pas_backend_file_get_contact): same.
-	(pas_backend_file_get_contact_list): same.
-	(pas_backend_file_class_init): same.
-
-	* backend/pas/pas-backend-vcf.c
-	(pas_backend_vcf_process_create_contact): s/card/contact.
-	(pas_backend_vcf_process_remove_contacts): same.
-	(pas_backend_vcf_process_modify_contact): same.
-	(pas_backend_vcf_process_get_contact): same.
-	(pas_backend_vcf_process_get_contact_list): same.
-	(pas_backend_vcf_class_init): same.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_create_contact): s/card/contact.
-	(pas_backend_sync_remove_contacts): same.
-	(pas_backend_sync_modify_contact): same.
-	(pas_backend_sync_get_contact): same.
-	(pas_backend_sync_get_contact_list): same.
-	(_pas_backend_create_contact): same.
-	(_pas_backend_remove_contacts): same.
-	(_pas_backend_modify_contact): same.
-	(_pas_backend_get_contact): same.
-	(_pas_backend_get_contact_list): same.
-	(pas_backend_sync_class_init): same.
-
-	* backend/pas/pas-backend-sync.h: s/card/contact.
-
-	* backend/pas/pas-backend.c (pas_backend_create_contact): s/card/contact.
-	(pas_backend_remove_contacts): same.
-	(pas_backend_modify_contact): same.
-	(pas_backend_get_contact): same.
-	(pas_backend_get_contact_list): same.
-	(pas_backend_change_add_new): same.
-	(pas_backend_change_modify_new): same.
-	(pas_backend_change_delete_new): same.
-
-	* backend/pas/pas-backend.h: s/card/contact.
-
-	* backend/pas/pas-book-view.c (send_pending_adds): s/card/contact
-	(pas_book_view_notify_change): same.
-	(pas_book_view_notify_remove): same.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getContact): s/card/contact
-	(impl_GNOME_Evolution_Addressbook_Book_getContactList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addContact): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeContacts): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyContact): same.
-	(pas_book_respond_create): same.
-	(pas_book_respond_remove_contacts): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_get_contact): same.
-	(pas_book_respond_get_contact_list): same.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): same.
-
-	* backend/pas/pas-book.h: s/card/contact
-
-	* backend/ebook/tests/vcard/dump-vcard.c: #include
-	"ebook/e-vcard.h"
-
-	* backend/ebook/tests/vcard/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): same.
-
-	* backend/ebook/tests/ebook/Makefile.am (TEST_LIBS): use
-	top_builddir.
-	(CFLAGS): use srcdir
-
-	* backend/ebook/test-card.c, backend/ebook/test-client-list.c,
-	backend/ebook/test-client.c, backend/ebook/test-ebook.c: remove.
-	
-	* backend/ebook/e-card-cursor.[ch]: remove.
-
-	* backend/ebook/e-card-pairs.h: remove.
-	
-	* backend/ebook/e-book.c (e_book_add_contact): s/Card/Contact.
-	(e_book_commit_contact): same
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_contacts): same.
-	(e_book_handle_response): same.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_added_event):
-	s/card/contact
-	(e_book_view_do_modified_event): same.
-	(e_book_view_do_removed_event): same.
-	(e_book_view_handle_response): same.
-	(e_book_view_class_init): same.
-
-	* backend/ebook/e-book-view.h: s/card/contact and pad the class
-	struct.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): s/Card/Contact.
-	(e_book_view_listener_queue_status_event): no need to assign
-	things to NULL, we g_new0.
-	(e_book_view_listener_queue_idlist_event): s/Card/Contact, and no
-	need to assign things to NULL, we g_new0.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_contacts_added): s/Card/Contact.
-	(impl_BookViewListener_notify_contacts_removed): same.
-	(impl_BookViewListener_notify_contacts_changed): same.
-	(e_book_view_listener_class_init): same.
-
-	* backend/ebook/e-book-view-listener.h: s/Card/Contact
-
-	* backend/ebook/e-book-types.h: s/CARD/CONTACT
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): s/Card/Contact
-	(impl_BookListener_respond_create_contact): same.
-	(impl_BookListener_respond_remove_contacts): same.
-	(impl_BookListener_respond_modify_contact): same.
-	(impl_BookListener_respond_get_contact): same.
-	(impl_BookListener_respond_get_contact_list): same.
-	(impl_BookListener_respond_get_changes): same.
-	(e_book_listener_class_init): same.
-
-	* backend/ebook/e-book-listener.h: pad the class struct, and
-	s/Card/Contact.
-
-	* backend/ebook/e-book-async.c (_load_uri_handler): GError
-	changes.
-	(_get_fields_handler): same.
-	(_get_methods_handler): same.
-	(_auth_user_handler): same.
-	(_get_card_handler): same.
-	(_remove_cards_handler): same.
-	(_add_vcard_handler): same.
-	(_commit_vcard_handler): same.
-	(_get_book_view_handler): same.
-	(e_book_async_get_book_view): use an EBookQuery instead of a char*.
-
-	* backend/ebook/Makefile.am: remove the test handling.
-	(SUBDIRS): set to ". tests"
-	(libebook_la_SOURCES): add e-book-async.c
-
-	* backend/idl/addressbook.idl: possibly gratuitous renaming, but i
-	was sick of seeing "Card" being used everywhere.  "Contact" is the
-	new "Card".
-
-2003-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): rename from
-	e_book_free_op.
-	(e_book_op_remove): rename from e_book_remove_op.
-	(e_book_clear_op): new function, remove the op, unlock its mutex,
-	and free it.
-	(e_book_add_contact): use e_book_clear_op.
-	(e_book_commit_contact): same.
-	(e_book_get_supported_fields): same.
-	(e_book_get_supported_auth_methods): same.
-	(e_book_authenticate_user): same.
-	(e_book_get_contact): same.
-	(e_book_remove_contacts): same.
-	(e_book_get_book_view): same.
-	(e_book_get_contacts): same.
-	(e_book_get_changes): same.
-	(e_book_load_uri): same.
-	(e_book_remove): new function.
-	(e_book_response_remove): new function.
-	(e_book_handle_response): add handling for RemoveBookResponse.
-	(e_book_load_local_addressbook): pass TRUE for e_book_load_uri
-	@only_if_exists.
-
-	* backend/ebook/e-book.h: add @only_if_exists arg to
-	e_book_load_uri so we can support folder creation at load_uri
-	time, and add prototype for e_book_remove.
-
-	* backend/ebook/e-book-types.h: add an "id" slot in EBookChange.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_changes): handle union in idl.
-	(impl_BookListener_respond_open_book): remove unnecessary
-	exception check.
-	(impl_BookListener_respond_remove_book): new function.
-	(impl_BookListener_respond_get_supported_fields): rename this from
-	_response_.
-	(impl_BookListener_respond_get_supported_auth_methods): same.
-	(e_book_listener_class_init): add _remove_book and track change to
-	get_supported_fields/get_supported_auth_methods names.
-
-	* backend/ebook/e-book-listener.h: add RemoveBookResponse to
-	EBookListenerOperation enum.
-
-	* backend/idl/addressbook.idl: make BookChangeItem a union that
-	switches over BookChangeType.
-
-	* backend/pas/pas-backend.c (pas_backend_change_add_new): new
-	function, create a BookChangeItem representing the addition of a
-	contact.
-	(pas_backend_change_modify_new): same, but for modifications.
-	(pas_backend_change_delete_new): same, but for deletions.
-
-	* backend/pas/pas-backend.h: add prototypes for
-	pas_backend_change_{add,modify,delete}_new
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): nuke.
-	(do_create): fix memory corruption.
-	(pas_backend_file_get_changes): copy the body of
-	pas_backend_file_changes here, and rework so that it's synchronous
-	and return a list instead of the book view hack.
-	(pas_backend_file_load_uri): mkdir the directory (we need a mkdir
-	-p here).
-	(select_changes): new function, scandir helper.
-	(pas_backend_file_remove): NULL out bf->priv->summary to quiet
-	valgrind, and call scandir to accumulate the .changes.db files
-	then unlink them.
-
-	* backend/pas/pas-book.c (pas_book_respond_remove): new function.
-	(pas_book_respond_get_supported_fields): unifdef this, and make it
-	use a glist.
-	(pas_book_respond_get_supported_auth_methods): same.
-	(pas_book_respond_get_changes): this code is kinda gross... lots
-	of copying going on, there's got to be a better way.  but it
-	works.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add oneway void Book::remove() and
-	oneway void notifyBookRemoved()
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend.c (pas_backend_remove): new function.
-	(pas_backend_add_book_view): new function.
-	(pas_backend_add_client): move the "real_add_client" code here.
-	(pas_backend_remove_client): move the "real_remove_client" code
-	here.
-	(pas_backend_class_init): remove assignments of add_client and
-	remove_client vtable entries.
-	(pas_backend_is_removed): new function.
-	(pas_backend_set_is_removed): new function.
-	(pas_backend_init): init clients_mutex and views_mutex.
-
-	* backend/pas/pas-backend.h: remove the vtable entries for
-	add/remove_client, since these are fully handled in PASBackend.
-	Add prototypes for
-	pas_backend_is_removed/pas_backend_add_book_view/pas_backend_set_is_removed.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_remove): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): clean things
-	up a bit, and don't use pas_backend_get_book_views as it can't
-	lock the list of views.
-	(pas_book_respond_get_supported_auth_methods): remove the extra
-	unnecessary arg from the corba call.
-	(pas_book_respond_get_changes): same.
-	(pas_book_class_init): fill in epv "remove" slot.
-
-	* backend/pas/pas-book.h: rename pas_book_respond_remove to
-	pas_book_respond_remove_cards, and add a new
-	pas_book_respond_remove for use with removing books.
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove): new
-	function.
-	(_pas_backend_remove): new function.
-	(pas_backend_sync_class_init): fill in the "remove" vtable entry.
-	(_pas_backend_remove_cards): track change to
-	pas_book_respond_remove_cards (pas_book_respond_remove is used for
-	removing the book, not the cards.)
-
-	* backend/pas/pas-backend-sync.h: add pas_backend_sync_remove
-	prototype and add remove_sync virtual function.
-
-2003-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_create_card,
-	pas_backend_file_remove_cards, pas_backend_file_modify_card,
-	pas_backend_file_get_vcard, pas_backend_file_get_card_list,
-	pas_backend_file_start_book_view, pas_backend_file_get_changes,
-	pas_backend_file_authenticate_user,
-	pas_backend_file_get_supported_fields): rename from
-	pas_backend_file_process_*
-	(pas_backend_file_load_uri): save off the dirname/summary
-	filename.
-	(pas_backend_file_remove): new function, unlink all the files we
-	know about.
-	(pas_backend_file_class_init): track changes to functions, and add
-	pas_backend_file_remove.
-
-2003-08-26  JP Rosevear  <jpr@ximian.com>
- 
-	* conduit/address-conduit.c (ecard_from_remote_record): duplicate
- 	the extra address lines
-	
-2003-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.[ch]: switch from using the PASRequest
-	union and a central PASBackend dispatch function.  just call the
-	pas_backend methods directly and expand the args out.
-
-	* backend/pas/pas-backend.[ch]: same.
-	
-	* backend/pas/pas-backend-sync.[ch]: same.
-
-	* backend/pas/pas-backend-vcf.c, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c: same, and get these all compiling
-	against the rest of the current pas/ebook code.	
-
-2003-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-ebook.c: track GError case.
-
-	* backend/ebook/e-book.[ch]: GError-ify the api, and clean up some
-	cases where we weren't removing the current op.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): track change from
-	E_BOOK_VIEW_STATUS_* to E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-types.h: track change from E_BOOK_STATUS_*
-	to E_BOOK_ERROR_*, and some E_BOOK_VIEW_STATUS_* to
-	E_BOOK_VIEW_ERROR_*.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): track change from
-	E_BOOK_STATUS_* to E_BOOK_ERROR_*.
-
-	* backend/ebook/e-book-query.c (e_book_query_any_field_contains):
-	new function.
-	(e_book_query_unref): handle the any_field_contains case.
-	(e_book_query_to_string): same.
-
-	* backend/ebook/e-book-query.h: add prototype for
-	e_book_query_any_field_contains.
-
-	* backend/ebook/e-card.c (e_card_load_uri): ifdef this out for
-	now.
-
-	* backend/ebook/e-contact.[ch] (e_contact_get_const): new
-	function/prototype.
-
-2003-08-20  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* gui/widgets/e-addressbook-util.c
-        (e_addressbook_send_card_list): use memcpy to assign
-        CORBA_char_sequence instead of strcpy. (#46706)
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/component-factory.c: Update OAFIIDs.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Removed extern declaration for global_shell_client [yuck].
-	(e_addressbook_transfer_cards): #if 0 the invocation for
-	evolution_shell_client_user_select_folder(), we need to
-	reimplement this component-side now.
-
-	* gui/component/component-factory.c (factory): Call
-	addressbook_component_peek() here instead of
-	addressbook_component_init() [since the latter is no more].
-
-	* gui/component/addressbook.c (set_status_message): Don't create
-	the activity client for now.
-
-	* gui/component/addressbook-config.c: Removed member shell from
-	struct AddressbookDialog.
-	(ldap_dialog_new): Do not take a shell arg anymore.
-	(ldap_config_control_new): Likewise.
-	(addressbook_config_control_new): No need to get the global shell
-	pointer here anymore.
-
-	* gui/component/addressbook-component.c: Rewritten to support the
-	new ::Component interface.
-	* gui/component/addressbook-component.h: Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Version
-	factory's OAFIID.  Remove ShellComponent server, add Component
-	server.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): unref the
-	EComponentListener before unloading the CORBA object.
-
-2003-08-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_dispose): Chain.
-
-	* gui/component/e-address-widget.c (e_address_widget_destroy): Chain.
-	Prevent double frees. Prevent double GSource removal.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_class_init):
-	Store parent class.
-	(e_cardlist_model_dispose): Chain. Prevent double frees and unrefs.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_dispose): Chain.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_dispose): Chain.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_model_destroy): Chain. Prevent double frees and unrefs.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_dispose):
-	Chain.
-	(addressbook_finalize): Chain.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	Chain.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (addressbook_destroy):
-	Chain. Prevent double free.
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_dispose):
-	Chain. Prevent double free and detach.
-
-	* gui/widgts/gal-view-treeview.c (gal_view_treeview_dispose):
-	Chain. Prevent double free and detach.
-
-	* printins/e-contact-print-style-editor.c
-	(e_contact_print_stule_editor_destroy): Chain. Prevent double unref.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.c (e_vcard_to_string_vcard_21): new,
-	unimplemented, function.
-	(e_vcard_to_string_vcard_30): move the 3.0 vcard export code here.
-	(e_vcard_to_string): call e_vcard_to_string_vcard_21 or
-	e_vcard_to_string_vcard_30 based on @format.
-	(e_vcard_attribute_remove_values): new function.
-
-	* backend/ebook/e-vcard.h: add @format to e_vcard_to_string, and
-	add prototype for e_vcard_attribute_remove_values.  also, add
-	prototype for e_vcard_decode_b_encoding.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_open_book): remove the book arg.
-
-	* backend/ebook/e-book-listener.h (struct _EBookListenerResponse):
-	remove the corba book.
-
-	* backend/ebook/e-book-async.c (_get_book_view_dtor): free the
-	query string.
-	(e_book_async_get_book_view): dup the query string.
-
-	* backend/ebook/e-book.h: change e_book_get_book_view and
-	e_book_get_contacts to take a const char * query string instead of
-	an EBookQuery.
-
-	* backend/ebook/e-book.c (e_book_add_contact): pass
-	EVC_FORMAT_VCARD_30 to e_vcard_to_string.
-	(e_book_commit_contact): same.
-	(e_book_get_book_view): take a const char* query string instead of
-	an EBookQuery.
-	(e_book_get_contacts): same.
-	(e_book_response_open): track change - the Book is no longer
-	communicated back here.
-	(listener_cb): nuke.
-	(e_book_handle_response): track change to e_book_response_open.
-	(e_book_load_uri): rework this from using BookFactory::openBook to
-	BookFactory::getBook + Book::open.
-	(e_book_get_uri): new function, reimplement from old api.
-	(e_book_get_static_capabilities): same.
-	(e_book_check_static_capability): same.
-	(startup_mainloop): new function, run bonobo_main.
-	(e_book_activate): start up a thread with startup_mainloop as the
-	start func.
-	(e_book_new): call e_book_activate.
-
-	* backend/idl/addressbook.idl: Add Book::open, remove the Book
-	from notifyBookOpened's args, and change BookFactory::openBook to
-	BookFactory::getBook.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_load_uri): add
-	only_if_exists - stop using the "create-initial" special file.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): add
-	@only_if_exists, and pass it along to the virtual method.
-	(pas_backend_open): new function, lock the mutex so only one
-	PASBook can actually call load_uri.  call load_uri with
-	pas_book_get_uri, and req->only_if_exists.
-	(pas_backend_handle_request): rename process_client_request to
-	this, and expose it publicly.  Also add a case statement for
-	"Open".
-	(real_add_client): gut this function, we don't need to create the
-	book anymore, just add the client to the list and do the weak
-	ref/ORBit small stuff.
-	(pas_backend_add_client): track change to signature - BookListener
-	-> PASBook.
-	(pas_backend_init): init open_mutex.
-	(pas_backend_dispose): free open_mutex.
-
-	* backend/pas/pas-backend.h (PASBackendClass): add @only_if_exists
-	to the load_uri virtual method, and change the add_client virtual
-	method to take a PASBook instead of a BookListener.  add the same
-	args to _load_uri and add_client.  Also, add prototypes for
-	pas_backend_handle_request and pas_backend_open.
-
-	* backend/pas/pas-book-factory.c
-	(_pas_book_factory_send_open_book_response): nuke.
-	(pas_book_factory_launch_backend): just return NULL, don't call
-	_pas_book_factory_send_open_book_response, in the error case.
-	(start_backend): nuke
-	(impl_GNOME_Evolution_Addressbook_BookFactory_getBook): rename
-	_openBook to this.  clean up the code a bit.  Create the PASBook
-	here, and always track change to pas_backend_add_client's type (we
-	pass the book now, not the listener).
-	(pas_book_factory_class_init): openBook -> getBook.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_open): new function, call
-	pas_backend_open.
-	(impl_GNOME_Evolution_Addressbook_Book_getVCard): get rid of the
-	signal crap, just call pas_backend_handle_request.
-	(impl_GNOME_Evolution_Addressbook_Book_getCardList): same.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): same.
-	(impl_GNOME_Evolution_Addressbook_Book_addCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): same.
-	(impl_GNOME_Evolution_Addressbook_Book_modifyCard): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): same.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	same.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): same.
-	(pas_book_get_backend): aggregate some g_return_if_fail's.
-	(pas_book_get_listener): new function.
-	(pas_book_get_uri): new function.
-	(pas_book_respond_open): just call BookListener::notifyBookOpened.
-	(pas_book_construct): add @uri, and g_strdup it.
-	(pas_book_new): add @uri, and pass it to pas_book_construct.
-	(pas_book_class_init): remove the "request" signal stuff, and fill
-	in epv->open.
-
-	* backend/pas/pas-book.h: add PASOpenRequest struct/enum entry.
-	Also, add @uri to the pas_book_new args, and add a prototype for
-	pas_book_get_uri.  Also, remove the "request" signal.
-
-2003-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_get_n_backends): lock map_mutex around hash
-	table work.
-	(pas_book_factory_dump_active_backends): same.
-	(backend_last_client_gone_cb): same.
-	(_pas_book_factory_send_open_book_response): track CallStatus idl
-	change.
-	(start_backend): simplify this greatly, since the factory is
-	tagged with HINT_PER_THREAD.
-	(impl_GNOME_Evolution_Addressbook_BookFactory_openBook): lock
-	around hash table.
-	(pas_book_factory_init): initialize map_mutex.
-	(pas_book_factory_dispose): free map_mutex.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): nuke.
-	(pas_backend_file_book_view_free): same.
-	(view_destroy): same.
-	(pas_backend_file_changes): #if notyet
-	(do_create): e-card -> e-contact.
-	(pas_backend_file_process_create_card): remove view handling from
-	here.
-	(pas_backend_file_process_remove_cards): same.
-	(pas_backend_file_process_modify_card): convert to e-contact, and
-	remove view handling.
-	(pas_backend_file_get_book_view): nuke.
-	(pas_backend_file_process_get_supported_fields): e-card-simple ->
-	e-contact.
-	(pas_backend_file_upgrade_db): e-card -> e-contact.
-	(pas_backend_file_cancel_operation): implement, just return
-	CouldNotCancel.
-	(pas_backend_file_class_init): assign cancel_operation, and remove
-	get_book_view assignment.
-	(pas_backend_file_init): remove book_views assignment.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-vcf.c (pas_backend_vcf_book_view_copy):
-	nuke.
-	(pas_backend_vcf_book_view_free): same.
-	(view_destroy): same.
-	(insert_contact): new function, insert the contact into our hash
-	table.
-	(load_file): reimplement without the e_card stuff.
-	(foreach_build_list): e_card -> e_contact.
-	(save_file): mostly reimplement in terms of e-contact.  more error
-	case work needs doing.
-	(do_create): e-card -> e-contact.
-	(pas_backend_vcf_process_create_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_remove_cards): implement this, just
-	remove it from the hash table and set ourselves to dirty.
-	(pas_backend_vcf_process_modify_card): remove the view handling
-	from here.
-	(pas_backend_vcf_process_get_book_view): nuke.
-	(pas_backend_vcf_process_get_supported_fields): reimplement in
-	terms of e-contact.
-	(INITIAL_VCARD): add in a FN attribute, and remove the quoted
-	printable encoding.
-	(pas_backend_vcf_cancel_operation): implement, just always return
-	CouldNotCancel.
-	(pas_backend_vcf_class_init): fill in cancel_operation, and remove
-	get_book_view_sync.
-	(pas_backend_vcf_init): remove book_views handling.
-
-	* backend/pas/pas-backend-vcf.h: update copyright.
-
-2003-08-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-sync.c (pas_backend_sync_remove_cards):
-	add out param @ids, so we can call pas_book_respond_remove
-	properly.
-	(_pas_backend_remove_cards): the other half of the change - pass
-	the ids on to pas_book_response_remove.
-	(pas_backend_sync_modify_card): add out param @old_vcard so we can
-	call pas_book_respond_modify properly.
-	(_pas_backend_modify_card): the other half of the change, pass the
-	old_vcard on to pas_book_respond_modify.
-	(pas_backend_sync_get_book_view): nuke.
-	(pas_backend_sync_get_changes): track change (book view -> GList)
-	(_pas_backend_is_threaded): nuke.
-	(_pas_backend_create_card): indent.
-	(_pas_backend_remove_cards): same.
-	(_pas_backend_modify_card): same.
-	(_pas_backend_get_card_list): same.
-	(_pas_backend_get_changes): same.
-	(_pas_backend_authenticate_user): same.
-	(_pas_backend_get_supported_fields): same.
-	(_pas_backend_get_supported_auth_methods): same.
-	(_pas_backend_get_book_view): nuke.
-	(pas_backend_sync_class_init): remove assignment to is_threaded
-	and get_book_view.
-
-	* backend/pas/pas-backend-sync.h: add out-params @ids to
-	remove_cards_sync, @old_vcard to modify_card_sync.
-	get_changes_sync's out-param is a GList instead of a book view,
-	and remove get_book_view_sync.
-
-	* backend/pas/pas-backend.c (pas_backend_get_book_view): nuke.
-	(pas_backend_is_threaded): nuke.
-	(pas_backend_start_threaded): nuke.
-	(pas_backend_init): initialize priv->views.
-	(pas_backend_dispose): free priv->views.
-	(pas_backend_get_book_views): new function, return priv->views.
-
-	* backend/pas/pas-backend.h: remove the get_book_view virtual
-	method, and the pas_backend_get_book_view prototype.  Also, track
-	the CallStatus change, and add a cancel_operation virtual method
-	and prototype, and add pas_backend_get_book_views function, so the
-	PASBook's can get ahold of the list.
-
-	* backend/pas/pas-book-view.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/pas/pas-book-view.c: same.
-	
-	* backend/pas/pas-card-cursor.[ch]: nuke
-	
-	* backend/pas/pas-book.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): implement
-	this all here, instead of farming it out to the backends.
-	(impl_GNOME_Evolution_Addressbook_Book_getChanges): track change
-	to signature.  this is no longer a book view, it'll return an
-	actual list.
-	(impl_GNOME_Evolution_Addressbook_Book_cancelOperation): new
-	function, implement.
-	(pas_book_respond_create): iterate over the views, notifying them
-	if the new card matches their query.
-	(pas_book_respond_remove): iterate over the views, telling them to
-	delete the card matching the id.
-	(pas_book_respond_modify): iterate over the views, notifying them
-	if they need to change/add/remove that card.
-	(view_destroy): move this here from the backends.
-	(pas_book_respond_get_book_view): weak-ref the book view.
-	(pas_book_new): remove the is_threaded switch on POA hints, and
-	always use PER_REQUEST.
-	(pas_book_class_init): fill in cancelOperation.
-
-	* backend/pas/pas-book.h: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.c: mostly finished.
-
-2003-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-async.[ch]: new files, create async methods
-	similar to the old ebook api that use GThread/GAsyncQueue to
-	simulate the old async behavior.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: collapse
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: add EBookChangeType/EBookChange.
-
-2003-07-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c: track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-
-	* backend/ebook/e-book-listener.c track collapsing of
-	Addressbook::BookListenerCallStatus and
-	Addressbook::BookView::CallStatus enums into
-	Addressbook::CallStatus.
-	(response_free): nuked
-	(e_book_listener_check_queue): nuked
-	(e_book_listener_queue_response): nuked
-	(e_book_listener_queue_progress): nuked
-	(e_book_listener_queue_get_view_response): nuked
-	(e_book_listener_queue_get_changes_response): nuked
-	(e_book_listener_queue_writable_status): nuked
-	(e_book_listener_queue_authentication_response): nuked
-	(e_book_listener_queue_get_supported_fields_response): nuked
-	(e_book_listener_queue_get_supported_auth_methods_response): nuked
-	(e_book_listener_dispose): nuked
-	
-	* backend/ebook/e-book-listener.h: remove prototypes for
-	check_pending and pop_response.
-
-	* backend/ebook/e-book.c (e_book_get_changes): new function.
-	implement this as more of a getCardList type function, instead of
-	getBookView.
-	(e_book_response_get_changes): new function.
-	(e_book_free_change_list): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_free_change_list.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_book_view): new function,
-	implement this.
-	(e_book_response_get_book_view): same.
-	(e_book_get_contacts): remove the op so we don't see BUSY after
-	this request.
-	(e_book_handle_response): unifdef a few things.
-	(e_book_unload_uri): fix the assertion about URI_NOT_LOADED, and
-	unifdef some code.
-	(e_book_dispose): fix a typo.
-
-	* backend/ebook/e-book-view.c (e_book_view_handle_response):
-	rename _check_listener_queue to this.  we don't need to pop the
-	response either, it's passed as an arg.
-	(e_book_view_construct): "response_queued" -> "response"
-	(e_book_view_start): new function, call BookView.start.
-	(e_book_view_dispose): track the signal id change.
-
-	* backend/ebook/e-book-view.h: add prototype for
-	e_book_view_start.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): remove.
-	(e_book_view_listener_queue_response): just emit the signal.
-	(impl_BookViewListener_notify_card_added): spew.
-	(impl_BookViewListener_notify_card_changed): spew.
-	(impl_BookViewListener_notify_sequence_complete): spew.
-	(impl_BookViewListener_notify_progress): spew.
-	(e_book_view_listener_check_pending): remove
-	(e_book_view_listener_check_pop_response): remove
-	(e_book_view_listener_new): use the ALL_AT_IDLE poa policy.
-	(e_book_view_listener_init): remove the queue/timeout stuff.
-	(e_book_view_listener_dispose): remove the queue/timeout stuff.
-
-	* backend/ebook/e-book-view-listener.h: remove _check_pending and
-	_pop_response.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_summary_query): remove the
-	completion_search argument, and remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_book_view_copy): remove card_sexp crap.
-	(pas_backend_file_book_view_free): same.
-	(get_length): remove
-	(get_nth): remove
-	(cursor_destroy): remove
-	(vcard_matches_search): remove
-	(ecard_matches_search): remove
-	(pas_backend_file_search_timeout): remove the aggregating stuff.
-	just call pas_book_view_notify_add_1.
-	(pas_backend_file_search): simplify this a bunch.
-	(do_create): use pas_book_view_vcard_matches.
-	(pas_backend_file_process_get_card_list): add some more error
-	checks.
-	(pas_backend_file_process_get_book_view): unifdef this, and
-	implement it.
-	(pas_backend_file_start_book_view): kick off the search.
-	(pas_backend_file_get_uri): remove.
-	(pas_backend_file_class_init): remove get_uri, add
-	start_book_view.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): don't need to
-	unref the card_sexp, as the PASBookView owns it now.
-	(create_card_handler): use pas_book_view_vcard_matches.
-	(modify_card_modify_handler): same.
-	(ldap_get_view): initialize the view properly.
-	(pas_backend_ldap_get_uri): remove.
-	(pas_backend_ldap_class_init): remove the get_uri assignment.
-
-	* backend/pas/pas-backend-sync.c (_pas_backend_get_card_list):
-	don't free this, it's freed in the pas_book code.
-
-	* backend/pas/pas-backend-sync.h: make use of pas-types.h and
-	remove some typedefs.
-
-	* backend/pas/pas-backend-summary.h: same.
-
-	* backend/pas/pas-backend-card-sexp.h: same.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getBookView): spew.
-	(pas_book_respond_create): unifdef this.
-	(pas_book_respond_remove): same.
-	(pas_book_respond_modify): same.
-	(pas_book_respond_authenticate_user): same.
-	(pas_book_respond_get_supported_fields): unref the iterator.
-	(pas_book_respond_get_book_view): unifdef, and add spew.
-
-	* backend/pas/pas-book.h: make use of pas-types.h and remove some
-	typedefs.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-types.h: new file, all the typedefs shared
-	between files here.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (send_pending_adds): abstract all
-	the aggregating code to the book view.  backends just call
-	notify_card_added and the superclass does all the aggregating.
-	(pas_book_view_notify_change): if there are pending adds, send
-	them before we send the change.
-	(pas_book_view_notify_remove): same.
-	(pas_book_view_notify_add): the other part of the aggregating
-	code.
-	(pas_book_view_notify_complete): send pending adds if there are
-	any.
-	(impl_GNOME_Evolution_Addressbook_BookView_start): new function,
-	call pas_backend_start_book_view.
-	(pas_book_view_get_card_query): new function.
-	(pas_book_view_get_card_sexp): new function.
-	(pas_book_view_get_backend): new function.
-
-	* backend/pas/pas-book-view.h: add a PASBackend arg to the
-	constructor, as well as the char* query and PASBackendCardSExp
-	form.  also add accessors for card_query, card_sexp, and backend.
-
-	* backend/idl/addressbook.idl
-	(GNOME::Evolution::Addressbook::BookView): add start() method.
-	(GNOME::Evolution::Addressbook::BookListener): remove the oneway
-	tag from notifyBookOpened, notifyViewRequested, and
-	notifyChangesRequested so the call doesn't return until the remote
-	object has gotten the method call.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): fill in the
-	uri slot if the load was successful.
-	(pas_backend_get_uri): return the uri, remove the virtual method
-	call.
-	(pas_backend_start_book_view): new function.
-	(process_client_request): ifdef out the threaded foo, since i'm
-	not certain it's at all necessary.
-	(real_add_client): remove the bonobo_object_unref of the book,
-	since it's immortal.
-	(pas_backend_dispose): free the uri.
-
-	* backend/pas/pas-backend.h: remove the get_uri virtual method,
-	and add the start_book_view virtual method and
-	pas_backend_start_book_view prototype.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpasvcf_a_SOURCES): new.
-	(noinst_LIBRARIES): add libpasvcf.a
-
-	* backend/pas/pas-backend-vcf.[ch]: new files, implement a vcard
-	file backend.  the backend api still needs a little work, but it's
-	getting easier to write backends.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): deal with
-	"uses_list".  Fixes #30839.
-	(e_contact_print_dialog_new): use GINT_TO_POINTER instead of
-	casting to void*, and set "uses_list" to FALSE.
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same, but set "uses_list"
-	to TRUE.
-
-2003-07-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_dispose): fix a typo.
-
-2003-07-22  Akira TAGOH  <tagoh@redhat.com>
-
-	* printing/e-contact-print-envelope.c (ecpe_print): Use 'Sans'
-	instead of 'Helvetica' for the font name.
-	* printing/e-contact-print.c (e_contact_build_style): Likewise.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
-	* backend/pas/Makefile.am: Likewise
-	* gui/component/select-names/Makefile.am: Likewise
-	* gui/contact-editor/Makefile.am: Likewise
-	* gui/contact-list-editor/Makefile.am: Likewise
-	* gui/widgets/Makefile.am: Likewise
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_class_init):
-	s/ece_marshal/e_contact_editor_marshal/
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_class_init): Likewise for ecle_marshal
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Remove gtk_window_set_policy
-	call since that function is deprecated and it was just setting
-	everything to the default values anyway.
-
-	* gui/widgets/e-addressbook-util.c: #include gal/util/e-util.h for
-	e_free_object_list.
-
-2003-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c: (e_card_new,
-	e_card_new_with_default_charset): Make the "vcard" arg const.
-	...: add lots and lots of other consts as a side effect
-
-2003-06-30  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	disconnect from model signals to prevent a race condition at
-	shutdown where the view gets destroyed and then the model notices
-	the backend dying before being destroyed itself.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): add, to free priv.
-	(e_addressbook_reflow_adapter_class_init): set it up
-
-	* gui/component/e-address-popup.c (e_address_popup_set_free_form):
-	Don't leak strings
-
-	* gui/component/addressbook-storage.c (load_source_data): don't
-	leak xml data.
-
-	* gui/component/addressbook-component.c (new_item_cb): don't leak
-	the new card.
-
-2003-06-25  Gilbert Fang <gilbert.fang@sun.com>
-
-	* gui/widgets/e-minicard-view-widget.c 
-	(e_minicard_view_widget_real_focus_in_event): new function, 
-	override the event handler for focus_in_event, set the first item
-	be focused if no focused item at all.  Fixes bug 41826.
-
-2003-06-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (fill_in_field): in the
-	EUrlEntry case just reassign widget.  it'll be handled by the
-	GtkEditable code below.  Fixes #43841.
-
-2003-06-14  Larry Ewing  <lewing@ximian.com>
-
-        * gui/backend/ebook/e-card-simple.c:
-	* gui/backend/ebook/e-card.c:
-	* gui/backend/ebook/evolution-ldif-importer.c:
-	* gui/backend/ebook/load-pine-addressbook.c:
-	* gui/backend/ebook/test-card.c:
-	* gui/backend/pas/pas-backend-card-sexp.c:
-	* gui/backend/pas/pas-backend-ldap.c: Fix lots of leaks, update
-	for correct use of g_object_get. Some cleanups.
-
-2003-06-13  Larry Ewing  <lewing@ximian.com>
-	
-	* gui/component/addressbook.c:
-        * gui/component/e-cardlist-model.c:
-	* gui/component/select-names/e-select-names-text-model.c:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-editor/e-contact-save-as.c:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/widgets/e-addressbook-table-adapter.c:
-	* gui/widgets/e-addressbook-util.c:
-	* gui/widgets/e-addressbook-view.c:
-	* gui/widgets/e-minicard-view.c:
-	* gui/widgets/e-minicard.c:  Fix lots of leaks, update for correct
-	use of g_object_get.  Some misc cleanups.
-
-	* printing/e-contact-print.c: update for correct use of
-	g_object_get.
-
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** For #42691.
-
-	* gui/component/select-names/Makefile.am (%.server.in): implicit
-	rule for .in file.
-	(BUILT_SOURCES): added server_DATA.
-
-	* gui/component/Makefile.am (%.server.in): use implicit rule for
-	.in file.
-	(BUILT_SOURCES): added, just server_DATA.
-	(CLEANFILES): added
-
-	* backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA.
-
-2003-06-04  Rodrigo Moya <rodrigo@ximian.com>
-
- 	* backend/ebook/ebook.c (e_book_do_response_open): adapted to
- 	changes in EComponentListener API.
-
-** See ChangeLog.pre-1-4 for older changes
-
diff --git a/addressbook/ChangeLog.pre-1-4 b/addressbook/ChangeLog.pre-1-4
deleted file mode 100644
index b1c12cb82f..0000000000
--- a/addressbook/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,16758 +0,0 @@
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): use the more
-	convoluted (but more correct) query if evolutionPerson is
-	supported.  Fixes #42825.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (use_default_book_cb): handle the
-	case where @book == NULL, which can happen if there was a problem
-	opening the default book.  Should fix #43005.
-	
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): fix the initial run case.  the
-	config upgrade code creates all elements so we can't just check
-	for NULL - we have to check if the string is empty.  Fixes #43213.
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
-	set the background of the rect to bg[NORMAL], and the fill color
-	of the text and label to text[NORMAL].  This will make the
-	background a different color than the canvas, but won't make it
-	use the selected background.  fixes #42472
-
-2003-05-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_commit_card):
-	add a g_object_ref(card), to match the one in
-	e_card_merging_book_add_card.  Fixes #43175.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: Added HIG-appropriate
-	HIG-appropriate spacing, padding, accelerators. Fixes bug #41210
-
-	* gui/component/ldap-config.glade: HIG-ified the various dialogs
-	(including the settings pages, the config druid, and the edit dialog) 
-	in this glade file. This fixes bugs #41140, #41137, #41130
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade: 
-	Changed button order, and added HIG-appropriate spacing/padding. 
-	Fixes bug #41232.
-
-	* gui/merging/e-card-duplicate-detected.glade: Changed button 
-	order, and added HIG-appropriate spacing/padding. Fixes bug
-	#41229 and #41231.
-
-2003-05-19  Sean Gao  <sean.gao@sun.com>
-
-	* gui/component/addressbook-component.c (xfer_folder): remove the
-	summary if @remove_source is TRUE.  Fixes 38084.
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade:  Added 
-	HIG-appropriate spacing, padding, capitalization and accelerators. 
-	Fixes bug #41254
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41251	
-2003-05-14  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/fullname.glade:  Added HIG-appropriate
-	spacing, padding, caps, title and accelerators. Fixes bug #41249, 
-	and also bug #41250..
-
-2003-05-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added HIG-appropriate
-	spacing, padding, capitalization and accelerators. Fixes bug #41248.
-
-
-2003-05-16  Rodney Dawes  <dobey@ximian.com>
-
-	* addressbook/backend/ebook/Makefile.am: Move the tools to a
- 	more appropriate directory, privlibexecdir
-	
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): backing out a tiny
-	porting of jpr's fix - we need to set the book on the
-	EAddressbookView, or else it won't do queries, and it won't show
-	any cards.  Fixes #43023, #43090.
-
-2003-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/merging/e-card-merging.c (free_lookup): new function, split
-	out the duplicated teardown code from final_cb and final_id_cb.
-	also, unref the card.
-	(final_id_cb): call free_lookup.
-	(final_cb): same.
-	(e_card_merging_book_add_card): ref the card.  fixes bug #43016.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (full_addr_clicked):
-	replace the text_buffer_delete/text_buffer_insert with
-	set_buffer_set_text.  call widget_changed if they clicked OK, so
-	we actually mark the dialog changed.
-	(fill_in_field): make this handle GtkTextViews, because for some
-	reason that escapes rational thought GtkTextView's don't implement
-	GtkEditable.  fixes #42606.
-	(extract_field): same.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_reflow): set
-	the clip_height on reflow so the name of the field is as high as
-	the field's value.  makes it possible to click anywhere to the
-	left of a tall field (like an address) and have it select the
-	field.  Fixes #42625.
-
-2003-05-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	handle the case where we haven't filled in the address yet. fixes
-	#42620.
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_unref): clear the
-	view
-	(book_open_cb): track the book in the view, don't unref the book
-	(set_prop): set the book
-	(retrieve_shell_view_interface_from_control): get the shell view
-	every time
-	(set_folder_bar_label): release and unref the shell view
-
-	* gui/component/addressbook-storage.h: add proto
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_cleanup): unref the storage
-
-	* gui/component/addressbook-component.c (owner_unset_cb): clean up
-	storage
-
-	* backend/ebook/e-book.c (e_book_load_uri): track the listener
-	signal
-	(e_book_dispose): unref the listener and disconnect the signal
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_set_separator): strlen ->
-	g_utf8_strlen.
-	(e_select_names_text_model_insert): same.
-	(e_select_names_text_model_insert_length): big change, make this
-	work with multibyte utf8.
-	(e_select_names_text_model_delete): same.  this could possibly use
-	a tighter loop + a memmove, but this works.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): make sure our truncation
-	to MAX_LENGTH characters uses utf8 characters, not bytes.
-	(e_select_names_model_name_pos): track e-text-model change.
-	pos/length are now in utf8 character terms, so use g_utf8_strlen
-	instead of strlen.
-	(e_select_names_model_text_pos): same.
-
-2003-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
-	rename addressbook_destroy to this, and guard against multiple
-	calls.
-	(e_addressbook_table_adapter_class_init): GtkObject -> GObject,
-	and destroy -> dispose.
-	(e_addressbook_table_adapter_init): GtkObject -> GObject.
-
-2003-05-12  Sean Gao  <sean.gao@sun.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): terminate g_build_filename with
-	NULL.
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #42048 ]
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	button => response.
-	(e_addressbook_view_print): connect to "response", not "clicked".
-
-2003-05-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41245 ]
-	* gui/component/select-names/select-names.glade: fix
-	spacing/border widths as per HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): set the border width/spacing on widgets we
-	create here.
-	
-2003-05-09  Jeremy Katz  <katzj@redhat.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): Use glib
-	macro to case from pointer to int.
-
-	* printing/e-contact-print-envelope.c: Add missing #include.
-
-	* gui/component/select-names/e-select-names-completion.c 
-	(e_select_names_completion_start_query): Use
-	E_SELECT_NAMES_COMPLETION to avoid warning
-
-2003-05-06  Chris Toshok  <toshok@ximian.com>
-
-	[ really commit this, fixes bug #41910 ] 
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_remove_row): change from model_changed to
-	row_deleted here.  model_changed causes the table to free its
-	ETableSelection, which is what we iterate over when deleting
-	contacts.
-	(e_contact_list_model_add_destination): no need to be calling
-	model_changed here either.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41255 ]
-	* gui/contact-list-editor/contact-list-editor.glade: use stock
-	buttons for Add/Remove.
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41144 ]
-	* gui/component/ldap-config.glade: use stock buttons for the
-	Add/Delete buttons.  Switch from "Delete" to "Remove", though, as
-	"Remove" fits much better with the one for "Add".  Also, add our
-	stock-edit-24.png icon for "Edit".
-	
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41211 ]
-	* gui/component/e-address-popup.c (e_address_popup_no_matches):
-	call e_button_new_with_stock_icon to create our button and give it
-	the right icon.
-
-2003-04-29  Gilbert Fang  <gilbert.fang@sun.com>
-
-	* tools/evolution-addressbook-export-list-cards.c
-	(set_pre_defined_field): remove duplicate HOME_COUNTRY field add.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41843]
-	* tools/evolution-addressbook-export-list-cards.c
-	(e_card_simple_csv_get_name): use e_card_simple_get_ecard_field
-	instead of e_card_simple_get_name, so the return value won't be
-	localized.
-
-2003-04-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #41779 ]
-	* gui/component/e-address-popup.c (mini_wizard_container_add): we
-	don't need to call gtk_widget_destroy on the old child, since
-	gtk_container_remove will unref it for us.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #37351 ]
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): the row
-	the signal is called with is already the model row, not the view
-	row, so don't call e_table_view_to_model_row on it.
-
-2003-04-23  Chris Toshok  <toshok@ximian.com>
-
-	[ either mostly or entirely fixes #33708 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_done): new function, factor it out of
-	_seq_complete_cb because we need to run the same code in a couple
-	of places.
-	(e_select_names_completion_got_book_view_cb): treat an error from
-	a book as getting a "sequence_complete", and decrement the count
-	of pending complete signals.
-	(e_select_names_completion_got_book_view_cb): remove the increment
-	of pending_completion_seq from here.
-	(e_select_names_completion_seq_complete_cb): factor out the body
-	of e_select_names_completion_done from here, and call it.
-	(e_select_names_completion_start_query): increment
-	pending_completion_seq here.  remove the async variable, as we can
-	now use pending_completion_seq for that purpose (it's > 0 iff
-	async would have been TRUE).
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40954 ]
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): guard
-	against NULL bf->priv->summary (happens if the initial load_uri
-	failed).
-	(pas_backend_file_load_uri): always set bf->priv->uri, since it's
-	used in _get_uri, which is called when the backend goes away.
-	This only happened before if you tried to load a folder that
-	didn't exist.
-
-2003-04-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40694 ]
-	* gui/component/select-names/e-select-names-bonobo.c
-	(control_activate_cb): just grab focus if @activate == TRUE.
-	we'll do all merging/unmerging in the focus handler.
-	(widget_focus_cb): handle the merging here.
-	(e_bonobo_control_automerge_ui): store off the widget (so we can
-	grab focus on it) and connect to "activate".
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/Makefile.am: Add missing -DPREFIX
-	
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	[ fixes #21499 ]
-	* gui/component/Makefile.am:
-	* gui/component/addressbook.c:
-	* gui/component/select-names/e-select-names-bonobo.c:
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-editor/e-contact-editor.c:
-	* gui/contact-list-editor/Makefile.am:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #41252 ]
-	* gui/contact-editor/fulladdr.glade: change title from "Check
-	Address" to "Full Address".
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #40727 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if the query text is
-	either shorter than the cached query_text or they don't match,
-	don't just set can_reuse_cached_cards to FALSE.  we also need to
-	invalidate the cache.
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/e-destination.c (d): Remove all debugging
-	messages.
-
-2003-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/ldap-config.glade: Remove color specifications
-	from the druid so it will use theme colors.
-
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): Use g_signal_connect_after for
-	"prepare" signal (to work around b.g.o 81869)
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #7103 ]
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	init style_set. and add the signal.
-	(e_minicard_label_realize): include e_minicard_label_construct's
-	code here, and call set_colors after we create the sub-items.
-	(e_minicard_label_unrealize): indent, and remove dead code.
-	(e_minicard_label_event): indent, and call set_colors instead of
-	setting the colors manually.
-	(set_colors): new function, set our colors based on the current
-	style.
-	(e_minicard_label_style_set): new function, just call set_colors.
-	(e_minicard_label_new): e_minicard_label_construct doesn't exist
-	anymore.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabelClass):
-	add style_set signal.
-
-	* gui/widgets/e-minicard.c (set_selected): little tweaks in the
-	coloring.
-	(e_minicard_unrealize): reindent, and remove some unused code.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add background.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): init
-	widget_class->style_class.
-	(e_minicard_view_widget_style_set): new function, just set the
-	background's fill_color_gdk to base[GTK_STATE_NORMAL].
-	(e_minicard_view_widget_realize): store off the background canvas
-	item so we can set the color later.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40901 ]
-	* gui/component/ldap-config.glade: HIG-ify the ldap server edit
-	dialog's button layout.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39763 ]
-	* gui/component/select-names/e-select-names-bonobo.c (copy_cb):
-	verb callback for EditCopy
-	(cut_cb): verb callback for EditCut.
-	(paste_cb): verb callback for EditPaste.
-	(select_all_cb): verb callback for SelectAll.
-	(free_closure): new function
-	(merge_menu_items): same
-	(unmerge_menu_items): same
-	(control_set_frame_cb): same
-	(control_activate_cb): same
-	(widget_focus_cb): same
-	(e_bonobo_control_automerge_ui): new function, sets up focus
-	signals on the widget passed in to merge/unmerge the passed in
-	ui/verbs.
-	(impl_SelectNames_get_entry_for_section): call
-	e_bonobo_control_automerge_ui for this entry.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (mini_wizard_new): change the
-	ok/cancel button layout to be higified.
-
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	[ last portion of #40046 fix ]
-	* gui/component/select-names/e-select-names-popup.c
-	(remove_recipient_cb): ifdef this out to quiet the compiler.
-	(remove_all_recipients_cb): same.
-	(toggle_html_mail_cb): same.
-	(populate_popup_card): change the #if 0 to #if
-	TOO_MANY_MENU_ITEMS.
-	(popup_menu_list): nuke, as it's handled by populate_popup_card.
-	(populate_popup_nocard): rename popup_menu_nocard to this, and
-	implement it as in populate_popup_card.
-	(e_select_names_populate_popup): we don't need the card, since we
-	don't check if it's a list here anymore.  also, remove the #if 0
-	surrounding the nocard case.
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252.
- 
- 	* conduit/address-conduit.c:  Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
- 
-2003-04-07  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): add tools.
-
-2003-04-07  Gilbert Fang <gilbert.fang@sun.com>
-
-	[ fixes bug #23036 ]
-	* tools/evolution-addressbook-export.c,
-	tools/evolution-addressbook-export-list-cards.c,
-	tools/evolution-addressbook-export-list-folders.c: : new and
-	improved export utility.
-
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
-	server names.
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: 
-	Likewise
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Likewise
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): set
-	"handle_popup" on the field to be TRUE if it's got focus, FALSE if
-	not.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	doh, set the im_context on the field name too so we get the Input
-	Method submenu in the contxt menu.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): set
-	the im_context on the field's EText.
-	(e_minicard_label_event): remove a huge swath of #if 0'd code.
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40715 ]
-	* gui/merging/e-card-merging.c (final_id_cb): add this callback,
-	to unref the book/free the closure after calling the user's
-	callback.
-	(final_cb): same.
-	(doit): use final{_id}_cb
-	(cancelit): same.
-	(response): don't free the lookup struct here.
-	(match_query_callback): same.
-	(e_card_merging_book_add_card): ref the book.
-	(e_card_merging_book_commit_card): same.
-
-	* gui/component/e-address-popup.c (card_picker_init): make sure to
-	set the "text" attribute on the cell renderer so the text actually
-	shows up.  also, g_object_connect -> g_signal_connect *sigh*.
-	Lastly, get rid of the scrolled window and just make the window
-	size to show the text.
-	
-	* gui/widgets/e-minicard.c (e_minicard_style_set): only call
-	set_selected if we're realized (we create all the canvas objects
-	that set_selected manipulates in our realize method.)
-
-2003-04-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	EVOLUTION_IMAGESDIR
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: change all
-	this around so that we populate the existing popup.  This means we
-	get the select names popup stuff on top of the normal EEntry popup
-	foo.
-
-	* gui/component/select-names/e-select-names-popup.h
-	(e_select_names_populate_popup): rename e_select_names_popup to
-	this.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(populate_popup_cb): rename popup_cb here, and
-	e_select_names_popup -> e_select_names_populate_popup.
-	(e_select_names_manager_entry_new): popup -> populate_popup.
-
-2003-04-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-marshal.list: add NONE:OBJECT
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add style_set
-	signal.
-	(e_minicard_style_set): just call set_selected with the currently
-	selected flag, so we recolor properly.
-
-	* gui/widgets/e-minicard.h (struct _EMinicardClass): add style_set
-	signal.
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (load_file_fn):
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): added
-	"folder_type" parameter to EvolutionImporterLoadFileFn.
-
-2003-03-31  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (get_local_book_uri): new function,
-	just return the local uri.
-	(set_default_book_uri_local): use get_local_book_uri.
-	(e_book_default_book_open): only try and reload the default book
-	if it's not already the local book.
-
-2003-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (card_removed): it emits a list now
-
-2003-03-31  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Remove folder-selector button
-	initialization.
-	(e_select_names_new): Initialize folder-selector button here,
-	using the passed-in EvolutionShellClient rather than depending on
-	a global variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): take an
-	EvolutionShellClient and pass it to e_select_names_new().
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_activate_dialog): get a pointer to the shell
-	from bonobo-activation, create a shell_client, and pass it to
-	e_select_names_manager_activate_dialog.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri):
-	constify return value
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-vcard.[ch]: braindead, and *extremely* forgiving
-	vcard parser.  not for public consumption yet.
-
-2003-03-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39381 (again) ]
-	* gui/component/e-address-popup.c (edit_contact_info_cb): add
-	"GtkWidget *button" first arg, so we don't crash.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40403 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): revert the fix for
-	28945, as was done on the 1.2 branch.  this is because the "fix"
-	actually breaks internal use of contact lists.  We need to make
-	the exporting of contacts DTRT, instead of fixing it here.
-
-2003-03-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fix the contact editor so that the only time the address is
-	parsed is when the user types in the address GtkTextView. ]
-	* gui/contact-editor/e-contact-editor.c (address_mailing_changed):
-	make this use delivery addresses instead of labels.
-	(full_addr_clicked): same.
-	(find_address_mailing): same.
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_set_delivery_address): make this operate similar to
-	e_card_simple_set_address: it sets both the delivery address and
-	the label for the address.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #19178 ]
-	* backend/ebook/evolution-ldif-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_open): use
-	e_book_load_address_book_by_uri on the passed in uri.
-	(load_file_fn): pass the uri.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34651 ]
-	* gui/component/select-names/e-select-names.c
-	(select_entry_changed): strcmp -> g_utf8_collate.
-	(update_query): encode the string we pass for the query.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34085 ]
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): only successfully complete the drag
-	if they dropped a valid vcard (or vcard list).  Call
-	gtk_drag_finish.
-
-2003-03-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): $evolution_uidir
-	-> $evolutionuidir
-
-2003-03-26  Philip Zhao  <philip.zhao@sun.com>
-
-	[ fixes bug #39170 ]
-	* backend/pas/pas-backend.c (pas_backend_create_card): remove
-	'return'.
-	(pas_backend_remove_cards): same.
-	(pas_backend_modify_card): same.
-	(pas_backend_check_connection): same.
-	(pas_backend_get_vcard): same.
-	(pas_backend_get_cursor): same.
-	(pas_backend_get_book_view): same.
-	(pas_backend_get_completion_view): same.
-	(pas_backend_get_changes): same.
-	(pas_backend_authenticate_user): same.
-	(pas_backend_get_supported_fields): same.
-	(pas_backend_get_supported_auth_methods): same.
-
-2003-03-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): append the
-	second line to the address if necessary
-	(ecard_from_remote_record): split the address line in two if
-	necessary
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: set the
-	dialog to "Visible: No" so it doesn't flash when we bring it up.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #40026 ]
-	* gui/contact-editor/e-contact-editor.c (set_field): add
-	EContactEditor arg, and block/unblock signals around the
-	gtk_entry_set_text, since that generates a "changed" signal which
-	causes problems.
-	(set_phone_field): take and pass along an EContactEditor arg.
-	(set_fields): pass editor to set_field.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/arrow.png: nuke.
-	
-	* gui/contact-editor/Makefile.am (EXTRA_DIST): remove images_DATA
-	(images_DATA): nuke, don't need it anymore.
-	
-	* gui/contact-editor/e-contact-editor.c
-	(connect_arrow_button_signal): rename _replace_button to this.  we
-	no longer create an image, as it's a GtkArrow in the .glade file
-	now.
-	(connect_arrow_button_signals): rename _replace_buttons to this.
-	no longer pass the arrow.png's to _replace_button.
-	(e_contact_editor_init): _replace_buttons ->
-	connect_arrow_button_signals.
-	(_arrow_pressed): remove some dead code, and some args that aren't
-	used.
-	(_phone_arrow_pressed): track change to _arrow_pressed.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31786 ]
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix some gtk warnings.
-	(set_advanced_button_state): the advanced dialog isn't present in
-	the glade file anymore, so ifdef everything dealing with it.
-	(addressbook_edit_server_dialog): same.
-
-	* gui/component/ldap-config.glade: remove all the unused Advanced
-	UI stuff to lessen the amount of strings needing translation.
-
-2003-03-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #32113 ]
-	* backend/ebook/e-destination.h: add include_email arg to
-	e_destination_get_textrep.
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): add
-	include_email arg.  if it's TRUE, and if there's an email address to
-	add
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): use e_destination_get_textrep so we don't
-	display QP text, and pass TRUE for include_email.
-
-	* gui/widgets/e-minicard.c (add_field): same.
-	(remodel): same.
-
-	* gui/widgets/e-addressbook-treeview-adapter.c (adapter_get_value): same.
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_value_at): same.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): pass FALSE for
-	include_email.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): pass FALSE for
-	include_email.
-	(e_select_names_model_get_string): same.
-	(e_select_names_model_replace): same.
-	(e_select_names_model_name_pos): same.
-	(e_select_names_model_text_pos): same.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".  [#39692]
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in: Likewise.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_col_count): up the column count by one
-	for the underline.
-	(e_select_names_table_model_value_at): add handling for underline.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_menu_add_option): fix use
-	of deprecated gtk_menu_append.
-	(card_picker_selection_changed): change this to be used with the
-	"changed" signal on GtkTreeSelection.
-	(free_str): yeah, gross.  i know.
-	(card_picker_init): this needed some fixing, so the strings don't
-	go away after we insert them into the model.  also, connect to the
-	"changed" GtkTreeSelection signal instead of using the nonexistant
-	gtk_tree_selection_set_func.
-	(e_address_popup_construct): gtk_style_unref -> g_object_unref.
-	(popup_size_allocate_cb): nuke.
-	(e_address_popup_ambiguous_email_add): use gtk_window_set_position
-	and let the window manager place the window instead of doing it
-	ourself.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes addressbook bug #39730 ]
-	* gui/component/ldap-config.glade: add response ids to the search
-	base dialog.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): use g_object_unref, not
-	gtk_widget_destroy, on the GladeXML.
-	(addressbook_add_server_druid): call gtk_window_set_type_hint
-	GDK_WINDOW_TYPE_HINT_DIALOG so this window looks like a dialog.
-	(editor_modify_cb): no more apply button.
-	(edit_dialog_apply_clicked): nuked.
-	(edit_dialog_close_clicked): rename to _cancal_clicked.
-	(edit_dialog_ok_clicked): call gtk_widget_destroy here instead of
-	calling _cancel_clicked.
-	(addressbook_edit_server_dialog): no more apply button, and
-	close_button -> cancel_button.  Also, set the hint to
-	GDK_WINDOW_TYPE_HINT_DIALOG.
-	(ldap_dialog_new): fix compiler warning.
-	(addressbook_dialog_create_sources_table): same.
-
-2003-03-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-section.etspec: use
-	alternating-row-colors="false"
-
-	* gui/component/select-names/e-select-names.h: nuke prototypes for
-	e_select_names_get_source/section.
-
-	* gui/component/select-names/e-select-names.c (set_book): remove
-	the signal disconnect from here.
-	(addressbook_model_set_uri): same.
-	(e_select_names_init): connect to the search_result signal on the
-	addressbook model.
-	(e_select_names_child_free): disconnect the changed_id signal.
-	(e_select_names_add_section): set the underline column so the
-	recipient tables look like they did when they were EEntry.
-	(e_select_names_add_section): store off the changed_id.
-	(e_select_names_get_section): nuke.
-	(e_select_names_get_source): nuke.
-
-2003-03-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): kill
-	warning by sinking objects
-
-2003-03-18  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book,
-	addressbook_model_set_uri): disconnect/keep track of search result
-	signal id.
-	(e_select_names_init): Keep track of various signals, particularly
-	status signal.
-	(e_select_names_dispose): disconnect from any signals that are
-	still active.  Fixes crash for #38202.
-
-2003-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use set_entry_changed_signal_email
-	for the email entry so the email gets saved out.
-	(set_entry_changed_signal_email): new function, analogous to
-	set_entry_changed_signal_phone, but for email.
-
-2003-03-12  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #20210 ]
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): change "Edit Contact Info" to "View Contact
-	Info", as you can't always edit the contact (if the book is read
-	only).
-	(popup_menu_list): same, but for a contact list.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #39507 ]
-	* gui/component/select-names/e-select-names.c (search_result): new
-	function, sync the models after we do a search.
-	(addressbook_model_set_uri): connect to search_result.
-
-2003-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix compiler warnings about deprecated
-	functions.
-	(e_select_names_child_free): unref the table model.
-	(remove_address): re-enable.
-	(section_right_click_cb): this is an ETable callback now.
-	(e_select_names_add_section): remove a gross gross awful hack, and
-	make the recipient tables ETables instead EEntry's.  We lose the
-	nice underlining, but we can add that back in as another ETable
-	style (like strikeout and bold), and we also fix the longstanding
-	scrolling problems (like bug #25148) and can finally remove
-	addresses by double clicking on them (which is also a bug
-	someplace I think.. dunno the # offhand.)
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(clear_info): always set the count to -1, regardless of what
-	model->data is.
-
-	* gui/component/select-names/e-select-names-model.c: remove some
-	unused enums.
-
-	* gui/component/select-names/Makefile.am (etspec_DATA): add
-	e-select-names-section.etspec
-
-	* gui/component/select-names/e-select-names-section.etspec: new
-	file, spec for the To:/Cc:/Bcc: etable's in the select-names
-	dialog.
-
-2003-03-11  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Updated phone
-	number.  Bug #37204.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list):
-	re-enable in build, include e-destination.h.  For #39256.
-
-2003-03-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/load-gnomecard-addressbook.c (ebook_create): Likewise.
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): Likewise.
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): Likewise.
-	* backend/ebook/test-client.c (get_cursor_cb): Likewise.
-	(ebook_create): Likewise.
-	* gui/widgets/e-minicard.c (e_minicard_set_property): Likewise.
-	(card_modified_cb): Likewise.
-	(e_minicard_event): Likewise.
-	* gui/widgets/gal-view-minicard.c (column_width_changed): Likewise.
-	* gui/widgets/test-minicard-view.c (ebook_create): Likewise.
-	* gui/widgets/gal-view-treeview.c (column_width_changed): Likewise.
-
-2003-03-05  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/addressbook-component.c (bonobo_main_quit_cb):
-	removed.
-	(owner_unset_cb): Basically a noop, the shell does the quit, we
-	just note we have no owner anymore.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/component/select-names/e-simple-card-bonobo.c
- 	(impl_SimpleCard_get): if we get a null value, send back the empty
- 	string
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/component/select-names/e-select-names.etspec: reflect prior column addition
- 
- 	* gui/component/select-names/e-select-names-bonobo.c
- 	(entry_get_property_fn): set the arg properly
- 
- 	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
- 	add Icscalendar to field list
- 
- 	* backend/pas/pas-backend-ldap.c: add icscalendar to prop list
- 
- 	* backend/ebook/e-card.h: add icscalendar data member
- 
- 	* backend/ebook/e-card.c: add icscalendar to list and its parse
- 	routine
- 	(e_card_get_vobject): add icscalendar prop value
- 	(parse_icscalendar): parse routine
- 	(e_card_class_init): add icscalendar arg
- 	(e_card_destroy): destroy icscalendar member
- 	(e_card_set_arg): set icscalendar
- 	(e_card_init): init icscalendar
- 	(e_card_get_arg): return icscalendar
- 
- 	* backend/ebook/e-card-simple.c (field_data): add icscalendar
- 
- 	* backend/ebook/e-card-simple.h: ditto
-	
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_new): Don't set the "modal" property through
-	g_object_new().
-	(e_select_names_init): Explictly make the dialog modal here.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): No need
-	to do any reparenting here; the widget is created with no parent.
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Instead of using gtk_widget_unparent(),
-	remove the widget from the container using gtk_container_remove().
-	This fixes a bunch of crashers in all the places using the
-	ESelectNames widget/control.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Build libecontacteditor as an
-	uninstalled shared library.
-
-	* gui/contact-list-editor/Makefile.am: Likewise for
-	libecontactlisteditor
-
-	* gui/merging/Makefile.am: and libecardmerging
-
-	* gui/search/Makefile.am: and libeaddressbooksearch
-
-	* gui/widgets/Makefile.am: and libeminicard
-
-	* printing/Makefile.am: and libecontactprint
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Update for new library names (and get rid of libtool portability
-	warnings).
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send, e_card_send): Remove
-	these from here; talking to the mailer doesn't really belong at
-	the libebook level anyway.
-
-	* backend/ebook/Makefile.am: Remove Evolution-Composer CORBA
-	stuff, which fixes some linking problems on OS X.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_send_card_list,
-	e_addressbook_send_card): Move from e-card.c and rename.
-
-	* gui/widgets/Makefile.am: move Evolution-Composer CORBA stuff
-	here
-
-	* gui/widgets/e-addressbook-view.c (send_as, send_to,
-	e_addressbook_view_send, e_addressbook_view_send_to): Update for
-	new function names.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-	* gui/contact-editor/e-contact-editor.c (file_send_as_cb,
-	file_send_to_cb): Likewise
-
-2003-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): use g_signal_connect
-	here, not swapped... although since we pass the widget as the
-	closure it really doesn't matter.
-	(load_uri_auth_cb): use a GtkDialog here.
-	(search_result): same.
-
-	* gui/component/select-names/e-simple-card-bonobo.h: add prototype
-	for e_simple_card_bonobo_construct to fix warning.
-
-	* gui/widgets/e-addressbook-view.c (create_alphabet): remove call
-	to gtk_widget_set_usize.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): gtk_window_set_policy =>
-	gtk_window_set_resizable.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): same.
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to libversit libtool object
-
-2003-02-27  Rodney Dawes  <dobey@ximian.com>
-
-	* backend/ebook/Makefile.am: Fix for server files from Antonio Xu
-
-2003-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): if we fail to activate
-	factories for a given protocol, return.
-
-	* gui/component/ldap-config.glade: remove the two unused custom
-	widgets to cut down on gtk warning spam.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (libebook_la_LIBADD): depend on
-	libversit.la, libcamel.la, libename.la, and libeutil.la.
-	(test_client_LDADD, test_client_list_LDADD, test_card_LDADD,
-	evolution_vcard_importer_LDADD, evolution_ldif_importer_LDADD,
-	load_pine_addressbook_LDADD, load_gnomecard_addressbook_LDADD):
-	Remove those dependencies from here, since they're pulled in by
-	libebook.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	Remove libebook's dependencies
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_LIBADD): add this
-
-	* gui/widgets/Makefile.am (various disabled *_test_LDADD): cleanup
-
-	* printing/Makefile.am (contact_print_test_LDADD,
-	contact_print_style_editor_test_LDADD): cleanup
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/
-
-	* gui/widgets/Makefile.am: Likewise (in a bunch of commented-out
-	test programs)
-
-2003-02-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c: Make parent_class static.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Likewise
-
-	* gui/widgets/e-addressbook-table-adapter.c: Likewise
-
-2003-02-19  Chris Toshok  <toshok@ximian.com>
-
-	[ fix #38074 ]
-	* gui/component/e-address-popup.c (add_contacts_cb): first arg is
-	a GtkWidget.  duh.
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Use $(evolutionuidir)
-	instead of $(evolution_uidir).  [Pointed out by Grzegorz Goawski.]
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): if we can complete solely
-	from our cached cards, call e_completion_end_search from here when
-	we're done.
-
-2003-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): plug memory leak (always free
-	val).
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): move the bulk of the
-	non-summary searching stuff here.  we aggregate up to our
-	threshold, then send them to the front end and register a timeout
-	to do another batch.  This keeps us from totally spamming the UI,
-	making things a bit more responsive.
-	(pas_backend_file_search): set up the closure and call the timeout
-	in an idle func.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): indent properly.
-
-2003-02-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (unlink_model):
-	disconnect search_started and search_result.
-	(addressbook_compare): if we're loading, just compare model
-	positions (so we just append while loading).
-	(remove_card): use e_reflow_model_item_removed.
-	(search_started): new function, set loading = TRUE.
-	(search_result): new function, set loading = FALSE and emit
-	"comparison_changed".
-	(e_addressbook_reflow_adapter_init): init loading and the new
-	signal ids.
-	(e_addressbook_reflow_adapter_construct): connect "search_started"
-	and "search_result".
-
-	* gui/widgets/e-addressbook-model.h (struct
-	_EAddressbookModelClass): add search_started signal.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): new signal "search_started".
-	(book_view_loaded): emit "search_started" after "model_changed".
-	(remove_card): simplify this, and use CARD_REMOVED all the time,
-	instead of just in the single card case.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_search_timeout): split out the bulk of the
-	non-summary searching logic to here.  we do 1 "card_threshold"
-	sized lump per timeout.
-	(pas_backend_file_search): use pas_backend_file_search_timeout.
-
-2003-02-10  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #33066 ]
-	* gui/contact-editor/e-contact-editor.c
-	(set_urlentry_changed_signal_field): new function
-	(set_entry_changed_signals): call
-	set_urlentry_changed_signal_field for entry-web, entry-caluri, and
-	entry-fburl.
-	(fill_in_field): add handling for EUrlEntry's.
-	(extract_field): same.
-	(enable_widget): same.
-	(e_contact_editor_create_date): show the widget.
-	(e_contact_editor_create_web): same, create a url entry.
-	(set_urlentry_changed_signal_field): new function
-
-	* gui/contact-editor/contact-editor.glade: entry-web,
-	entry-caluri, and entry-fburl are all custom widgets now.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am: Install load-pine-addressbook and
-	load-gnomecard-addressbook into ${privdatadir}/tools.  Install
-	evolution-vcard-importer and evolution-ldif-importer into
-	${privlibexecdir}.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in:
-	Removed.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
-	New.  Specify an absolute path for the executable, using
-	@LIBEXECDIR@.
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	Likewise.
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_initials): gone.
-	(match_initials): gone.
-	(book_query_sexp): remove the primary handling.
-	(book_query_score): same.
-
-	* backend/ebook/e-card.c (e_card_set_property):
-	g_value_get_pointer => g_value_get_object for "category_list".
-
-	* backend/ebook/e-book.c (struct _EBookPrivate): add a comment.
-
-	* backend/pas/pas-backend-ldap.c (func_beginswith): performance at
-	the cost of a tiny bit of correctness.  If the ldap server doesn't
-	support evolutionPerson don't query on fileAs, use sn (since
-	that's effectively what gets used in the display when fileAs isn't
-	supported.)
-
-2003-02-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: lots of
-	changes here.  should be a big performance gain.  god i hope this
-	is finally right.
-
-2003-02-08  Chris Toshok  <toshok@ximian.com>
-
-	[ huge change, all for 1 little performance problem :) fixes #18207 ]
-	* gui/widgets/e-addressbook-model.c (get_view): use
-	e_book_check_static_capability here to make things a little
-	prettier.
-	(remove_card): complain about my life, and add code to use one
-	"model_changed" signal if we get back a list of cards instead of
-	multiple "card_removed" signals.
-
-	* gui/widgets/e-addressbook-model.h: little clean up.
-
-	* gui/widgets/e-addressbook-view.c (delete): write a bulk-remove
-	case for this.  if the backend supports it, send all the ids at
-	once.  otherwise loop over the ids.
-	(e_addressbook_view_delete_selection): fake a CardAndBook
-	structure and call delete, instead of duplicating the code in 2
-	places.
-
-	* gui/component/addressbook.c (delete_contact_cb): don't call
-	e_contact_editor_confirm_delete here, it's handled by the
-	EAddressbookView.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_construct): fix a
-	compiler warning about a stupid crash.
-
-	* backend/pas/pas-book.h (PASOperation): RemoveCard ->
-	RemoveCards.
-	(PASRemoveCardsReques): char *id -> GList *ids.
-	(PASRequest): PASRemoveCardRequest -> PASRemoveCardsRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_remove_cards): build up a
-	GList from the id sequence.
-	(pas_book_respond_remove): notifyCardRemoved ->
-	notifyCardsRemoved.
-	(impl_GNOME_Evolution_Addressbook_Book_removeCards): rename.
-	(pas_book_free_request): free the idlist for RemoveCards.
-	(pas_book_class_init): removeCard -> removeCards.
-
-	* backend/pas/pas-book-view.h: change prototype for
-	pas_book_view_notify_remove, and add prototype for
-	pas_book_view_notify_remove_1.
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_remove_1):
-	build up a list and call pas_book_view_notify_remove.
-	(pas_book_view_notify_remove): build up the corba id sequence and
-	call BookViewListener::notifyCardsRemoved.
-
-	* backend/pas/pas-backend.h: remove_card -> remove_cards.
-
-	* backend/pas/pas-backend.c (pas_backend_remove_cards): rename
-	from _remove_card.
-	(process_client_requests): RemoveCard -> RemoveCards and
-	_remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(remove_card_handler): _remove => _remove_1.
-	(modify_card_modify_handler): same.
-	(pas_backend_ldap_process_remove_cards): rename from _remove_card.
-	(pas_backend_ldap_class_init): _remove_card -> _remove_cards.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init):
-	remove_card -> remove_cards.
-	(pas_backend_file_get_static_capabilities): add "bulk-removes".
-	(pas_backend_file_process_remove_cards): rewrite this function
-	largely, so that it handles lists of ids.  first we loop through
-	and for every successful deletion we build a list of deleted
-	ECards.  Then for each view we build a list (a subset of the
-	deleted ECard list) and pass back that list to the view.
-	(pas_backend_file_process_modify_card): use _remove_1 instead of
-	_remove.
-	(ecard_matches_search): new function.
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_match_vcard): rewrite in terms of
-	_match_ecard.
-	(pas_backend_card_sexp_match_ecard): new function, the guts from
-	_match_vcard.
-
-	* backend/pas/pas-backend-card-sexp.h: add prototype for
-	pas_backend_card_sexp_match_ecard.
-
-	* backend/idl/addressbook.idl: the card removal stuff now takes
-	CardIdList.
-
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): cache
-	successful capability queries (since they're static).
-	(e_book_check_static_capability): new, convenience function to
-	check if a particular capability is supported.
-	(e_book_remove_card_by_id): build a single element GList and call
-	e_book_remove_cards.
-	(e_book_remove_cards): build up a CORBA sequence from the GList
-	and call Book::removeCards.
-	(e_book_dispose): free the cached capabilities string.
-
-	* backend/ebook/e-book.h: add new prototypes for
-	e_book_check_static_capability and e_book_remove_cards.
-
-	* backend/ebook/e-book-view.h (struct _EBookViewClass): rename
-	"card_removed" signal to "cards_removed".
-
-	* backend/ebook/e-book-view.c (e_book_view_do_removed_event): id
-	-> ids, and free the id list.
-	(e_book_view_check_listener_queue): CardRemovedEvent ->
-	CardsRemovedEvent.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): free the id list.
-	(e_book_view_listener_queue_idlist_event): new function, used for
-	cards_removed.
-	(e_book_view_listener_queue_status_event): id -> ids.
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_cards_removed): call
-	queue_idlist_event.
-	(e_book_view_listener_dispose): free the id list.
-	(e_book_view_listener_class_init): track change to idl call.
-
-	* backend/ebook/e-book-view-listener.h
-	(EBookViewListenerOperation): CardRemovedEvent ->
-	CardsRemovedEvent.
-	(EBookViewListenerResponse): char *id -> GList *ids.
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_remove_cards): rename from remove_card.
-
-2003-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	check the status, not the book, and unref the book here.
-	(contact_editor_cb): same.
-	(start_query): unref the book in the failure case.
-	(add_card_idle_cb): addressbook_load_default_book returns void
-	now.
-	(edit_contact_info_cb): same.
-	(e_address_popup_query): same.
-
-	* gui/component/addressbook.c (control_activate_cb): track change
-	to addressbook_load_uri return type.
-	(set_prop): same.
-	(addressbook_load_uri): return type is void now.
-	(addressbook_load_default_book): same.
-
-	* gui/component/addressbook.h:
-	addressbook_load_uri/addressbook_load_default_book return void
-	now.
-
-	* conduit/address-conduit.c (start_addressbook_server):
-	e_book_load_default_book returns void now.
-
-	* backend/ebook/e-book-util.h: track changes to return types.
-	
-	* backend/ebook/e-book-util.c (e_book_load_address_book_by_uri):
-	fallout from change to e_book_load_uri.  return type for this
-	function is void now too.
-	(e_book_use_address_book_by_uri): same.
-	(e_book_use_default_book): same.
-	(e_book_load_default_book): same.
-	(got_uri_book_cb): if unsuccessful and book is non-NULL, unref it
-	here.
-	(got_default_book_cb): same.
-
-	* backend/ebook/e-book.c (e_book_load_uri): no longer return a
-	gboolean.  any error is communicated to the callback.
-	
-	* backend/ebook/e-book.h: e_book_load_uri no longer returns a
-	gboolean (it's void.)
-
-	* backend/ebook/evolution-ldif-importer.c (ebook_create): track
-	change to the e_book_load_uri family of functions.
-	
-	* backend/ebook/test-client-list.c (ebook_create): same.
-
-	* backend/ebook/test-client.c (ebook_create): same.
-
-	* backend/ebook/load-pine-addressbook.c (ebook_create): same.
-
-	* backend/ebook/evolution-vcard-importer.c (ebook_create): same.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (e-book-marshal.c, e-book-marshal.h):
-	Use different tmp file names so these rules can be executed in
-	parallel without interfering with each otehr.
-
-	* backend/pas/Makefile.am: Make the ORBit compilation work
-	properly with parallel makes (i.e. make sure it does not spawn
-	multiple orbit-idl processes on the same IDL file at the same
-	time).
-	* gui/component/select-names/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main):
-	s/PACKAGE/GETTEXT_PACKAGE/ in gettext setup.
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Remove cruft.
-	(libebookincludedir): Use privincludedir.
-
-	* backend/ebook/e-book-util.c: #include <string.h>
-	* backend/ebook/e-card-compare.c: Likewise
-	* backend/ebook/load-pine-addressbook.c: Likewise
-	* backend/ebook/test-client.c: Likewise
-
-	* backend/ebook/evolution-vcard-importer.c: #include
-	<e-book-util.h>
-	(factory_fn): Fix this to actually return the importer.
-
-	* backend/ebook/evolution-ldif-importer.c (parseLine): #include
-	<e-book-util.h> and <bonobo/bonobo-main.h>. Use g_ascii_strcmp.
-	
-	* backend/ebook/e-card.c (e_card_email_match_single_string): 
-	(e_card_email_find_number): s/g_str/g_ascii_str/
-	* backend/ebook/e-destination.c (e_destination_equal): Likewise.
-	Also, add an "else return FALSE;"
-
-
-	* backend/pas/Makefile.am (INCLUDES): Remove cruft
-	(ldapschemadir): Use privdatadir
-	(pasincludedir): Use privincludedir.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Remove unused variable.
-	* backend/pas/pas-book-view.c (pas_book_view_new): Likewise
-
-
-	* printing/Makefile.am (ecpsdir): Define in terms of privdatadir.
-	(gladedir): Defined in configure.in now.
-
-	* printing/e-contact-print.c: #include <string.h>
-
-	* printing/test-print.c: #include <bonobo/bonobo-main.h>
-	* printing/test-contact-print-style-editor.c: Likewise
-
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Remove some cruft.
-	rename ICONSDIR to IMAGESDIR.
-	(images_DATA): Install arrow.png in imagesdir instead of
-	privdatadir.
-
-	* gui/contact-editor/e-contact-quick-add.c: #include <string.h>
-
-	* gui/contact-editor/e-contact-editor.c: #include <string.h>
-	(e_contact_editor_init): s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR/
-	(e_contact_editor_new): s/gtk_object_ref/g_object_ref/
-	(_replace_button): Look in imagesdir, not privdatadir
-	(_phone_arrow_pressed): Remove call to deprecated
-	gtk_check_menu_item_set_show_toggle.
-	(_email_arrow_pressed): Likewise
-	(_address_arrow_pressed): Likewise
-	(set_address_field): Remove unused variable
-	(enable_widget):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_address_set_property):
-	s/gtk_entry_set_editable/gtk_editable_set_editable/
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init):
-	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
-	(e_contact_editor_fullname_set_property): Likewise.
-
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Remove cruft,
-	s/ICONSDIR/IMAGESDIR/
-	(gladedir, etspecdir): Remove definitions.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: #include
-	<string.h>
-	(e_contact_list_editor_init): s/ICONSDIR/IMAGESDIR/
-	(e_contact_list_editor_new): s/gtk_object_ref/g_object_ref/
-
-	* gui/contact-list-editor/e-contact-list-model.c: #include <string.h>
-
-
-	* gui/merging/Makefile.am (INCLUDES): Remove cruft.
-	* gui/search/Makefile.am (ruledir): Define in terms of privdatadir
-
-
-	* gui/widgets/Makefile.am (INCLUDES): Remove cruft.
-	(gladedir, etspecdir): Remove definitions.
-	(glade_DATA): Empty, so remove it.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: #include <string.h>
-	(addressbook_get_property): Remove unused variable
-
-	* gui/widgets/e-addressbook-view.c: #include <string.h>
-	(get_selection_model): Add a g_return_val_if_reached.
-
-	* gui/widgets/e-minicard.c: #include string.h, gtkmain.h,
-	gnome-canvas-pixbuf.h
-	(field_changed): s/gtk_object_unref/g_object_unref/
-	(get_left_width): Remove unused variable
-
-	* gui/widgets/e-minicard-control.c: #include <string.h>
-	(pstream_load, pstream_save): Use g_ascii_strcasecmp
-
-	* gui/widgets/e-minicard-view.c: #include <string.h>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): s/gtk_type_new/g_object_new/
-
-
-	* gui/component/select-names/Makefile.am (INCLUDES): Remove cruft.
-	(serverdir, gladedir, etspecdir): Remove definitions
-
-	* gui/component/select-names/e-select-names.c: #include <string.h>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(init_html_mail): Remove deprecated
-	gtk_check_menu_item_set_show_toggle call.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_free):
-	s/gtk_timeout_remove/g_source_remove/
-
-
-	* gui/component/Makefile.am (INCLUDES): Remove cruft, rename
-	ICONSDIR to IMAGESDIR.
-	(serverdir, gladedir): Remove defintions.
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): use
-	g_ascii_strcasecmp
-	(add_creatable_item): s/ICONSDIR/IMAGESDIR/
-
-	* gui/component/component-factory.c: #include <string.h>
-
-	* gui/component/e-address-widget.c: Likewise.
-	(e_address_widget_destroy): s/gtk_idle_remove/g_source_remove/
-	(e_address_widget_schedule_query): s/gtk_idle_add/g_idle_add/
-
-
-	* conduit/Makefile.am (INCLUDES): Remove cruft
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-config.c (main): Replace deprecated
-	glade_gnome_init() with glade_init().
-
-	* gui/contact-editor/test-editor.c (main): Likewise.
-
-	* printing/test-contact-print-style-editor.c (main): Likewise.
-
-	* printing/test-print.c (main): Likewise.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	[ pull forward Jack Jia's fix for #34900 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as): use
-	a weak ref for the file selector.
-	(e_contact_list_save_as): same.
-	(destroy_it): rewrite this as a weak ref notify function.
-	(close_it): remove frees of the info (it's freed in the weak ref
-	function).
-	(save_it): same.
-
-2003-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): pull
-	forward Jack Jia's fix for #33672, but convert it to use unlink
-	instead of the gnome-vfs stuff.
-
-2003-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: add a scrolled window
-	(SHADOW_IN) around the address textview.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: rename the category
-	entry to entry-categories.
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): use the specialized "changed" signal
-	handlers for entry-company and entry-fullname.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: i need to sleep more.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (componentdir): need to assign this
-	here or else the lib doesn't get built.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_start_new_page): begin the
-	new page after showing the last one.
-	(complete_sequence): beginpage before we start printing.
-	(e_contact_print_response): GtkDialog-ify this.
-	(e_contact_print_dialog_new): "clicked" -> "response".
-	(e_contact_print_card_dialog_new): same.
-	(e_contact_print_card_list_dialog_new): same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (CONDUIT_SUBDIR): enable this, as building the
-	conduit works if you have gnome-pilot2.
-
-2003-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* conduit/address-conduit.c: GObjectify the stuff in here that
-	refers to addressbook objects.  the gnome-pilot stuff is still
-	GtkObject for the moment.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (iconsdir): Remove definition; this is
-	now in configure.in.
-	* gui/contact-editor/Makefile.am (iconsdir): Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #34898 ]
-	* gui/widgets/e-minicard.c (field_changed): handle modifications
-	to email addresses in contact lists.
-
-2003-01-23  Sean Gao  <Sean.Gao@Sun.COM>
-
-	[ fixes bug #36375 ]
-	* backend/pas/pas-backend-ldap.c: use PHONE_OTHER_FAX instead of
-	PHONE_OTHER for "other_fax".
-	
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #31014, roll this in from the 1.2 branch ]
-	* backend/pas/pas-backend-ldap.c: use "categories" instead of
-	"category" for the ECard field so the UI/get_supported_fields stuff
-	actually thinks its usable in the contact editor..
-
-2003-01-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): fix
-	for bug 34883 broke ssl transactions (at least those where we were
-	connecting to port 636).  Move it to after the SSL stanza.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (componentdir): Remove
-	definition; no need to set it here since it's now defined in
-	configure.in
-	* gui/component/Makefile.am (componentdir): Likewise.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/Makefile.am (gladedir): Version using
-	$(BASE_VERSION).
-	(etspecdir): Likewise.
-	(iconsdir): Likewise.
-
-	* gui/contact-list-editor/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-
-	* gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).
-
-	* gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).
-
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
-	to be versioned through $(BASE_VERSION).
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
-	and update EVOLUTION_IMAGESDIR.
-
-2003-01-21  Radek Doulik  <rodo@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_button): don't use
-	gnome_print_multipage_new_from_sizes and add warning
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): Change dialog from
-	Yes/No/Cancel to Discard/Cancel/Save to match the HIG.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Change dialog from OK/Cancel
-	to Cancel/OK to match the HIG.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Change
-	dialog from Overwrite/Cancel to Cancel/Overwrite to match the HIG.
-
-	* gui/contact-editor/e-contact-quick-add.c
-	(build_quick_add_dialog): Fix typo s/reponse/response/.  Also
-	change the dialog to be Edit/Cancel/OK instead of OK/Edit/Cancel
-	to match the HIG.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): Make alert cancel/delete
-	instead of delete/cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): Make dialog Cancel/OK instead of
-	OK/Cancel to match the HIG.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make dialog Cancel/OK instead of OK/Cancel
-	to match the HIG.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): try to load
-	the uri again if it failed previously.
-	(book_open_cb): set failed_to_load based on the response.
-	(set_prop): initialize failed_to_load to FALSE before we kick off
-	the first load.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, remove
-	it from the hashtable and free it, so we'll try to load it again
-	from scratch the next time it's requested instead of serving up a
-	backend that doesn't function.
-
-	* backend/pas/pas-backend.c (pas_backend_get_uri): we need to be
-	able to get the uri from backends that aren't loaded (so we can
-	remove them from the hashtable.)
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): doh, fix
-	build error.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c: #include
-	gtklabel.h, fixes an unresolved symbol.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (query_ldap_root_dse): build up
-	the list of supported auth_methods.
-	(pas_backend_ldap_process_get_supported_auth_methods): respond
-	with the list of auth methods we've built up.
-	(pas_backend_ldap_dispose): unref the auth_method list.
-	(pas_backend_ldap_class_init): hook up
-	pas_backend_ldap_process_get_supported_auth_methods.
-
-	* backend/pas/pas-backend.c
-	(pas_backend_get_supported_auth_methods): new function.
-	(process_client_requests): add clause for GetSupportedAuthMethods.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_auth_methods, and add it to the class
-	vtable.
-
-	* backend/pas/pas-book.h: add GetSupportedAuthMethods enum member
-	and PASGetSupportedAuthMethodsRequest. and add prototype for
-	pas_book_respond_get_supported_auth_methods.
-
-	* backend/pas/pas-book.c
-	(pas_book_queue_get_supported_auth_methods): new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedAuthMethods):
-	new function.
-	(pas_book_respond_get_supported_auth_methods): new function.
-	(pas_book_free_request): add clause for GetSupportedAuthMethods.
-	(pas_book_class_init): hook up getSupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fields ->
-	list.
-	(e_book_listener_queue_get_supported_auth_methods_response): new
-	function.
-	(impl_BookListener_response_get_supported_auth_methods): new
-	function.
-	(e_book_listener_class_init): hook up
-	epv->notifySupportedAuthMethods.
-
-	* backend/ebook/e-book-listener.h: add
-	GetSupportedAuthMethodsResponse enum member, and change the field
-	name from "fields" to list (and use it for both GetSupportedFields
-	and GetSupportedAuthMethods)
-
-	* backend/ebook/e-book.c (e_book_get_supported_auth_methods): new
-	function.
-	(e_book_do_response_get_supported_auth_methods): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_supported_auth_methods.
-
-	* backend/idl/addressbook.idl: add getSupportedAuthMethods IDL
-	call.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (backend_last_client_gone_cb):
-	deal with backends that might not have loaded successfully
-	(they'll have a NULL uri).
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(e_select_names_bonobo_new): call e_select_names_bonobo_construct
-	on the newly created object.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am: addressbook-config.etspec is gone.
-
-	* gui/component/addressbook-config.c: make the sources table be a
-	gtktreeview instead of an etable.
-
-	* gui/component/ldap-config.glade: remove all references to
-	gnome-hint.png
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (column_width_changed): fix
-	parameter types here (this signal isn't generated from an ETable.)
-
-	* gui/widgets/gal-view-factory-minicard.c: include e-util.h
-
-	* gui/widgets/e-minicard.h: include gnome-canvas.h here.
-
-	* gui/widgets/e-addressbook-table-adapter.c: #include
-	e-destination.h here.
-
-	* gui/widgets/e-minicard.c: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.[ch]: remove the select
-	names stuff (the Related Contacts button/entry.)
-
-	* gui/contact-editor/contact-editor.glade: same.
-
-2003-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
-	comment out the factory oaf_server, and change the location of the
-	SelectNames controls to be
-	OAFIID:GNOME_Evolution_Addressbook_Factory so the normal
-	addressbook.so will create them.
-
-	* gui/component/select-names/Makefile.am
-	(libeselectnames_la_SOURCES): remove the
-	e-select-names-factory.[ch] stuff for the time being.
-
-	* gui/component/component-factory.c (factory): we're now (for the
-	time being) the factory for the select names control.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: oops, don't include
-	e-treeview-selection-model.h unless we're building the treeview.
-
-2003-01-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): Fix to build.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/apps_evolution_addressbook.schemas: add in the
-	schema entry for minimum_query_length.
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h: add
-	E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add ifdefed treeview code.
-	(init_collection): same.
-	(display_view): same.
-	(get_selection_model): same.
-	(treeview_row_activated): same.
-	(create_treeview_view): same.
-	(change_view_type): same.xo
-	(e_addressbook_view_print): same.
-	(e_addressbook_view_print_preview): same.
-
-	* gui/widgets/Makefile.am: add in the treeview sources (commented
-	out).
-
-2003-01-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_edit): add
-	parent arg.
-
-	* gui/widgets/e-addressbook-treeview-adapter.[ch]: new files, for
-	a GtkTreeView view of contacts.
-	
-	* gui/widgets/gal-view-treeview.[ch]: same
-	
-	* gui/widgets/gal-view-favroty-treeview.[ch]: same
-	
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: $(datadir)/evolution/images instead
-	of $(datadir)/images/evolution.
-	* gui/contact-editor/Makefile.am: Likewise.
-	* gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
-	* gui/widgets/Makefile.am: Likewise.
-
-2002-01-08  Dan Winship  <danw@ximian.com>
-
-	Move PASBook request handling into PASBackend itself since all
-	existing backends do it exactly the same way. (Part of 32866).
-
-	* backend/pas/pas-backend.h (PASBackendClass): add new methods for
-	the various pas book requests.
-
-	* backend/pas/pas-backend.c: Add a clients list to
-	PASBackendPrivate.
-	(pas_backend_create_card, etc): Add these to invoke the new
-	methods.
-	(process_client_requests, book_destroy_cb): Moved here and
-	slightly rewritten from pas-backend-file.
-	(last_client_gone): Now static.
-	(add_client, remove_client): Default implementations, based on
-	pas-backend-file, that add the client to/remove it from the
-	backend's clients list and connect to its requests_queued signal.
-	(pas_backend_init, pas_backend_dispose): Deal with the clients
-	list.
-
-	* backend/pas/pas-backend-file.c (struct _PASBackendFilePrivate):
-	Remove GList *clients.
-	(pas_backend_file_process_client_requests,
-	pas_backend_file_book_destroy_db, pas_backend_file_add_client,
-	pas_backend_file_remove_client): Gone.
-	(pas_backend_file_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-	* backend/pas/pas-backend-ldap.c (struct _PASBackendLDAPPrivate):
-	Remove GList *clients.
-	(pas_backend_ldap_process_create_card, etc): Make these take the
-	specific PAS*Request types rather than a generic PASRequest.
-	(pas_backend_ldap_process_client_requests,
-	pas_backend_ldap_book_destroy_db, pas_backend_ldap_add_client,
-	pas_backend_ldap_remove_client): Gone.
-	(pas_backend_ldap_class_init): Remove add_client/remove_client
-	method initializations, add initializations for processing the
-	various book requests.
-
-2003-01-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix the SYNTAX for the
-	telephone attributes, and make the fax attributes more closely
-	mirror those from core.schema.  Fixes the schema for openldap-2.1.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/Makefile.am: remove idldir def (defined by
-	configure.in now)
-
-	* gui/component/select-names/Makefile.am: Likewise
-
-2003-01-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the non-ui portion of #36183 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): use the entry's
-	minimum_query_length instead of a constant here.
-	(e_select_names_completion_set_minimum_query_length): new
-	function, set the entry's minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): set the minimum_query length
-	after setting the completion books.
-	(read_completion_settings_from_db): rename
-	read_completion_books_from_db to this, and read the
-	minimum_query_length too.
-	(db_listener): rename uris_listener to this, and listen for
-	changes on both the uris and minimum_query_length settings.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_set_minimum_query_length.
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	minimum_query_length to struct _ESelectNamesManager.
-
-2002-12-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Made it return an
-	EvolutionConfigControl instead of a BonoboControl (and removed a
-	bogus EvolutionConfigControl -> BonoboControl cast).
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #34897 ]
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): don't free the return of
-	e_card_simple_get_const, as this causes a double free later on.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/e-address-popup.c: convert the clist in here to a
-	GtkTreeView.  your guess is as good as mine if it works (i can't
-	test it at present) but it compiles.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letters):
-	g_string_sprintfa -> g_string_append_printf.
-	(create_alphabet): same.
-	(create_minicard_view): remove gtk_widget_{push,pop}_visual.
-
-	* gui/widgets/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-2002-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): drop use of
-	"font" arg.
-	(get_left_width): use pango to calculate this instead of a GdkFont.
-
-	* gui/widgets/e-minicard-view.c: drop include of e-unicode.h.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't need to create the font anymore.
-
-	* gui/search/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_new): use g_object_new instead of
-	gtk_type_new.
-
-	* gui/merging/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(fill_in_info): same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(e_contact_list_save_as): same.
-
-	* gui/contact-editor/e-contact-quick-add.c (clicked_cb): strdup
-	(or not, if we don't need to save the value) instead of using the
-	e_utf8 functions.
-	(build_quick_add_dialog): same.
-
-	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
-	strdup (or not, if we don't need to save the value) instead of
-	using the e_utf8 functions.
-	(file_as_set_style): same.
-	(name_entry_changed): same.
-	(full_name_clicked): same.
-	(categories_clicked): same.
-	(set_field): same.
-	(fill_in_field): same.
-	(fill_in_single_field): same.
-	(extract_field): same.
-	(extract_single_field): same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c (extract_field):
-	just strdup, it's already utf8.
-
-	* gui/contact-editor/e-contact-editor-address.c (extract_field):
-	they're all entries, use GTK_ENTRY foo here.
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): remove the extra
-	utf8_from_locale_string stuff.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(set_uiinfo_label): gtk_container_children ->
-	gtk_container_get_children, and remove the extra utf8 stuff.
-
-	* gui/component/Makefile.am (INCLUDES): add
-	-D*_DISABLE_DEPRECATED.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): g_string_sprintfa ->
-	g_string_append_printf.
-
-	* gui/component/addressbook-config.c (focus_help):
-	gtk_notebook_set_page -> gtk_notebook_set_current_page.
-	(addressbook_source_dialog_set_source): same.
-	(auth_optionmenu_activated): gtk_container_children ->
-	gtk_container_get_children.
-	(ssl_optionmenu_activated): same.
-	(ssl_optionmenu_selected): same, and gtk_notebook_set_page ->
-	gtk_notebook_set_current_page.
-	(scope_optionmenu_activated): same.
-	(set_advanced_button_state): same.
-	(addressbook_ldap_init): hook "response" to gtk_widget_destroy to
-	make the dialog go away when clicked.
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): fix return type and cast.
-	(main): remove call to gtk_widget_push_visual.
-
-	* gui/component/addressbook-config.h:
-	addressbook_config_control_new returns a BonoboObject, not a
-	BonoboControl.
-
-	* gui/component/addressbook.c: remove e-unicode.h include.
-
-	* backend/pas/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	-DLIBGNOME_DISABLE_DEPRECATED.
-
-	* backend/ebook/e-card.c (e_card_get_property): remove misleading
-	comment.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry):
-	g_strcasecmp -> g_ascii_strcasecmp.
-	(FIND_INSERT): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	g_dirname -> g_path_get_dirname.
-
-	* backend/pas/Makefile.am (INCLUDES):  add
-	-DG_DISABLE_DEPRECATED.
-
-	* backend/ebook/Makefile.am (INCLUDES): add
-	-DG_DISABLE_DEPRECATED.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): oops, use strcmp, not !strcmp here.
-
-2002-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #35135 ]
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): don't
-	free the default_book_uri here, it's done in set_default_book_uri.
-	(set_default_book_uri): break some stuff out from
-	set_default_book_uri_from_bonobo_conf to here so it can be used
-	both from that function and the bonobo listener.
-	(default_folder_listener): set the new default book uri.
-	(set_default_book_uri_from_bonobo_conf): install the bonobo conf
-	listener so we'll get updates.
-
-2002-12-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): Use
-	evolution_shell_client_corba_objref() instead of BONOBO_OBJREF()
-	to get the Shell CORBA object.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-config.c: Don't #include
-	<e-util/e-html-utils.h>
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.[ch]: GObject-ize this.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_auth_cb): pass
-	"Addressbook" to e_passwords*.
-	(addressbook_authenticate): same.
-
-2002-12-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): remove
-	PENDING_PORT_WORK.
-	(addressbook_search_activated): same.
-	(addressbook_query_changed): same.
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
-	add libfilter.la back in.
-
-2002-12-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/widgets/e-minicard-control.c: #define MINICARD_CONTROL_ID.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	connect ::response to gtk_widget_destroy so the dialog goes away.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
-	don't use font_gdk anymore on EText.  it doesn't exist.
-
-2002-12-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (text_height): this
-	uses pango now.
-	(addressbook_height): same.
-
-2002-12-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_commit_card): use e_card_set_book
-	instead of basically duplicating its code here.
-	(e_book_add_card): same.
-
-2002-12-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/e-cardlist-model.c: #include <string.h>.
-
-	* gui/component/addressbook-storage.c: #include <string.h>,
-	<ctype.h>, <unistd.h>.
-
-	* gui/component/addressbook-factory.c: Removed.
-
-	* gui/component/addressbook-component.c: #include
-	<bonobo/bonobo-main.h>, <unistd.h> and <string.h>.
-	(create_view): addressbook_new_control() instead of
-	addressbook_factory_new_control().
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Removed unused variable.
-	(e_select_names_add_section): Removed unused variable.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_in_cb): Use g_source_remove() here instead of
-	gtk_timeout_remove().
-
-	* gui/component/component-factory.c: New.
-
-	* gui/widgets/e-minicard-control.c
-	(e_minicard_control_factory_init): Removed.
-	(e_minicard_control_control_factory): Removed.
-	(e_minicard_control_new): New.
-
-	* gui/component/e-address-widget.c
-	(e_address_widget_factory_init): Removed.
-	(e_address_widget_new_control): Renamed from
-	e_address_widget_factory_new_control(), made public.
-	(e_address_widget_factory): Removed.
-
-	* gui/component/e-address-popup.c (e_address_popup_new_control):
-	New.
-	(e_address_popup_factory_new_control): Removed.
-	(e_address_popup_factory): Removed.
-	(e_address_popup_factory_init): Removed.
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_register_factory): Removed.
-	(addressbook_config_create_control): New.
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_factory_init): Removed.
-	(addressbook_component_get_object): New.
-	(owner_set_cb): Do not call addressbok_config_register_factory().
-
-	* gui/component/addressbook.c (addressbook_factory_init): Removed.
-	(addressbook_new_control): Renamed from
-	addressbook_factory_new_control().
-
-2002-12-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Use collate
-	for sorting rather than the normal string sort. This fixes bug
-	#26335 without causing bug #33933 :-)
-
-2002-11-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	enable the LDAPv3 stuff if TLS is being used.  Also, deal with
-	naming errors returned from query_ldap_root_dse, as some servers
-	(older openldap servers among others i'm sure) don't have a root
-	dse at all.
-	
-2002-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_contact_print_button):
-	gnomedialog -> gtkdialog stuff.  print dialog is a gtkdialog now.
-
-	* gui/contact-editor/e-contact-editor.c: include gtkstock.h
-
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include gtkstock.h
-
-2002-11-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c (column_width_changed): the
-	detail is supposed to go after the signal id, not at the end of
-	the parameter list.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-	[ roll forward from 1.2 branch, partial fix for #31763 ]
-	* gui/component/select-names/select-names.glade: add the Find
-	button back in.
-
-2002-11-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (create_minicard_view): remove
-	the button_press_event handler (that did nothing).  this makes it
-	so button presses actually get to the canvas (and therefore we can
-	now drag the lines in the reflow widget).
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c: add include for
-	gtkstock.h.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): add pre_change call.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_new): ref/sink the contact list editor so
-	we don't get the floating unref warning from gtk.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
-	ref/sink the contact editor so we don't get the floating unref
-	warning from gtk.
-	(e_contact_editor_init): use g_build_filename instead of
-	g_concat_dir_and_file.
-
-	* gui/widgets/e-minicard-label.c
-	(e_minicard_label_resize_children): use MAX (value, 0) to make
-	sure we aren't passing negative values for clip-widths.
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): use MAX (value,
-	0) to make sure we aren't passing negative values for widths.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	use g_build_filename.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch ]
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_vcard): never pass NULL as the vcard
-	to the corba call, it causes a crash.  This particular bug bit us
-	when we opened a card that contained an unresolvable related
-	contact.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from 1.2 branch, Fixes addressbook bug #28945 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): if the email
-	property is xml, get the real address from the e-destination.
-	Fixes saving contact lists.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_reflow): remove redundant
-	setting of y2.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): show the table.
-
-	* gui/component/select-names/e-select-names-completion.c: remove
-	an unnecessary #include.
-
-	* gui/component/addressbook-storage.c (addressbook_storage_setup):
-	use g_build_filename.
-
-	* gui/component/addressbook-component.c (remove_folder): use
-	g_build_filename.
-	(add_creatable_item): same.
-	(ensure_completion_uris_exist): same, and use the right gconf
-	paths for completion uris.
-
-2002-11-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(read_completion_books_from_db): use new schema for
-	completion/uris.
-	(uris_listener): same.
-
-	* gui/component/select-names/e-select-names.h: Convert to
-	GtkDialog from GnomeDialog.
-	
-	* gui/component/select-names/e-select-names.c: Convert to
-	GtkDialog from GnomeDialog.
-	(folder_selected): use new schema for last_used_uri.
-	(e_select_names_init): same.
-	(e_select_names_set_default): use pango markup to set
-	bold/not-bold.
-	(e_select_names_add_section): don't bother creating an EEntry, we
-	can use pango and a normal label.  This also keeps us from
-	wrapping "contacts ->" at the '-'.
-
-	* gui/component/apps_evolution_addressbook.schemas: new file.
-
-	* gui/component/Makefile.am: add the schema stuff.
-
-2002-11-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (query_for_supported_bases):
-	show the etable.
-	(addressbook_add_server_druid): show_all before returning the
-	dialog, so the druid shows up.
-
-2002-11-23  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward from the 1.2 branch.  fixes #25540, part of #29630,
-	as well as other selection issues in the contact editor and ACL
-	issues in the ldap backend ]
-	* backend/pas/pas-backend-ldap.c (check_schema_support): reset the
-	schema check state to FALSE if the read returned nothing (and the
-	user had not authenticated).  we'll requery if/when they auth.
-	(query_ldap_root_dse): free the schema dn before assigning over
-	it.
-	(pas_backend_ldap_connect): added a diagnostic warning about the
-	root dse query failing in anonymous mode (if it in fact did fail.)
-	(pas_backend_ldap_process_authenticate_user): if we successfully
-	authed, requery the root dse to pick up any attributes that might
-	be protected, and retry the schema query if that failed before.
-
-	* gui/contact-editor/e-contact-editor.c (full_name_clicked): set
-	the dialog's editable state based on the new field
-	"fullname_editable", and only do the Ok button handling if this
-	flag is TRUE.
-	(full_addr_clicked): set the dialog's editable state based on the
-	editable state for the particular address (from
-	editor->address_editable[]).  also, only do the Ok button handling
-	if this flag is TRUE.
-	(_address_arrow_pressed): use the address_editable array to
-	determine whether the address text and the mailing address
-	checkbutton are sensitive.
-	(enable_writable_fields): figure out if fullname_editable is
-	TRUE/FALSE, also, init the address_editable flags based on the
-	field list, and handle the address checkbutton.
-
-	* gui/contact-editor/fulladdr.glade: change the label names to
-	label-<name> to match {entry,combo}-<name>.
-
-	* gui/contact-editor/fullname.glade: same.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_fullname_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): rename ARG_IS_READ_ONLY to
-	ARG_EDITABLE, to reflect the correct sense of the flag.
-	(e_contact_editor_address_set_arg): same, and make the labels
-	sensitive/insensitive depending on the editable state of the
-	dialog.
-	
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ roll forward Sean.Gao@sun.com's fix for #16870 from the 1.2
-	branch ] 
-	* backend/ebook/evolution-ldif-importer.c (getNextLDIFEntry):
-	check for both LR and CRLF as empty line markers.
-
-2002-11-22  Chris Toshok  <toshok@ximian.com>
-
-	[ rolling forward fix for #34254 from 1.2 branch ]
-	* backend/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	use g-ascii_strncasecmp instead of strncmp.
-	(support_format_fn): use g_ascii_strcasecmp instead of strcmp.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: roll forward the scope fix.
-
-2002-11-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: roll forward the fix for
-	the contact editor.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_changed): Pass type to bonobo_ctonrol_set_property, and
-	also NULL terminate the valist.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(changed_cb): Fix signature for signal.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in,
-	* gui/component/select-names/Makefile.am: Same changes as below
-	for the SelectNames component.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): show the custom table.
-
-2002-11-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c (gal_view_minicard_attach):
-	remove the cast to (int) - column_width is a double.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): the height
-	property is only readable, not readwrite.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): make column_width a double
-	property.
-	(e_minicard_view_widget_set_property): don't cast to (int).
-	column_width is double in the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_property): use g_value_set_double for
-	column_width.
-
-2002-11-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/Makefile.am (servers_DATA): oops,
-	missed some "oaf"'s.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_build_phone_ui): sink the popup.
-	(e_contact_editor_build_email_ui): same.
-	(e_contact_editor_build_address_ui): same.
-
-	* gui/component/addressbook-config.c (ldap_dialog_new): show
-	everything from dialog->page down, so custom widgets show up.
-
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Added rule to generate
-	GNOME_Evolution_Addressbook.server.in from
-	GNOME_Evolution_Addressbook.server.in.in, substituting
-	@LIBEXECDIR@.
-
-	* GNOME_Evolution_Addressbook.server.in.in: Renamed from
-	GNOME_Evolution_Addressbook.server.in.  Added @LIBEXECDIR@ before
-	the location of the executable.
-
-	* gui/component/select-names/select-names.glade: Ported to Glade
-	2.
-
-	* gui/component/select-names/recipient.glade: Ported to Glade 2.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Use bonobo_main_quit.
-	
-2002-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-factory-minicard.c: clean this up a tad.
-
-	* gui/widgets/e-addressbook-view.c (init_collection): re-enable
-	this.
-	(setup_menus): same.
-
-	* gui/widgets/gal-view-minicard.[ch]: more GObject work.
-
-2002-11-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_popup_position): push_in
-	= FALSE, no clue why... :)
-	(_arrow_pressed): call g_signal_stop_emission here, seems to fix
-	things.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): fix warnings.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): fix warning.
-
-	* gui/component/addressbook.c (forget_passwords_cb): remove the
-	PENDING_PORT ifdef.
-	(load_uri_auth_cb): same.
-	(addressbook_authenticate): same.
-
-	* gui/component/addressbook-factory.c (main): same.
-
-	* gui/component/addressbook-storage.c (load_source_data): be
-	silent about text nodes if they contain nothing but whitespace.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of a weak ref notify function.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(get_cursor_handler): ::destroy -> weak_ref.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_add_client): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of a weak ref notify function.
-	(view_destroy): same.
-	(pas_backend_file_book_destroy_cb): same.
-	(pas_backend_file_process_get_cursor): ::destroy -> weak_ref.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-	* backend/ebook/test-client.c (get_cursor_cb): unref the book and
-	exit here.
-	(get_card_cb): pass a query string to get_cursor.
-
-	* backend/ebook/e-book-view.c (e_book_view_class_init): correct
-	marshaller for "card_added".
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard.c (destroy_callback): change signature
-	to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-view.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/test-minicard-label.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_init): ifdef
-	out the call to gnome_canvas_set_scroll_region.  It doesn't seem
-	necessary judging from the rest of the code, and it also crashes
-	the addressbook if it's in.
-
-	* gui/widgets/e-minicard-widget-test.c (destroy_callback): change
-	signature to that of a weak ref notify function.
-	(main): ::destroy -> weak_ref.
-
-	* gui/widgets/e-minicard-control.c (free_struct): change signature
-	to that of a weak ref notify function.
-	(e_minicard_control_factory): ::destroy -> weak_ref.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	::destroy -> weak_ref.
-	(e_addressbook_view_print): same.
-	(free_closure): change signature to that of a weak ref notify
-	function.
-	(e_contact_print_destroy): same.
-	(invisible_destroyed): same.
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): convert from GnomeDialog to
-	GtkDialog.
-	(e_addressbook_show_multiple_cards): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): change response ids to use
-	GTK_RESPONSE_.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(clear_widget): new function.
-	(e_select_names_manager_activate_dialog): ::destroy -> weak_ref.
-
-	* gui/component/select-names/e-select-names.c (clear_widget):
-	change signature to that of a weak ref notify function.
-	(e_select_names_init): ::destroy -> weak_ref.
-
-	* gui/component/e-address-popup.c (mini_wizard_destroy_cb): change
-	signature to that of a weak ref notify function.
-	(mini_wizard_new): ::destroy -> weak_ref.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_destroy): change signature to that of a
-	weak ref notify function.
-	(ldap_config_control_destroy_callback): same.
-	(addressbook_add_server_druid): ::destroy -> weak_ref.
-	(addressbook_edit_server_dialog): same.
-	(ldap_config_control_new): same.
-
-	* gui/component/addressbook.c (destroy_callback): change signature
-	to that of a a weak ref notify function.
-	(addressbook_factory_new_control): ::destroy -> weak_ref.
-
-	* gui/merging/e-card-merging.c (response): rename clicked to this,
-	and destroy the dialog here.
-	(match_query_callback): ::clicked -> ::response
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	convert.
-
-	* gui/merging/e-card-duplicate-detected.glade: same.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_arrow_pressed): change
-	around a little, still ifdefed though.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): same.
-	(save_it): deal with the GtkDialog response ids.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): just build the dialog here
-	(using gtk_message_dialog*).
-
-	* gui/contact-editor/Makefile.am (glade_DATA): remove
-	file-exists.glade and e-contact-editor-confirm-delete.glade.
-
-2002-11-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
-	against multiple invocations.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): change signature
-	to that of weak ref's notify function - also, don't use the type
-	check macros on the freed GObject.
-	(cursor_destroy): same.
-	(pas_backend_ldap_book_destroy_cb): same.
-	(pas_backend_ldap_add_client): use weak_ref insteead of ::destroy.
-	(get_cursor_handler): same.
-	(pas_backend_ldap_process_get_book_view): same.
-
-	* backend/pas/pas-backend-file.c (cursor_destroy): change
-	signature to that of weak ref's notify function - also, don't use
-	the type check macros on the freed GObject.
-	(pas_backend_file_book_destroy_cb): same.
-	(view_destroy): same.
-	(pas_backend_file_process_get_cursor): use weak_ref instead of
-	::destroy.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_completion_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_add_client): same.
-
-2002-11-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_dispose): guard against multiple
-	invocations.
-	
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): same.
-
-	* backend/pas/pas-book.c (pas_book_dispose): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_dispose): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_dispose): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_dispose): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_dispose): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): same.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_dispose): guard
-	against multiple invocations.
-
-	* backend/ebook/e-card.c (e_card_dispose): same.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_dispose): same.
-
-	* backend/ebook/e-card-cursor.c (e_card_cursor_dispose): same.
-
-	* backend/ebook/e-book.c (e_book_dispose): same.
-
-	* backend/ebook/e-book-view-listener.c (e_book_view_listener_dispose): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (free_data): guard against
-	multiple invocations.
-	(remove_book_view): same.
-	(addressbook_dispose): same.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
-	same.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_dispose): same.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_dispose): same.
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_dispose):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): oops, missed these casts.
-
-	* gui/component/addressbook.c (get_master_list): remove the
-	PENDING_PORT_WORK ifdef, just ported ECategoriesMasterList.
-	(make_suboptions): same.
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/test-reflow.c: port work.
-
-	* gui/widgets/test-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard.[ch]: port work.
-	
-	* gui/widgets/e-minicard-widget.c: port work.
-
-	* gui/widgets/e-minicard-view.c: port work.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_size_allocate): gtk_->g_ change i missed.
-	(e_minicard_view_widget_reflow): same.
-
-	* gui/widgets/e-minicard-label.c: port work.
-
-	* gui/widgets/e-minicard-control.c (get_prop): gtk_->g_ change i
-	missed.
-
-	* gui/widgets/e-addressbook-view.c (setup_menus): ifdef this
-	PENDING_PORT_WORK for now.
-	(has_email_address_1): gtk_->g_ change i missed.
-	(print): remove the PENDING_PORT_WORK from here, as the print_*
-	symbols now resolve.
-	(delete): gtk_->g_ changes.
-	(new_card): same.
-	(new_list): same.
-	(sources): same.
-	(create_minicard_view): same.
-	(table_double_click): same.
-	(create_table_view): same.
-	(e_contact_print_destroy): same.
-	(e_contact_print_button): same.
-	(e_addressbook_view_print): same, and remove the PENDING_PORT_WORK
-	ifdef.
-	(e_addressbook_view_print_preview): same.
-	(do_remove): gtk_->g_ changes.
-	(e_addressbook_view_save_state): same.
-	(view_transfer_cards): same.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView):
-	GtkObject -> GObject.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	GnomeDialog -> GtkDialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): a gtk_->g_ change i missed.
-	(e_addressbook_table_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_property): use g_object_get_property for
-	aggregated properties.
-	(e_addressbook_reflow_adapter_class_init): gtk_type_class ->
-	g_type_class_peek_parent.
-
-	* gui/merging/e-card-merging.c (match_query_callback): some misc
-	gtk_->g_ changes i missed.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.h: parent class
-	is GObjectClass.
-
-	* gui/component/select-names/e-simple-card-bonobo.c
-	(impl_dispose): guard against multiple invocations, and chain
-	dispose.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_dispose): guard against multiple invocations.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_dispose): guard against multiple
-	invocations.
-	(e_select_names_text_model_set_source): fix casts.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(e_select_names_table_model_add_source): remove the GTK_OBJECT
-	cast, fixes a warning.
-	(clear_info): guard against multiple invocations from ::dispose.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_dispose): same.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_dispose): same.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_dispose): guard against multiple invocations.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: convert to glade-2
-
-	* gui/contact-list-editor/e-contact-list-editor.c: port work.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor-fullname.[ch]: port work.
-
-	* gui/contact-editor/e-contact-editor.[ch]: port work.
-
-	* gui/contact-editor/e-contact-quick-add.c: port work.
-
-	* gui/contact-editor/e-contact-save-as.c: port work.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c
-	(set_default_book_uri_from_config_db): prepend /apps/Evolution to
-	config db paths.
-	
-	* gui/component/select-names/e-select-names-manager.c (read_completion_books_from_db): same.
-	(uris_listener): same.
-
-2002-11-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: more porting work.
-
-	* e-contact-editor-fullname.[ch]: more porting work.
-
-	* e-contact-editor.c: more porting work.
-
-	* e-contact-quick-add.c: more porting work.
-
-	* e-contact-save-as.c: more porting work.
-
-	* test-editor.c: more porting work.
-	
-	* e-contact-editor-confirm-delete.glade, file-exists.glade,
-	fulladdr.glade, fullname.glade: run these through
-	libglade-convert.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): add
-	lots of libs back in since they're building now.
-
-	* gui/component/addressbook-config.c: more porting work.
-
-	* gui/component/addressbook.c: more porting work.
-
-	* gui/component/e-address-popup.[ch]: more porting work.
-	
-	* gui/component/e-address-widget.[ch]: more porting work.
-	
-	* gui/component/e-cardlist-model.[ch]: more porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: more
-	porting work.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-popup.c: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-table-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names-text-model.[ch]: more
-	porting work.
-	
-	* gui/component/select-names/e-select-names.[ch]: more
-	porting work.
-	
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/Makefile.am: tests are linking now, and link in
-	libcamel.la.
-
-	* backend/ebook/e-destination.c (e_destination_get_name): un-ifdef
-	since camel is compiling.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/e-card-compare.c (name_fragment_match): use e_utf8_casefold_*.
-	(name_fragment_match_with_synonyms): same.
-	(e_card_compare_name_to_string_full): same.
-	(e_card_compare_name): same.
-
-2002-11-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.h: add prototypes for e_utf8_casefold_collate{_len}
-
-	* backend/ebook/e-book-util.c (e_utf8_casefold_collate_len): move
-	utf8_casefold_collate_len here.
-	(e_utf8_casefold_collate): move utf8_casefold_collate here.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print-envelope.c: port this to
-	gnome2/gnomeprint2.
-
-	* printing/e-contact-print-style-editor.c: same.
-
-	* printing/e-contact-print.c: same.
-
-	* printing/test-contact-print-style-editor.c: same.
-
-	* printing/test-print.c: same.
-
-	* printing/e-contact-print.glade: libglade-convert to libglade-2.
-	
-	* printing/Makefile.am (contact_print_test_LDADD)
-	(contact_print_style_editor_test_LDADD): remove libcamel.la from
-	these for the time being to get things linking.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard.[ch]: gobjectify this.
-	(e_minicard_class_init): change the
-	min/max values of the width/height paramspecs so that they can
-	actually be set to something other than 0.0.
-
-	* gui/widgets/e-minicard-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-view.[ch]: gobjectify this.
-	(set_empty_message): don't need e_utf8_from_locale_string anymore.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-label.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-view.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-table-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-reflow-adapter.[ch]: gobjectify this.
-
-	* gui/widgets/e-addressbook-model.[ch]: gobjectify this.
-
-	* gui/widgets/e-minicard-control.c (e_minicard_control_factory):
-	fix bonobo_persist_stream_new api change.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_add_destination): get rid of the
-	gtk_object_sink here.
-
-	* gui/component/ldap-config.glade: glade-2 version of this file.
-	
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	don't need e_utf8_to_gtk_string anymore.
-
-	* gui/component/addressbook.c (make_suboptions): don't need
-	e_utf8_to_locale_string anymore.
-
-	* gui/component/addressbook-config.c
-	(addressbook_dialog_get_source): get rid of the e_utf8 gtk_entry
-	functions.
-	(addressbook_source_dialog_set_source): same.
-	(general_tab_check): same.
-	(port_changed_func): same.
-	(connecting_tab_check): same.
-	(query_for_supported_bases): same.
-	(display_name_check): same.
-	(display_name_page_prepare): same.
-	(edit_source_clicked): same.
-	(addressbook_config_create_new_source): same.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c
-	(pas_backend_card_sexp_class_init): use g_type_class_peek_parent.
-
-	* backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same.
-
-	* backend/pas/pas-book-view.c (pas_book_view_class_init): same.
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_class_init): same.
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_class_init): same.
-
-	* backend/ebook/e-book-marshal.list: ENUM -> INT.
-
-	* backend/ebook/e-book-view.c (e_book_view_dispose): guard against
-	this being called multiple times.
-	(e_book_view_class_init): ENUM -> INT in the sequence_complete
-	signal.
-	
-	* backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the
-	component_died signal stuff.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): call
-	g_build_filename, not g_build_path.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.[ch]: fix the gnome-xml headers.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/gal-view-minicard.c: fix the gnome-xml headers.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): convert from gtk signals and args
-	to GSignal and GObject properties.
-	(e_addressbook_view_dispose): rename _destroy to this.
-	(e_addressbook_view_set_property): rework _set_arg to this.
-	(e_addressbook_view_get_property): rework _get_arg to this.
-	(display_view): if we're here we need to choose a view, regardless
-	of whether or not the GAL_IS_VIEW_* macros tell us which type it
-	is.
-
-	* gui/widgets/e-addressbook-table-adapter.c: fix the gnome-xml
-	headers.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_class_init): use INT, not ENUM in the signal here.
-
-	* gui/component/addressbook-config.c: another big gtk_* -> g_*
-	renaming.
-	
-	* gui/component/addressbook.c: same.
-
-	* gui/component/e-address-popup.c: same.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/e-cardlist-model.c: fix the gnome-xml headers, and
-	more gtk_* -> g_* renaming.
-	
-	* gui/component/addressbook-component.c (owner_set_cb): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(create_view): fix the call to bonobo_control_set_property.
-	(create_component): gtk_signal_connect -> g_signal_connect.
-
-	* gui/component/addressbook-storage.c: fix the gnome-xml
-	headers.
-	(addressbook_storage_setup): use
-	evolution_shell_client_corba_objref as per ettore's change to
-	EvolutionShellClient..
-	(addressbook_get_other_contact_storage): gtk_signal_connect ->
-	g_signal_connect.
-	(load_source_data): root->childs -> root->childrens.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c: fix some #include's.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (SUBDIRS): only build the backend and gui dirs for
-	now.  printing and conduits are no-man's land at present.
-
-	* addressbook/gui/merging/e-card-merging.[ch]: Port to
-	GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/.cvsignore: ignore the new .server file.
-	
-	* gui/component/Makefile.am: typical port stuff.  switch the .oaf
-	to .server, and leave out a lot of libs so we can actually get
-	things linking.
-	
-	* gui/component/GNOME_Evolution_Addressbook.server.in: rename
-	.oaf.in here.
-	
-	* gui/component/addressbook-component.c: Port to GObject/gnome2.
-	
-	* gui/component/addressbook-config.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-factory.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook-storage.c: Port to GObject/gnome2.
-
-	* gui/component/addressbook.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-popup.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-address-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/component/e-cardlist-model.h: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-list-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-list-editor/e-contact-list-editor.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/contact-list-editor/e-contact-list-model.[ch]: Port to
-	GObject/gnome2.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/.cvsignore: ignore the marshal generated
-	stuff.
-	
-	* gui/contact-editor/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it...
-	
-	* gui/contact-editor/e-contact-editor-address.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor-fullname.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-editor.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-quick-add.c: Port to GObject/gnome2.
-	
-	* gui/contact-editor/e-contact-save-as.[ch]: Port to GObject/gnome2.
-	
-	* gui/contact-editor/test-editor.c: Port to GObject/gnome2.
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-table-adapter.c: Port to
-	GObject/gnome2.
-
-	* gui/widgets/e-addressbook-util.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-addressbook-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-control.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-label.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view-widget.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-view.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget-test.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard-widget.c: Port to GObject/gnome2.
-
-	* gui/widgets/e-minicard.[ch]: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-factory-minicard.c: Port to GObject/gnome2.
-
-	* gui/widgets/gal-view-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-label.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard-view.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-minicard.c: Port to GObject/gnome2.
-	
-	* gui/widgets/test-reflow.c: Port to GObject/gnome2.
-	
-	* gui/widgets/Makefile.am: typical port stuff.  add marshaller
-	generation foo, dist it...
-
-	* gui/widgets/.cvsignore: ignore the marshaller stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-simple-card-bonobo.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names.[ch]: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-text-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-table-model.c: Port to
-	GObject/gnome2.
-	
-	* gui/component/select-names/e-select-names-popup.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-model.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-manager.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-factory.c: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-completion.[ch]: Port
-	to GObject/gnome2.
-
-	* gui/component/select-names/e-select-names-bonobo.[ch]: Port to
-	GObject/gnome2.
-
-	* gui/component/select-names/Makefile.am: typical port stuff.  add
-	marshaller generation foo, dist it, and switch the .oaf to .server
-
-	* gui/component/select-names/.cvsignore: ignore the marshaller
-	stuff.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/.cvsignore: ignore the generated marshaller files.
-
-	* backend/ebook/e-destination.c (e_destination_dispose): rename
-	e_destination_destroy.
-	(e_destination_equal): ifdef this out for now, PENDING_PORT_WORK.
-	(e_destination_get_name): same.
-	(e_destination_get_email): same.
-	(e_destination_get_address): same.
-	(e_destination_get_textrep): same.
-
-	* backend/ebook/Makefile.am: don't build the executables
-	(importers and loaders) for now.  Also, s/oaf/server, and use
-	INTLTOOL_SERVER_RULE.
-
-	* backend/ebook/e-book-util.c (e_book_get_config_database):
-	un-#ifdef this.
-	(e_book_default_book_open): un-#ifdef ths code in here that relies
-	on the e_config_listener.
-
-2002-11-05  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (send_pending_adds): copy a
-	memleak fix from pas-backend-ad.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c: g_date_* => g_date_get_*, fixes
-	G_DISABLE_DEPRECATED build.
-
-	* backend/ebook/e-book-listener.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/ebook/e-book-view-listener.[ch]: remove the servant crap
-	i'd c&p'ed and put in here.
-	
-	* backend/pas/pas-book-factory.[ch]: subclass from BonoboObject,
-	and remove the servant crap from here too.  whee.
-
-	* backend/pas/pas-card-cursor.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-	* backend/pas/pas-book.[ch]: remove the servant crap i'd c&p'ed
-	and put in here.
-
-	* backend/pas/pas-book-view.[ch]: remove the servant crap i'd
-	c&p'ed and put in here.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.[ch]: port to gnome 2.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-file.[ch]: same.
-
-	* backend/pas/pas-backend-ldap.[ch]: same.
-
-	* backend/pas/pas-backend-summary.[ch]: same.
-
-	* backend/pas/pas-backend.[ch]: same.
-
-	* backend/pas/pas-book-factory.[ch]: same.
-
-	* backend/pas/pas-book-view.[ch]: same.
-
-	* backend/pas/pas-book.[ch]: same.
-
-	* backend/pas/pas-card-cursor.[ch]: same.
-
-	* backend/pas/pas-marshal.list: list of marshallers.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add pas-marshal.c
-	also add the marshal building foo.
-
-	* backend/pas/.cvsignore: ignore pas-marshal.[ch]
-	
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/test-client-list.c (main): don't call
-	bonobo_activation_init directly.
-
-	* backend/ebook/test-client.c (get_card_cb): don't unref the card
-	here since we never reffed it.
-	(main): no need to call bonobo_activation_init, as
-	gnome_program_init did it for us.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get_property):
-	s/g_value_{set,get}_pointer/g_value_{set,get}_object
-
-	* backend/ebook/e-book-util.c (set_default_book_uri_local): make
-	sure to terminate args with NULL for g_build_filename.
-
-	* backend/ebook/e-book-listener.c: nuke e_book_listener_get_type
-	and use the BONOBO_TYPE_FUNC_FULL macro.
-
-	* backend/ebook/e-book-listener.h: add the epv to
-	EBookListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-	* backend/ebook/e-book-view-listener.c: nuke
-	e_book_view_listener_get_type and use the BONOBO_TYPE_FUNC_FULL
-	macro.
-
-	* backend/ebook/e-book-view-listener.h: add the epv to
-	EBookViewListenerClass so BONOBO_TYPE_FUNC_FULL works.
-
-2002-11-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-types.h: just include glib.h instead of the
-	gtk stuff.
-
-	* backend/ebook/e-book-listener.[ch]: convert to
-	GObject/bonobo-activation/etc/etc.
-	* e-book-util.[ch]: same.
-	* e-book-view-listener.[ch]: same.
-	* e-book-view.[ch]: same.
-	* e-book.[ch]: same.
-	* e-card-compare.[ch]: same.
-	* e-card-cursor.[ch]: same.
-	* e-card-simple.[ch]: same.
-	* e-card.[ch]: same.
-	* e-destination.[ch]: same.
-	* evolution-ldif-importer.c: same.
-	* evolution-vcard-importer.c: same.
-	* load-gnomecard-addressbook.c: same.
-	* load-pine-addressbok.c: same.
-	* test-card.c: same.
-	* test-client-list.c: same.
-	* test-client.c: same.
-
-	* backend/ebook/Makefile.am: add e-book-marshal.c to SOURCES, add
-	e-book-marshal.[ch] to CLEANFILES, and add e-book-marshal.list to
-	EXTRA_DIST.  Also, remove the camel libs from the test LDADD's,
-	and leave e-destination.[ch] out of the build.
-
-	* backend/ebook/.cvsignore: ignore e-book-marshal.[ch]
-
-	* backend/ebook/e-book-marshal.list: marshallers for e-book.
-
-2002-10-28  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueUTF8): never set the charset
-	on an item without also encoding it.  Mime messages don't like
-	parts with multiple charsets. 	
-
-2002-10-25  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy):
-	Disconnect from the book's backend_died signal.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-       * backend/pas/Makefile.am: install evolutionperson.schema to
-       $(datadir)/evolution.
-
-2002-10-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29144 ]
-	* gui/component/addressbook-config.c (edit_dialog_store_change):
-	use e_table_memory_storage_change instead of remove/insert, so the
-	selection is maintained.
-
-2002-10-22  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(folder_selected): Set /Addressbook/select_names_uri in the
-	configdb to the selected folder.
-	(e_select_names_init): Look for /Addressbook/select_names_uri
-	before /DefaultFolders/contacts_uri for the initial folder. So the
-	select names dialog now starts up using the same folder you used
-	last time, which is useful when you have an LDAP company directory
-	(which can't be your default contacts folder because it's
-	read-only).
-
-2002-10-21  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): fix the
-	sense of a strcmp
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fix for #23764 ]
-	* gui/widgets/e-addressbook-view.c (jump_to_letters): handle
-	multiple letters associated with a single button.
-	(button_toggled): closure->letter -> closure->letters.
-	(free_closure): free closure->letters.
-	(create_alphabet): init closure->letters.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29067 ] 
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): we
-	need to create a card_sexp even when doing summary queries since
-	it's used to check modifications of cards in the view.
-
-2002-10-20  Chris Toshok  <toshok@ximian.com>
-
-       [ fixes #32144 ]
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
-	convert the name to the gtk locale before saving.
-	(e_contact_list_save_as): same.
-	
-2002-10-19  Chris Toshok  <toshok@ximian.com>
-
-	[ probable fix for #25477, and memory leak fix ]
-	* gui/contact-editor/e-contact-editor.c (supported_fields_cb): if
-	the dialog isn't in the list of all dialogs it's been destroyed so
-	just return here.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): plug leak of
-	resp->fields.
-
-2002-10-15  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_email_match_string): Return right
-	away rather than crashing if card->email is NULL.
-	(e_card_email_find_number): Likewise.
-
-2002-10-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	[ Fix #7094, #7064, #7095, #31944, #31945 ]
-	* gui/component/Makefile.am: Hook up new etspec file.
-	* gui/component/addressbook-config.c: Remove ETable spec.
-	* gui/component/addressbook-config.etspec: New file.
-	* gui/component/ldap-config.glade: Fix typo.
-	* gui/component/select-names/e-select-names.c: Remove inline spec.
-	* gui/component/select-names/e-select-names.etspec: New file.
-	* gui/contact-list-editor/Makefile.am: Hook up etspec.
-	* gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec.
-	* gui/contact-list-editor/e-contact-list-editor.etspec: New file.
-	* gui/widgets/Makefile.am: Hook up new spec.
-	* gui/widgets/e-addressbook-view.c: Remove inline spec.
-	* gui/widgets/e-addressbook-view.etspec: New file.
-
-2002-10-02  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix #28392 ]
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): #if 0 out the
-	gal_view submenu, since it's not spec'ed to be there anyway (as
-	per bug #16250).
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31321 ]
-	* backend/ebook/e-card.c (e_card_get_vobject): add VERSION:2.1 to
-	exported vCards.
-
-2002-09-30  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #31434 ]
-	* backend/pas/pas-backend-file.c (do_summary_query): always
-	retrieve the card from the db.  use the summary strictly for
-	matching, not for storing all information.  This fixes completion
-	of contact lists, since only 3 addresses were being stored and
-	contact lists can have more.
-
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_show_multiple_cards): rephrase string on l. 213
-	
-2002-09-30  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): update for
-	Composer_setHeaders change.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27521 ]
-	* gui/contact-editor/e-contact-quick-add.c (editor_closed_cb):
-	always unref the contact editor when we get the editor_closed
-	signal.
-
-2002-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): set the
-	timeout to 30 seconds.
-	(query_ldap_root_dse): same, and also return the ldap_error since
-	this function is the one that actually causes openldap to
-	connect() to the ldap host.
-	(pas_backend_ldap_connect): check the return value of
-	query_ldap_root_dse, and error out if it's not SUCCESS.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Change
-	folder type to "contacts/ldap".
-	(addressbook_storage_add_source): Likewise.
-	(create_ldap_folder): Check for type being "contacts" not
-	ldap contacts, since the ldap-specific type doesn't appear in the
-	menu.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (folder_types): Rename
-	"ldap-contacts" to "contacts/ldap" and add "contacts/public".
-	(IS_CONTACT_TYPE): update for new types.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Use "contacts/*" for selector_types.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Likewise.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	"evolution:config_item:type" = "contacts/ldap" to the LDAP sources
-	control so it comes up by default when you open Preferences in an
-	LDAP folder.
-
-2002-09-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (addressbook_destroy):
-	free adapter->priv.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): free
-	model->query.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(load_completion_books): use e_book_expand_uri here, and free the
-	expanded uri after calling addressbook_load_uri, plugging a leak.
-
-	* gui/component/select-names/e-select-names.c (set_book): unref
-	esn->model before we unref esn.  fixes an edge case memory
-	corruption bug.
-	(clear_widget): utility function to set a widget's ref to NULL
-	when it's destroyed.
-	(e_select_names_init): hook the status_message, categories option
-	menu, and select_entry to clear_widget.
-	(addressbook_model_set_uri): use e_book_expand_uri.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: add libeutil to the link and link with
-	libcamel instead of libcamel-static.la
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: oops, add
-	cached_folder_list to struct _ESelectNamesManager.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30481 ] 
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): initialize the select names dialog with the
-	default contacts folder.
-
-2002-09-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #28165, 29171 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(uris_listener): check to see if the value has really changed.
-	the way the preferences dialog works is such that we'll get called
-	when any of the Folder Options are changed (default folders,
-	offline stuff, etc.)  we really only want to tear down and build
-	back up the completion books if the autocomplete folder setting
-	changed.
-	(read_completion_books_from_db): cache the folder list, and call
-	load_completion_books.
-	(load_completion_books): new function, loads from the
-	cached_folder_list.
-	(e_select_names_manager_init): init cached_folder_list to NULL.
-	(e_select_names_manager_destroy): g_free (cached_folder_list).
-
-2002-09-20  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #30483 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): argh, contains => beginswith.
-
-2002-09-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item):
-	don't add the user creatable item for ldap-contact folders atm,
-	since it results in their being duplicate New Contact and New
-	Contact List menu items.
-
-2002-09-17  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/ldap-config.glade: Fix a typo.
-	
-2002-09-13  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #30250 ]
-	* backend/ebook/e-destination.c (e_destination_get_name): handle
-	"Unnamed Lists" here by setting their name to _("Unnamed List').
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (is_named): new
-	function, return TRUE if the name field is filled in.
-	(prompt_to_save_changes): return TRUE if the list isn't named
-	(meaning it's not saveable.)
-	(command_state_changed): saving requires a name.
-	(add_email_cb): always call command_state_changed.
-	(remove_entry_cb): same.
-	(list_name_changed_cb): same.
-	(visible_addrs_toggled_cb): same.
-	(table_drag_data_received_cb): same.
-
-2002-09-12  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): return
-	g_strdup("true"), not "true".
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): institute an arbitrary
-	minimum limit on the number of characters before we actually try
-	to autocomplete.  It's 3, btw.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes the other half of #17336 ]
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	parse the name when we're asked to set it, so the full name
-	doesn't get stored as (potentially) "Last, First" in the card.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes part of #17336 ]
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_init): get the window title from the
-	.glade file, and supply a suitable wm icon.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_init): same.
-
-2002-09-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #30208 ]
-	* gui/component/addressbook.c (load_uri_auth_cb): if the user
-	clicked cancel in the password dialog, let them off the hook and
-	bind anonymously.  Otherwise (if they failed to auth), prompt them
-	for the password again.
-	(addressbook_authenticate): new function, split out 99% of the
-	auth machinery here so it can be called multiple times.  Also,
-	call the callback with E_BOOK_STATUS_CANCELLED if the user clicked
-	the cancel button in the dialog.
-	(load_uri_cb): call addressbook_authenticate if the book has auth
-	enabled.
-	(addressbook_load_uri): use g_new0.
-
-2002-09-05  Anna Dirks  <anna@ximian.com>
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in : Changed the 
-	description of the Directory Servers page of the settings dialog 
-	to be a little less wordy {This page can be used to configure blah--> 
-	Configure blah.}
-
-
-2002-09-04  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #29904 ]
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): we need to activate
-	either a contact list editor or contact editor depending on if
-	it's a list (this screams for a utility function.)
-
-2002-09-04  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass FALSE to
-	evolution_storage_new: the Other Contacts storage doesn't support
-	shared folders.
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_destroy):
-	unref the "without", adapter, and model, then chain up the GnomeDialog
-	destroy function.
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Use
-	ldap-settings.png instead of evolution-contacts.png.
-
-2002-09-03  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29699 ]
-	* gui/component/addressbook-config.c
-	(addressbook_add_server_druid): call _set_source with a NULL
-	source to fill in dialog settings that are set from the option
-	menus (like the SSL setting).
-
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (delete_contact_cb): Fix typo
-	[`view>view' instead of `view->view'].  Also, cast to
-	GTK_WINDOW instead of GTK_WIDGET as it should be.
-
-2002-08-30  Dan Winship  <danw@ximian.com>
-
-	* backend/idl/addressbook.idl (CallStatus): add QueryRefused, for
-	when the backend refuses to perform a query. (part of #25782)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_convert_status): translate
-	GNOME_Evolution_Addressbook_BookViewListener_QueryRefused.
-
-	* gui/component/addressbook.c (search_result): Handle
-	E_BOOK_VIEW_STATUS_QUERY_REFUSED.
-
-2002-08-30  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #27923]
-	* backend/pas/pas-backend-summary.c: up the version to 4_0 (4000).
-	(pas_backend_summary_load_item): handle wants_html{_set}, list,
-	and list_show_addresses.
-	(pas_backend_summary_save_item): same.
-	(pas_backend_summary_add_card): same.
-	(pas_backend_summary_get_summary_vcard): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): call
-	evolution_shell_component_add_user_creatable_item twice here, once
-	for the "contacts" folder type, and once for "ldap-contacts".
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20347 ]
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): hook
-	up the backend_died signal.
-	(backend_died): new function, pop up an error dialog saying the
-	backend died.
-
-	* gui/widgets/e-addressbook-model.c (backend_died): new function,
-	emit the backend_died signal.
-	(e_addressbook_model_class_init): create the backend_died signal.
-	(e_addressbook_model_init): init backend_died_id
-	(e_addressbook_model_set_arg): disconnect the backend_died signal
-	from the old book and hook it up to the new book.
-
-	* gui/widgets/e-addressbook-model.h: add the backend_died signal.
-
-	* backend/ebook/e-book.c (backend_died_cb): new function, emit the
-	backend_died signal.
-	(e_book_do_response_open): create the component listener and hook
-	up the backend_died signal.
-	(e_book_destroy): disconnect the component listener and unref it.
-
-	* backend/ebook/e-book.h: add backend_died signal.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-card-sexp.c (is_helper): use strcasecmp
-	here, since all the other helpers use case insensitive
-	comparisons.
-
-	* backend/pas/pas-backend-summary.c (is_helper): same.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (category_ber): return NULL if
-	the list is empty.
-	(pas_backend_ldap_connect): always try to use ldapv3, not just
-	when we want to use tls.
-
-2002-08-29  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #25038 ]
-	* gui/contact-editor/Makefile.am (INCLUDES): need to have
-	EVOLUTION_ICONSDIR defined.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): same.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	set the window icon to the contact mini icon.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): set the window icon to the new
-	contact list icon.
-	
-	* gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the
-	prettier, imo) "contact-list-16.png"
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): spew
-	the filter we're using for the search.
-
-2002-08-28  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c : stop the
-	EBookViews before unreffing.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ oops, merged the .h and .glade file back to the HEAD from the
-	1-0 branch, but missed the .c file. ]
-	* gui/component/select-names/e-select-names.c (status_message): set
-	the status label's text.
-	(e_select_names_init): get the status message widget from the
-	glade ui.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #19286 ]
-	* gui/component/addressbook.c (delete_contact_cb): confirm
-	deletion of contacts when using the menubar or toolbar.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #28897 ]
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_clear_book_data): set book_data to NULL
-	after clearing/freeing the list.  fixes a crash.
-
-2002-08-28  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #20348 ]
-	* backend/pas/evolutionperson.schema: deprecate "categories" in
-	favor of "category".  evolution no longer uses "categories".
-
-	* backend/pas/pas-backend-ldap.c (category_populate): new
-	function, "category" is the new name, and it's multivalued so we
-	need the complex-prop stuff..
-	(category_ber): new function, same.
-	(category_compare): new function, same.
-
-	* gui/component/addressbook.c (addressbook_search_activated): the
-	text is "Category is" so we should use "is" instead of "contains"
-	for the query.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes #14835 ]
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search):
-	notify_complete with InvalidQuery if the parse fails.
-
-2002-08-27  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #26907 ]
-	* gui/component/addressbook.c (addressbook_search_activated): use
-	beginswith for email.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): change prototype
-	for complete_sequence to match sequence_complete.
-	(e_contact_print_button): same.
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #29446 ]
-	* gui/component/addressbook-config.c (scope_optionmenu_activated):
-	searching_modify_func can be NULL (since we don't require changes
-	to enable the "Next" button on this page when you create a
-	directory server.)
-
-2002-08-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes (almost certainly) #24649, #25494, #27351, and other LDAP search crashes ]
-	* backend/pas/pas-backend-ldap.c (view_destroy): use an EList
-	instead of a GList to store the book_view's so we don't have weird
-	issues with modifying the list while it's being traversed.
-	(find_book_view): same.
-	(create_card_handler): same.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same.
-	(poll_ldap): same, and also ref the book_view before calling
-	ldap_search_op_timeout (and therefore send_pending_adds).
-	(ldap_search_handler): same.
-	(ldap_op_add): warn about conflicting ldap msgid's (shouldn't ever
-	happen..)
-	(homephone_populate): make this a bit more robust (if values[0] ==
-	NULL, values[1] won't be valid).
-	(business_populate): same.
-	(build_card_from_entry): break out of the prop_info loop when we
-	get a match, and only set the simple field if the value != NULL.
-	(ldap_search_dtor): free all the pending adds stuff.
-	(pas_backend_ldap_process_get_book_view): g_list_prepend =>
-	e_list_append.
-	(pas_backend_ldap_remove_client): simplify the removing of the
-	book (use g_list_remove instead of searching and then using
-	g_list_remove_link.)
-	(pas_backend_ldap_destroy): unref the book_views list.
-	(pas_backend_ldap_init): initialize the EList for book_views.
-
-2002-08-25  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (remove_book_view): stop the
-	view before unref, in case the listener has pending events.
-
-2002-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): not sure what i was
-	thinking here... the EBook isn't valid if we couldn't open it, so
-	we can't turn around and query it for its capabilities.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add the
-	listener_id slot.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): store off the listener_id.
-	(e_select_names_manager_destroy): remove the bonobo listener -
-	fixes a crash when modifying the completion folders after you
-	bring up a compose window.
-	(e_select_names_manager_entry_new): another random timeout change
-	- make the completion at 100ms.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-view.c (pas_book_view_notify_complete):
-	take and pass the CallStatus to our listener.
-
-	* backend/pas/pas-book-view.h: change the prototype for
-	notify_complete to include the CallStatus.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): add the status arg.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): init the search_result signal.
-	(e_addressbook_view_init): connect to the model's search_result
-	signal.
-	(emit_search_result): emit our search_result signal.
-	(search_result): call emit_search_result.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add the search_result signal.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit both
-	a "search_result" as well as the "stop_state_changed" signal.
-	(e_addressbook_model_class_init): init the search_result signal.
-
-	* gui/widgets/e-addressbook-model.h: add search_result signal.
-
-	* gui/component/addressbook.c (search_result): pop up a dialog
-	telling the user why the search failed or was truncated.
-	(addressbook_factory_new_control): connect to the "search_result"
-	signal on the view.
-
-	* conduit/address-conduit.c (sequence_complete): add the status
-	parameter to sequence_complete.
-
-	* backend/idl/addressbook.idl: add BookViewListener_CallStatus,
-	and change notifySequenceComplete to take a CallStatus.
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): pass
-	status back in the notify_complete call.
-	(remove_card_handler): same.
-	(modify_card_modify_handler): same
-	(ldap_search_handler): same, and parse out the ldap return code so
-	we can report limits being properly.
-
-	* backend/pas/pas-backend-file.c (do_summary_query): pass status
-	back in the notify_complete call.
-	(pas_backend_file_search): same, and get rid of the
-	status_message, as the status is passed back properly.
-	(pas_backend_file_search): pass status
-	back in the notify_complete call.
-	(pas_backend_file_changes): same.
-	(pas_backend_file_process_create_card): same.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-
-	* backend/ebook/e-book-util.c (simple_query_sequence_complete_cb):
-	add status parameter.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_status_event): change name from
-	_queue_empty_event, and take a status arg.
-	(e_book_view_listener_queue_id_event): init resp->status (to
-	SUCCESS).
-	(e_book_view_listener_queue_sequence_event): same.
-	(e_book_view_listener_queue_message_event): same.
-	(impl_BookViewListener_notify_sequence_complete): call
-	queue_status_event, and convert the corba status to
-	EBookViewStatus.
-	(e_book_view_listener_convert_status): new function, conver the
-	corba status to EBookViewStatus.
-
-	* backend/ebook/e-book-view-listener.h: add a "status" slot to
-	EBookViewListenerResponse.
-
-	* backend/ebook/e-book-view.h: change prototype for
-	sequence_complete signal.
-
-	* backend/ebook/e-book-view.c (e_book_view_do_complete_event):
-	sequence_complete takes a parameter now (EBookViewStatus).
-	(e_book_view_class_init): add the enum arg to the signal.
-
-	* backend/ebook/e-book-types.h: add EBookViewStatus enum.
-
-2002-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): add
-	"cache-completions" here, since file completion results are
-	blanket cached (as they're generated from a summary).
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_cursor): there should be no search
-	limit on the get_cursor_request, as it's meant to match every card
-	it can.
-	(ldap_search_handler): parse the ldap result in the
-	RES_SEARCH_RESULT case.  we'll want more here soon, so we can
-	notify the front end if the result was truncated due to either the
-	size or time limit being exceeded.
-	(pas_backend_ldap_process_get_book_view): in the case of a
-	completion view, we hardcode (yeah yeah, i know, but really) the
-	search limit to MIN (100, user-specified-limit).
-	(pas_backend_ldap_search): each view has its own limit now,
-	defaulting from the user specified one for normal searches but
-	possibly different for completion views.  use the view's limit
-	here.
-
-2002-08-19  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): add an "addresses" property, to get the
-	"Dan Winship <danw@ximian.com>" form, as opposed to "text", which
-	gets you what's displayed, which might be just "Dan Winship".
-	(entry_set_property_fn): When setting, just reuse the "text" code,
-	since it should properly cardify everything for us anyway.
-	(impl_SelectNames_get_entry_for_section): Add the property.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fix c&p error that was
-	losing the ssl setting.
-
-2002-08-16  Iain <iain@ximian.com>
-
-	* backends/e-book/evolution-ldif-importer.c (ebook_create): Use the
-	default EBook instead of the local one.
-
-	* backends/e-book/evolution-vcard-importer.c (ebook_create): Ditto.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (book_view_notify_status): new
-	function to save a little typing.
-	(find_book_view): same.
-	(pas_backend_ldap_connect): reorder things a bit - set the version
-	to VERSION3 *before* doing TLS, as tls requires v3, and if we're
-	doing ldaps://, do tls a little differently (not sure if this is
-	strictly necessary, but the openldap source did it..  *shrug*).
-	also, guard the schema check as this function can be called
-	multiple times for the same server (if the server goes down or
-	times us out.)
-	(pas_backend_ldap_reconnect): new function, reconnect and if
-	necessary reauth the user.
-	(pas_backend_ldap_process_create_card): use
-	find_book_view/book_view_notify_status/pas_backend_ldap_reconnect.
-	(pas_backend_ldap_process_remove_card): same.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_get_vcard): same.
-	(pas_backend_ldap_process_get_cursor): same.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): reconnect if ldap_result returns -1.
-	(pas_backend_ldap_process_authenticate_user): ick ick ick save off
-	the dn/passwd we auth with so we can use them to reauthenticate.
-
-2002-08-16  Chris Toshok  <toshok@ximian.com>
-
-	[ fix 27333 ]
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_static_capabilities): "local" ->
-	"local,do-initial-query".
-
-	* gui/widgets/e-addressbook-model.c (get_view): "local" ->
-	"do-initial-query".
-
-	* gui/component/addressbook.c (book_open_cb): Only assume the
-	addressbook is local if "local" appears in its static
-	capabilities.  We still use the ldap special case, but be nicer to
-	other networked backends.
-
-2002-08-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	If invoked from a non-contact folder, add the contact to the
-	default contact folder, not the local one. If invoked from a
-	contact folder, don't append "addressbook.db" to the URI, let
-	ebook do the right thing. Fixes #28327 and #28325.
-
-	* backend/idl/addressbook.idl (CallStatus): Add NoSuchBook.
-	(Initially intended as part of a fix for #28327, but the other
-	changes make it so the error code never ends up getting used any
-	more, but it's still good to have.)
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Handle NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-types.h (EBookStatus): Add
-	E_BOOK_STATUS_NO_SUCH_BOOK.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add case for NoSuchBook.
-
-	* backend/ebook/e-book-util.c (e_book_load_local_address_book):
-	Kill this. Nothing should ever explicitly load the local
-	addressbook.
-	(e_book_use_default_book): Replaces e_book_use_local_address_book,
-	using the default book instead.
-	(e_book_default_book_open): Fall back to local contact folder on
-	E_BOOK_STATUS_NO_SUCH_BOOK too.
-	(e_book_query_address_default): Use default book, not local.
-
-	* gui/component/e-address-widget.c (query_idle_fn): Use the
-	default book, not the local book.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Use the default book, not the local book.
-
-	* backend/ebook/e-destination.c (e_destination_cardify): Use the
-	default book, not the local book.
-	(e_destination_touch): Query the default book, not the local book.
-
-	* backend/ebook/e-card-compare.c (e_card_locate_match,
-	e_card_locate_match_full): Use the default book, not the local
-	book.
-
-2002-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (pas_backend_summary_init):
-	initialize summary->upgraded to quiet valgrind.
-
-2002-08-06  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/test-client.c (TEST_VCARD): Use "\r" rather than
-	including literal CRs in the string, which confuses gcc on OS X.
-
-	* backend/ebook/test-card.c (TEST_VCARD): Likewise.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #25958 ]
-	* gui/component/addressbook.c (alphabet_state_changed): use
-	FULL_NAME in the case where we're untoggling a letter, and... well
-	use FULL_NAME in the other case too - we should never pop up the
-	advanced dialog.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): no more search_entry.
-
-	* gui/component/select-names/e-select-names.c (update_query): no
-	more search_entry, search_entry => select_entry, and add file_as
-	to the query since some entries don't have names (like the Ximian,
-	Inc. default card.)
-	(e_select_names_init): no more search_entry, and add an "activate"
-	handler on select_entry that updates the query.
-
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): remove folders and folders_by_uri, and the 2
-	listeners.
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): remove the hash_table_destroys of
-	folders and folders_by_uri, since they no longer exist.  same for
-	other_contacts_listener and local_listener.
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Use
-	"contact-list-16.png" for the "New Contact List" item.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Change
-	the order so that "New Contact" is first and "New Contact List" is
-	next.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): Pass
-	"contacts" as the @folder_type to
-	evolution_shell_component_add_user_creatable_item().
-
-2002-07-31  Chris Toshok  <toshok@ximian.com>
-
-	[ roll in the following change from the 1.0 branch.]
-	* backend/pas/pas-backend-ldap.c:
-	(prop_info): change the CALURI and FBURL ecard attributes to map to the
-	RFC 2739 specified attributes.
-        (check_schema_support): check to see if calEntry is supported.
-        (add_objectclass_mod): insert calEntry if it's supported.
-	* backend/pas/evolutionperson.schema: deprecate freeBusyURI
-	and calendarURI.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch by Jacob Berkman <jacob@ximian.com>, fixes #25968]
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't
-	double free protocol and query.
-
-2002-07-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (save_string): don't save
-	empty strings.
-	(pas_backend_summary_save): print out the errno when we fail.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Don't set up the ContactNew and
-	ContactNewList verbs.
-	(update_command_state): Don't set the sensitivity of
-	/commands/ContactNew and /commands/ContactNewList anymore.
-	(new_contact_cb): Removed.
-	(new_contact_list_cb): Removed.
-
-2002-07-24  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Change
-	libversit.la -> libversit.a for danw's changes.
-
-2002-07-24  Dan Winship  <danw@ximian.com>
-
-	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD):
-	s/libversit_lt/libversit/
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/Makefile.am: Split pas-backend-file and
-	pas-backend-ldap out of libpas and build them as separate (noinst)
-	libraries libpasfile.a and libpasldap.a. This gets the db3 and
-	LDAP dependencies out of libpas, and people trying to create an
-	addressbook backend shouldn't be calling functions from the
-	existing backends anyway so there's no reason to install them.
-
-2002-07-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove the option
-	menu and browse button, and add a custom widget placeholder for
-	the folder-selector.
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): move the "append /addressbook.db"
-	stuff here.
-	(e_addressbook_create_ebook_table): remove the code setting
-	initial uri from here.
-	(e_select_names_folder_free): gone.
-	(e_select_names_option_activated): gone.
-	(add_menu_item): gone.
-	(update_option_menu): gone.
-	(new_folder): gone.
-	(removed_folder): gone.
-	(folder_browse): gone.
-	(hookup_listner): gone.
-	(add_additional_select_names_uris): gone.
-	(e_select_names_hookup_listners): gone.
-	(e_addressbook_create_folder_selector): new function, create the
-	folder selector button.
-	(folder_selected): new function, callback for the folder selector.
-	just calls addresbook_model_set_uri.
-	(e_select_names_init): get the folder selector and initialize it
-	to show /local/Contacts.  also, set the model's uri here to the
-	same folder.  nuke the code involving the old option menu and
-	browse button.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/Makefile.am: Install libebook-static.la. 
-	Also change --all-static to -all-static, which is the right flag.
-	
-	* backend/pas/Makefile.am: Install the PAS headers in 
-	$(includedir)/evolution/pas. Install libpas.a
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (idl_DATA): Install the
-	SelectNames IDL and ancillary changes.
-
-2002-07-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (free_summary_item): free the
-	full_name (as well as given_name.  oops.)
-	(pas_backend_summary_new): new summaries are version 3.0 now.
-	(pas_backend_summary_load_item): all loaded summaries should be
-	3.0+, as we fail to load versions lower than that.
-	(pas_backend_summary_load_header): if the summary isn't version
-	3.0 fail out, as we need to rebuild the entire file to cache the
-	full_name fields.
-	(pas_backend_summary_save_item): save out the full_name.
-	(pas_backend_summary_add_card): put the item's full_name in the
-	card.
-
-2002-07-12  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Make the
-	ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST case not crash, although
-	there's still something wrong.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_start_query): e_book_get_book_view =>
-	e_book_get_completion_view, so the backends have the option of
-	using a pregenerated summary.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-summary.c (clear_items): actually remove
-	the items from the pointer array too, so an error while loading
-	doesn't leave the memory summary corrupted.
-	(pas_backend_summary_load_header): bleah, load the num_items and
-	summary_mtime in the right order :) Also, set upgraded to TRUE if
-	we loaded a v1.0 summary.
-	(pas_backend_summary_open): make this return a gboolean, return
-	TRUE if the summary is already open (priv->fp != NULL).  return
-	FALSE in error conditions.
-	(pas_backend_summary_load): if summary_open returns FALSE, return
-	FALSE, also set the dirty flag to FALSE after we load, and if the
-	summary was upgraded write it out.
-	(pas_backend_summary_save): update the in memory mtime to that of
-	the file when we save.
-	(summary_flush_func): if we're not dirty, do nothing and return.
-	(pas_backend_summary_is_up_to_date): make sure we've opened the
-	summary.
-	(pas_backend_summary_get_summary_vcard): fix compiler warning.
-
-2002-07-10  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book-view-listener.h: Oops, missed this one.
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Also
-	put addressbook.h here because several headers reference it.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* backend/ebook/e-book.h: Normalize includes to <ebook/foo.h>, so
-	that the installed headers will work sanely.
-
-	* backend/ebook/e-card-cursor.h:
-	* backend/ebook/e-book-view.h:
-	* backend/ebook/e-card-simple.h:
-	* backend/ebook/e-card.h:
-	* backend/ebook/e-destination.h: Same.
-
-	* printing/Makefile.am (INCLUDES): add -Iaddressbook/backend
-	to access the ebook headers. Also the builddir version to get
-	the generated addressbook.h
-
-	* conduit/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same builddir fix.
-
-	* gui/merging/e-card-merging.c: Fix an ebook #include.
-
-	* gui/merging/Makefile.am (INCLUDES): Same idea.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/contact-editor/Makefile.am (INCLUDES): Same builddir
-	change.
-
-2002-07-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	zero as the @sorting_priority to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.
-
-2002-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add Book.getCompletionView.
-
-	* backend/ebook/e-book.c (e_book_get_completion_view): new
-	function, basically c&p of e_book_get_book_view, but call
-	getCompletionView.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_get_completion_view.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_client_requests): add a
-	GetCompletionView case here that just calls the same code as
-	GetBookView (since we don't build summaries for the ldap backend.)
-
-	* backend/pas/pas-backend-file.c (do_summary_query): add
-	@completion_search.  If it's TRUE, just create the vcards from the
-	summary using pas_backend_summary_get_summary_vcard instead of
-	looking them up from the db.
-	(pas_backend_file_search): add @completion_search and pass it on
-	to do_summary_query.
-	(pas_backend_file_process_get_book_view): pass FALSE to
-	pas_backend_file_search.
-	(pas_backend_file_process_get_completion_view): new function,
-	basically c&p pas_backend_file_process_get_book_view, but pass
-	TRUE to pas_backend_file_search.
-	(pas_backend_file_process_client_requests): add a case for
-	GetCompletionView.
-	(pas_backend_file_load_uri): track the change to the summary api -
-	create the summary filename
-
-	* backend/pas/pas-book.c (pas_book_queue_get_completion_view): new
-	function, queue a GetCompletionView request to our queue.
-	(impl_GNOME_Evolution_Addressbook_Book_getCompletionView): new
-	function, call pas_book_queue_get_completion_view.
-	(pas_book_respond_get_completion_view): new function, just call
-	notifyViewRequested.
-	(pas_book_free_request): add a case for GetCompletionView.
-	(pas_book_get_epv): fill in epv->getCompletionView.
-
-	* backend/pas/pas-book.h: add a GetCompletionView PASOperation,
-	and a new structure (PASGetCompletionViewRequest).  Also, add
-	get_completion_view to PASRequest.
-
-	* backend/pas/pas-backend-summary.c (clear_items): remove the
-	items from the hash table.
-	(pas_backend_summary_new): db_path -> summary_path.
-	(pas_backend_summary_destroy): db_.path -> summary_path, and
-	destroy the hash table.
-	(pas_backend_summary_init): db_path = summary_path, and initialize
-	the id_to_item hashtable.
-	(pas_backend_summary_load_header): handle the upgrading from
-	version 1.0 to version 2.0 (the addition of an mtime field in the
-	header)
-	(pas_backend_summary_load_item): version 1.0 and 2.0 have the same
-	format for items.
-	(pas_backend_summary_open): new function.  open the summary so we
-	can load the header (and get the mtime).
-	(pas_backend_summary_load): rework this a bit since the header has
-	already been loaded, and also add the items to the hashtable.
-	(pas_backend_summary_add_card): add the new item to the hashtable.
-	(pas_backend_summary_remove_card): remove the item from the hash
-	table.
-	(pas_backend_summary_is_up_to_date): new function, chekc @t
-	against the summary's mtime.
-	(pas_backend_summary_get_summary_vcard): create a vcard from the
-	fields we have in the summary.
-
-	* backend/pas/pas-backend-summary.h: add prorotypes for
-	pas_backend_summary_is_up_to_date and
-	pas_backend_summary_get_summary_vcard.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	NULL @custom_icon_name to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Likewise.  [Note we could be
-	passing a nice custom here. ;-)]
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	arg @tooltip; pass it to
-	evolution_shell_component_add_user_creatable_item() [which now has
-	a @tooltip arg].
-
-2002-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-summary.[ch].
-
-	* backend/pas/pas-backend-file.c (string_to_dbt): move this to the
-	top of the file so it can be used in..
-	(build_summary): loop over the db, adding cards ot the summary.
-	(do_summary_query): call pas_backend_summary_search and loop over
-	the returned id's looking them up in the db.
-	(pas_backend_file_search): call
-	pas_backend_summary_is_summary_query, and either call
-	do_summary_query if it's a query over just the set of attributes
-	in the summary or use the old, slow method if not.
-	(pas_backend_file_process_create_card): call
-	pas_backend_summary_add_card.
-	(pas_backend_file_process_remove_card): call
-	pas_backend_summary_remove_card.
-	(pas_backend_file_process_modify_card): call remove_card/add_card.
-	(pas_backend_file_load_uri): try to load the summary file, and if
-	it doesn't exist create it.
-	(pas_backend_file_destroy): unref the summary.
-
-	* backend/pas/pas-backend-summary.[ch]: new files, reading and
-	writing (and querying) summaries.
-
-2002-06-27  Sean Atkinson  <sean@cantab.net>
-
-        * gui/component/addressbook-config.c (query_for_supported_bases):
-        don't unref selection_model (otherwise 3 clicks of
-        "Show Supported Bases" crashes if LDAP server isn't running).
-
-2002-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component):
-	reorder the adding of creatable items so the default is a new
-	contact, not a new contact list.
-
-2002-06-21  Sean Atkinson  <sean@cantab.net>
-
-	* gui/component/addressbook-config.c (addressbook_edit_server_dialog):
-	remove source argument (get it from the dialog).
-	(edit_source_clicked): same.
-	(sources_table_double_click): added to edit server by double-clicking.
-	(ldap_dialog_new): use sources_table_double_click.
-
-2002-06-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_save_as):
-	pass NULL to e_contact_list_save_as.  modality sucks.  fixes
-	broken build.
-	(save_as): same.
-
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #26130 ]
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb): pass
-	ce->app as parent_window.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(file_save_as_cb): same .
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_list_save_as):
-	if a parent_window is specified, the file selector should be
-	modal/transient for that window.
-	(e_contact_save_as): same.
-
-	* gui/contact-editor/e-contact-save-as.h: track prototype changes
-	(addition of GtkWindow *parent_window to both calls.)
-	
-2002-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_unbind_ext.
-	(create_card_handler): don't leak the new vcard.
-	(pas_backend_ldap_process_authenticate_user): don't leak the dn.
-
-2002-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): up the
-	max threshold to 3000 cards from 1000 cards.. seems to improve
-	performance a bit.  also remove the g_list_reverse since it
-	doesn't matter what order the cards arrive to the gui.
-	(pas_backend_file_changes): plug memory leaks.
-
-2002-06-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (compare_email_addresses): Made
-	"" compare as not equal to "" for addresses.
-	(use_common_book_cb): Don't bother checking for nickname here
-	since we don't use it as a match later.  Don't add "" as an
-	address to the list of query parts.
-
-2002-06-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Don't enable fields if the editor isn't editable and the
-	widget_field_mappings lists this field as being desensitize for
-	read only.
-
-2002-06-11  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #17332 ]
-	* backend/ebook/e-book.c (e_book_get_static_capabilities): we
-	shouldn't ever return NULL here.  in error cases we need to return
-	g_strdup("");
-
-2002-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): Made
-	double clicking on read only folders not do anything.
-
-2002-06-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_expand_uri): Made expand_uri
-	a bit more robust and readable.
-	(e_book_get_default_book_uri): Made e_book_get_default_book_uri
-	use e_book_expand_uri if using the bonobo_config value.
-
-	* gui/component/e-address-popup.c (start_query): Handle the
-	failure state here by acting as if there are no matches.
-
-2002-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Call
-	e_minicard_selected in the GDK_BUTTON_RELEASE case here.
-	(e_minicard_drag_begin): Set E_REFLOW (parent)->maybe_in_drag =
-	FALSE if it's an EReflow.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_book_ready): Commented out this unused
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(open_book_cb): Ref if we're keeping the book.  Don't unref if
-	we're not keeping the book.
-	(clean_cb): Commented out this unused function.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): Set the
-	title of our GalVIewCollection.
-
-2002-05-29  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Changed some spacing 
-	and expanding behavior to make this dialog behave more like I intended 
-	to. 
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (CONFIG_CONTROL_FACTORY_ID):
-	put this back in, accidentally got snipped with the hacking going
-	on in here.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ part of #25047 ]
-	* gui/component/addressbook-config.c: remove the autocompletion
-	config control from here, as it lives in the shell now.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: same.
-
-2002-05-24  Chris Toshok  <toshok@ximian.com>
-
-	[ #24189 ]
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): ifdef out the body of this because it only works
-	with a single completion book.  not sure what to do here, but it
-	doesn't impact most usage scenarios.
-	(completion_popup_cb): same.
-	(e_select_names_manager_entry_new): add the books that have been
-	loaded successfully by the time this entry is created.
-	(open_book_cb): add the opened book to the entries that have
-	already been created, and store it in our list so that entries
-	that are created in the future can catch up.
-	(read_completion_books_from_db): slurp in the folder list from the
-	config db and load all the uris.
-	(uris_listener): listener function - when there's a change it
-	calls _clear_books on all the created entries, and clears our
-	list.  It then re-reads the books from the db.
-	(e_select_names_manager_new): create our bonobo listener and call
-	read_completion_books_from_db.
-	(e_select_names_manager_init): init completion_books.
-	(e_select_names_manager_destroy): free our list of
-	completion_books.
-
-	* gui/component/select-names/e-select-names-manager.h: switch from
-	a single EBook to a GList of completion_books here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_add_book): deal with the case where
-	there's an active query (by effectively restarting it.)  This is
-	quite a contrived edge case.
-	(e_select_names_completion_clear_books): stop the current query
-	and clear our list of books.
-	(e_select_names_completion_new): track change to prototype, and
-	axe the majority of this method since an EBook* isn't passed
-	anymore.
-	(e_select_names_completion_clear_book_data): split this code out
-	from the destroy method so it can be called from _clear_books.
-
-	* gui/component/select-names/e-select-names-completion.h: the
-	constructor no longer takes an EBook -- pass in as many as you
-	want using _add_book.  Also, add prototype for _clear_books.
-
-	* gui/component/addressbook.c (load_uri_cb): when
-	storing/retrieving passwords, use the cleaned (without params)
-	version of the uri, so changing things like download limit don't
-	cause the user to be prompted for a password again.
-
-	* gui/component/addressbook-component.c
-	(ensure_completion_uris_exist): new function - probably doesn't
-	belong in this file.  Make sure the basic local Contacts folder
-	exists in the completion uris.
-	(addressbook_component_factory_init): call
-	ensure_completion_uris_exist.
-
-	* backend/ebook/e-book-util.h: add prototype for
-	e_book_get_default_book_uri.
-
-	* backend/ebook/e-book-util.c (e_book_get_default_book_uri): new
-	function, just return the default contacts uri.
-	(e_book_load_default_book): change
-	to use e_book_get_default_book_uri.
-
-2002-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_root_dse_query):
-	fix parameter/local variable overloading.
-
-2002-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (load_uri_cb): Don't try to invoke
-	e_book_get_uri() on NULL.  Fixes #25069.
-
-2002-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	make sure we map status -> string correctly (add missing strings).
-
-	* backend/ebook/e-book-types.h (EBookStatus): add the missing
-	AUTHENTICATION_REQUIRED status code, to map to the idl response.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): make sure we map all idl status
-	codes to EBookStatus statuses.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Pass
-	FALSE for @sync_offline to evolution_storage_new_folder().
-	(addressbook_storage_add_source): Pass FALSE for @sync_offline to
-	evolution_storage_new_folder().
-
-2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (request_quit): New, quit
-	handler for the EvolutionShellComponent.
-	(add_creatable_item): Set it up.
-
-	* gui/contact-editor/e-contact-list-editor.c
-	(e_contact_list_editor_request_close_all): New.
-	(e_contact_list_editor_new): Put the contact editor in a static
-	list and gtk_object_weakref() it.
-	(contact_list_editor_destroy_notify): New, GtkDestroyNotify
-	function for the contact editors.
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_request_close_all): New.
-	(e_contact_editor_new): Put the contact editor in a static list
-	and gtk_object_weakref() it.
-	(contact_editor_destroy_notify): New, GtkDestroyNotify function
-	for the contact editors.
-
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass
-	NULL as @request_quit_fn.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/idl/addressbook.idl: Removed an incorrect comment here.
-
-2002-05-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	Enable the dropdown widgets even if the contact is not editable so
-	that you can view any email address, phone number, or postal
-	address on read only contacts.
-
-2002-05-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added SimpleCard interface.
-
-	* gui/component/select-names/Makefile.am: Added
-	e-simple-card-bonobo.c and e-simple-card-bonobo.h.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added SIMPLE_CARD_LIST arg.
-
-	* gui/component/select-names/e-simple-card-bonobo.c,
-	gui/component/select-names/e-simple-card-bonobo.h: New class to
-	represent an ECardSimple across Bonobo.
-
-2002-05-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added "first_email" property.
-
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Pass %FALSE as
-	@has_shared_folders to evolution_storage_new().
-
-2002-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link against the libtool version of
-	libversit
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_control_new): oops, add the NULL back at the
-	end of possible_types.
-
-2002-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_ldap_init):
-	bleah, need to pass the GtkWindow here so we can pop up the a
-	modal parented dialog (gtk modal dialogs suck?).
-	(addressbook_ldap_auth): same.
-	(addressbook_root_dse_query): same.
-	(do_ldap_root_dse_query): same.
-	(addressbook_config_control_new): add "ldap-contacts" to the list
-	of possible types.
-
-2002-05-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder):
-	s/ldap_config/addressbook_config/
-
-2002-05-03  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): finally
-	remove the #if 0's and use the oaf query stuff to get backends
-	that handle specific protocols.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_folder_list_changed_callback): Call
-	evolution_config_control_changed when the EFolderList changes.
-
-2002-05-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Updated this
-	to have the ConfigControlFactory have an addressbookwide generic
-	name and added OAFIID:GNOME_Evolution_Addressbook_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES),
-	gui/component/addressbook-component.c,
-	gui/component/addressbook-storage.c, gui/component/addressbook.c:
-	Replaced ldap-config.c and ldap-config.h with addressbook-config.c
-	andaddressbook-config.h.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: Based on ldap-config.c and
-	ldap-config.h.  Added a folder list control.  Made this a multi
-	factory.
-
-	* gui/component/ldap-config.c, gui/component/ldap-config.h:
-	Replaced these with addressbook-config.c and addressbook-config.h.
-
-2002-05-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (selection_change):
-	Desensitize the to, cc, and bcc buttons if there's no selection
-	here.  Fixes Ximian bug #21482.
-
-2002-05-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (verbs): Changed
-	some of these to bind to the ContactListEditor verbs since they're
-	marked as that in the ui file.  Fixes Ximian bug #13034.
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): fix
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h
-	(e_addressbook_model_peek_card): Added this function so that there
-	would be less duplication of cards during run time when
-	duplication is unnecessary.
-
-	* gui/widgets/e-addressbook-view.c: Cleaned up get_card_list and a
-	number of associated functions to be much more uniform and
-	simpler.
-	(get_has_email_address): Don't show the "Send Message to Contact"
-	menu item if there are no email addresses in the listed contacts.
-	Fixes bug #1298.
-
-2002-04-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed this to set a
-	subject when sending a contact.  This makes the signature be set
-	properly also.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* printing/Makefile.am: Don't link to libibex anymore.
-
-	* conduit/Makefile.am: Same.
-
-	* backend/ebook/Makefile.am: Again here.
-
-	* gui/component/Makefile.am: And finally here.
-
-2002-04-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_child_free): Unref the text_model here instead of
-	the model, since the model never gets set.  Removed the model
-	field since it's no longer used.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/ldap-config.c: Updated this for the new
-	e_table_memory_store_insert function prototype.
-
-2002-04-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade (folder_browse):
-	Added a "Browse..." button to switch to a different addressbook
-	folder.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Moved extern EvolutionShellClient out of this function so that
-	it'd be more readable.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Coded handling of the
-	select_entry to search within the displayed contacts.
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to have an entry-select instead of an entry-find.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/select-names.glade: Updated this
-	dialog to match the redesign.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused
-	menu items disappear instead of graying out.
-
-2002-04-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h: Removed
-	e_addressbook_reflow_adapter_right_click and
-	e_addressbook_reflow_adapter_base_right_click.
-
-	* gui/widgets/e-addressbook-view.c: Handle right click menu for
-	both types of view.  Merged right click on white space with right
-	click on main area.  General clean up.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h: Removed a couple unnecessary
-	functions.  Added e_minicard_view_widget_get_view.  Added
-	right_click signal.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added the right_click signal and the e_minicard_view_get_card_list
-	function.
-
-2002-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.h: Removed an unused
-	variable here.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click,
-	table_white_space_event): Added a current view submenu to the
-	popup menu here.
-
-2002-04-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin):
-	Allow GDK_ACTION_COPY also, since the composer for example does
-	not accept MOVE's. Completes bug #8448.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.glade: change order of scope option
-	menu to match how it's stored.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: change ldap
-	config control text so it fits in the config dialog.
-
-	* gui/component/ldap-config.c: #ifdef lots of stuff HAVE_LDAP so
-	it'll build/run in either case.
-	(addressbook_source_dialog_destroy): rename
-	addressbook_add_server_druid_destroy to this, and free lots more
-	stuff.
-	(addressbook_add_server_druid):
-	addressbook_add_server_druid_destroy ->
-	addressbook_source_dialog_destroy.
-	(do_schema_query): add 3 second timeout to schema query.
-	(addressbook_edit_server_dialog): hook up destroy signal.
-	(config_control_new): if HAVE_LDAP isn't defined, put up a label
-	saying so.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add LDAP_CFLAGS to INCLUDES
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): no more
-	source->type.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/ldap-config.c (addressbook_dialog_get_source):
-	fill in source->ssl.
-	(addressbook_source_dialog_set_source): set up auth/scope/ssl
-	option menus properly.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_init_source_uri): always include the
-	limit/ssl in the uri so we don't need to rely on defaults
-	everywhere.
-	(ldap_source_foreach): store the ssl option.
-
-	* gui/component/addressbook-storage.h: reorder SSLType to match
-	the UI.
-
-	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)
-	add field for ldap_timeout.
-	(pas_backend_ldap_connect): reorder things a bit - we need to
-	start tls before the root dse query, if we can.
-	(pas_backend_ldap_load_uri): track the way ssl parameters are
-	given in the uri, and parse out the timeout.
-
-	* gui/component/ldap-config.c (port_changed_func): use the
-	symbolic SSL name instead of an integer constant.
-
-2002-04-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix
-	memory leaks.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the
-	Addressbook_ConfigControl stuff to LDAP_ConfigControl.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove addressbook-config.* and add ldap-config.*
-	(glade_DATA): same.
-	(evolution_addressbook_LDADD): add LDAP_LIBS.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	addressbook_config_register_factory =>
-	ldap_config_register_factory.
-
-	* gui/component/addressbook.c (book_open_cb): remove source->type
-	check - they're always LDAP.
-	(load_uri_cb): same.
-
-	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new
-	function.
-	(ldap_parse_ssl): new function.
-	(addressbook_storage_init_source_uri): use a more flexible scheme
-	to build up the uri's, and add in the ssl parameter.
-	(load_source_data): fill in source->ssl, and remove source->type
-	assignment.
-	(addressbook_source_copy): copy source->ssl, and remove
-	source->type copy.
-	(create_ldap_folder): addressbook_create_new_source =>
-	ldap_config_create_new_source.
-
-	* gui/component/addressbook-storage.h: remove
-	AddressbookSourceType (it was always LDAP), and add
-	AddressbookLDAPSSLType.
-
-2002-04-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Append
-	/addressbook.db to the end of the default URI if it starts with
-	file:
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
-	loop forever if you have more than one backend.
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Changed this to use
-	ECategoriesMasterListOptionMenu.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb),
-	gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-view.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Include
-	addressbook-config.h here as this file uses it.
-
-	* gui/component/select-names/e-select-names.c (SPEC, SPEC2): Made
-	this dialog searchable by typing in the ETable.
-
-	* gui/widgets/e-addressbook-model.c: Include e-addressbook-util.h
-	here.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Fixed a
-	memory leak here by using "selection-done" signal.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c,
-	gui/widgets/e-addressbook-reflow-adapter.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-view.c:
-	Added a right click menu for areas that aren't cards.
-
-2002-04-09  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-util.c (e_book_load_default_book): Update
-	for new-and-improved consistent default folder uri.
-
-	* gui/component/addressbook.c (addressbook_load_default_book): Use
-	e_book_load_default_book rather than duplicating most of its logic
-	here.
-	(load_uri_cb): Modify to work as a callback for
-	addressbook_load_default_book as well as addressbook_load_uri.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-component.c (create_view): Add
-	view_info arg, but don't do anything with it.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add
-	config_item:type
-
-2002-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: link to the static libversit
-
-2002-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
-	Update for evolution_shell_client_user_select_folder API change.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove AddressbookConfig,
-	ContactNew, ContactNewList EPixmap entries.
-
-	* gui/component/addressbook-factory.c (main): Print out a
-	debugging message just before the main loop starts, for debugging
-	purposes.
-
-2002-04-02  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Fix spelling of
-	E_CARD_SIMPLE_PHONE_ID_TTYTDD and E_CARD_SIMPLE_FIELD_PHONE_TTYTDD
-	(they previously ended with "TTD" instead of "TDD")
-
-	* backend/ebook/e-card-simple.c: Update for spelling fix.
-
-	* backend/pas/pas-backend-ldap.c: Likewise
-
-2002-04-01  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	parent_class should be static. (From Max Horn <max@quendi.de>)
-
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add priority
-	for the config page.  Renamed to "Directory Servers".
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): don't free req->vcard.
-	it's freed in pas_book_free_request.
-	(pas_backend_file_process_remove_card): don't free req->id for the
-	same reason.
-	(pas_backend_file_process_modify_card): don't free req->vcard for
-	the same reason.
-	(pas_backend_file_process_get_changes): don't free req->change_id
-	or release_unref the listener for the same reason.
-
-2002-03-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_schema_support): make sure
-	to call ldap_value_free (values);, and ldap_msgfree (resp).
-	(get_ldap_library_info): don't ask me why, but it appears we have
-	to free each extension char*.
-	(query_ldap_root_dse): make sure to free values in the
-	subschemaSubentry code before overwriting it, and call
-	ldap_msgfree(resp) when we're all done.
-	(build_card_from_entry): don't leak the DN, ldap attributes, or
-	the berval the ldap_*_attribute calls use to step through the
-	attributes.  the docs say this berval is freed when
-	ldap_next_attribute returns NULL, but if we don't free it it leaks
-	a substantial amount of memory.
-	(pas_backend_ldap_search): make sure to only allocate *op once,
-	and fix the g_warning since op isn't valid in its scope anymore.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/Makefile.am: Update for libversit change: Use .a
-	rather than .la now.
-
-	* printing/Makefile.am: Likewise
-
-	* gui/component/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_menu_activated):
-	Removed.
-	(addressbook_factory_new_control): Don't connect anymore, as this
-	signal has been removed from the ESearchBar.
-	(addressbook_factory_new_control): No more custom menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Update to
-	use new EPopupMenu API.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Update to use new
-	EPopupMenu API.
-
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): Update to match new EPopupMenu api.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove the
-	`addressbook_search_menu_items'.
-	(addressbook_menu_activated): Removed.
-	(addressbook_factory_new_control): Don't connect.  No menu items.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (control_activate): Call
-	`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
-	the search bar.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
-	for the LDAP sources configuration control.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Remove verb "AddressbookConfig".
-	(config_cb): Removed.
-
-	* gui/component/addressbook-config.c: Remove `dialog' member from
-	`AddresbookDialog'.  Instead, add a `config_control' member.
-	(config_control_new): New.
-	(addressbook_config): Removed.
-	(addressbook_config_register_factory): New.
-	(config_control_factory_fn): New, factory function for the
-	ConfigControl page.
-	(addressbook_source_edit_changed): Don't change the sensitivity of
-	the dialog.  Rather, invoke ::changed on the ConfigPage.
-	(auth_checkbutton_changed): No need to manually change the
-	sensitiviness of the buttons here either.
-	(add_source_clicked): Likewise, just invoke
-	evolution_config_control_changed().
-	(edit_source_clicked): Likewise.
-	(addressbook_dialog_close): Removed.
-	(config_control_destroy_callback): New, callback for when the
-	config control gets destroyed.
-	(addressbook_dialog_apply): Removed.
-	(config_control_apply_callback): New callback for
-	EvolutionConfigControl::apply.
-	(addressbook_dialog_ok): Removed.
-	(addressbook_config_control_new): Set up ->config_control and
-	connect the signals.
-
-	* gui/component/addressbook-config.glade: Call the main hbox in
-	the addressbook_sources dialog `addressbook_sources_main_hbox'.
-
-	* gui/component/addressbook-component.c (owner_set_cb): Call
-	`addresbook_config_register_factory'.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add items for
-	OAFIID:GNOME_Evolution_Addresbook_ConfigControl and
-	OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory.
-
-2002-03-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	change contains x-evolution-any-field to beginswith on email,
-	full_name, and nickname.  faster, and more applicable to this
-	dialog.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add TLSNotAvailable to
-	BookLister_CallStatus.
-
-	* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the
-	switch.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_static_capabilities): fix name.
-	(pas_backend_ldap_class_init): fix name.
-	(pas_backend_ldap_connect): change return type to CallStatus so we
-	can return different errors from here.  Also, do STARTTLS if the
-	user has asked for it and the connection supports it, returning
-	TLSNotAvailable (and close the connection) if they chose to
-	require it.
-	(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.
-	(func_beginswith): pull in change from evolution-1-0-branch to
-	make full_name beginswith search both cn and sn.
-
-2002-03-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): since I've
-	gone ahead and made the file backend (by way of
-	pas-backend-card-sexp.c) use case insensitive searches for
-	beginswith, there's no need to list upper and lower case here.
-
-	* gui/component/addressbook.c (addressbook_search_option_items):
-	reorder things to put "Any field contains" at the end, since it's
-	the least efficient search.  Also reorder the enum to the same
-	ordering.  Change "Name contains" to "Name begins with" and change
-	"Email contains" to "Email is".
-	(addressbook_search_activated): change FULL_NAME to beginswith,
-	and change EMAIL to is to match the labels.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_name): new
-	function, so we can compare both full and family names (so
-	beginswith can operate on them both.)
-	(endswith_helper): use e_utf8_strstrcase here, since all the
-	backends backends use case insensitive searching.
-	(func_endswith): same.
-
-2002-03-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_create_card): track
-	union/struct change.
-	(pas_book_queue_remove_card): same.
-	(pas_book_queue_modify_card): same.
-	(pas_book_queue_get_cursor): same.
-	(pas_book_queue_get_vcard): same.
-	(pas_book_queue_authenticate_user): same.
-	(pas_book_queue_get_book_view): same.
-	(pas_book_queue_get_changes): same.
-	(pas_book_free_request): new function - free everything we need to
-	for each type of request.
-	(pas_book_destroy): call pas_book_free_request here instead of
-	just freeing 3 elements of the old struct.  yay plugging memleaks.
-
-	* backend/pas/pas-book.h: make PASRequest a union and split out
-	members into structs, so it's a little clearer which fields are
-	used by which requests.  Also, add prototype for
-	pas_book_free_request so backends can just free everything at once
-	(usually in their requests_queued signal func.)
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): track struct/union change.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same.
-	(pas_backend_file_build_cards_list): same.
-	(pas_backend_file_process_get_vcard): same.
-	(pas_backend_file_process_get_cursor): same.
-	(pas_backend_file_process_get_book_view): same.
-	(pas_backend_file_process_get_changes): same.
-	(pas_backend_file_process_check_connection): same.
-	(pas_backend_file_process_authenticate_user): same.
-	(pas_backend_file_process_get_supported_fields): same.
-	(pas_backend_file_process_client_requests): case the union to the
-	specific struct and pass it to the process_* functions.  also,
-	call pas_book_free_request here, instead of relying on each of the
-	functions to free their stuff.
-
-2002-03-07  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): Update for
-	evolution_storage_new() change.
-
-2002-03-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): don't set "editable" here, as
-	the way things work the backend isn't able to override a setting
-	from the UI, so writable books never show up as writable.
-
-2002-03-04  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20871]
-	* gui/component/select-names/select-names.glade: add the
-	status-message label.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add status_message field.
-
-	* gui/component/select-names/e-select-names.c (status_message):
-	new function, set the label's text from the message.
-	(e_select_names_init): get the status-message label, and if it's
-	valid, connect to the status_message signal of the
-	EAddressbookModel.
-
-2002-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): don't
-	ref the view here, since it keeps the view alive until the search
-	is over, which we don't want.  we want the view's death to cancel
-	the search.  This speeds up starting new searches after one is
-	already active (since switching searches actually creates a new
-	book view and destroys the old one.)
-	(ldap_search_dtor): remove the matching unref here.  The unref as
-	it was was incorrect anyway, and caused a crash (we needed
-	search_op->view, not op->view.)
-
-2002-02-27  Chris Toshok  <toshok@ximian.com>
-
-	[fixes bug #20690]
-	* backend/pas/pas-backend-ldap.c (func_and): the data arg is not
-	GList** anymore, it's PASBackendLDAPSExpData*, so use
-	ldap_data->list instead of *list.
-	(func_or): same.
-	(func_not): same.
-	(func_contains): same.
-	(func_is): same.
-	(func_endswith): same.
-	(func_beginswith): same, but also special case the beginswith
-	"fileAs" query type (the one used by the alphabet buttons on the
-	right hand side, so we can deal with entries that don't have
-	fileAs attributes, and return meaningful responses.)
-	(pas_backend_ldap_build_query): initialize the
-	PASBackendLDAPSExpData struct and pass that instead of &list.
-	Also, take the PASBackendLDAP arg to add to the struct in case we
-	need it at some point in the future.
-	(ldap_search_handler): pass in the PASBackendLDAP.
-
-2002-02-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): move
-	card_count++ inside the if that checks to see if a card matches
-	(and adds the card to the list).
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): only
-	handle the ESB_ADVANCED case here now.  the actual query work is
-	done in addressbook_search_activated.
-	(addressbook_search_activated): split out all the searching
-	functionality here.
-	(addressbook_factory_new_control): hook up "search_activated" to
-	addressbook_search_activated.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): make the right auth page
-	start up open.
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	free the binddn.
-	(addressbook_source_copy): copy the binddn;
-
-2002-02-22  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs 20740, 16680, and god knows what else :) ]
-	* gui/widgets/e-addressbook-model.c (create_card): double the
-	allocated size every time we need more space instead of using a
-	fixed size increment.  this helps huge queries.  Also, remove the
-	gtk_object_get of "file_as", as it was dead code.
-	(book_view_loaded): handle errors here (by popping up a dialog).
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): search_idle ->
-	search_timeout.
-	(build_card_from_entry): comment out some spew, and unref ecard
-	when we're done to plug a memory leak.
-	(send_pending_adds): send along to the client all the cards we've
-	been saving up.
-	(poll_ldap): use a timeout for ldap_result to keep the backend
-	from blocking (and it turns out keep the frontend from hanging
-	waiting on a ref to complete) on large db's with few matches.
-
-	Also, add some fairly smart, self-tuning aggregating of cards.
-	Keep track of the number of cards we've sent the last time through
-	as well as this time, and estimate the number we want to aggregate
-	the next time based on them (we average them at the moment),
-	subject to maximum/minimum number of cards.  also, we have a
-	maximum aggregation time, after which we force a flush if there
-	are pending cards and recalculate our target pending number.
-	there's a minimum wait time to possibly keep outselves from
-	spamming the ui, although it's 0 at the moment.
-
-	Lastly, make sure to only notify the GUI of status messages when
-	we need to.  this results in a *huge* savings.
-	(ldap_search_handler): initialize all the pending card stuff, and
-	use a timeout instead of an idle function for poll_ldap.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): performance optimization
-	for large adds.  If we're a CardAddedEvent and there's an existing
-	CardAddedEvent at the end of the queue, just concat the lists of
-	cards together.  This is to keep the gui from falling further and
-	further behind the ldap backend, which is merrily spewing updates
-	at the gui.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/Makefile.am: Define $(iconsdir).
-
-	* gui/component/addressbook-component.c (add_creatable_item): New
-	helper function.
-	(create_component): Add the icons for the user creatable items as
-	well.
-
-2002-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):
-	track change to signature, and (for now) just change all the
-	return FALSE's to _RepositoryOffline (what FALSE used to map to in
-	pas_book_factory_process_request), and change TRUE to _Success.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri):
-	track change to signature, and differentiate between
-	pas_backend_ldap_connect failing (RepositoryOffline), and
-	ldap_url_parse failing (OtherError).
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): since pas_backend_load_uri
-	returns status now, use it to nodify the BookListener if there's a
-	failure.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): track change
-	to signature.
-
-	* backend/pas/pas-backend.h: change return type of
-	pas_backend_load_uri to
-	GNOME_Evolution_Addressbook_BookListener_CallStatus to allow
-	differentiation between failure types.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): handle _AUTHENTICATION_FAILED.
-
-	* backend/ebook/e-book-types.h (EBookStatus): add
-	_AUTHENTICATION_FAILED.
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): if the load_uri fails, notify
-	the listener that the repository is offline.  (partial fix for bug
-	20347)
-
-2002-02-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_dn_from_ecard): escape
-	commas in the dn, since they're used by ldap to specify the node's
-	placement in the tree. (fixes bug 20089)
-	(rfc2254_escape): just use sprintf and %02X instead.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Keep a
-	ref of the model in this case as well.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (set_book): Make
-	sure to only set the query once when creating a new book and not
-	at all on addressbook model creation.  This prevents an accidental
-	pair of changes from making the addressbook model load a remote
-	addressbook.
-
-	* gui/widgets/e-addressbook-model.c (get_view): If this is the
-	first_get_view and the addressbook is remote, empty the view
-	instead of leaving it in the state it used to be in.  This only
-	occurs if you set the book after the model has existed for a
-	while.
-	(e_addressbook_model_set_arg): When setting the book, set
-	first_get_view to TRUE.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach to the
-	emvw instead of the emv here.
-
-	* gui/widgets/e-minicard-view-widget.c, e-minicard-view-widget.h:
-	Made this object have a "column_width" argument and a
-	"column_width_changed" signal which are a simple layer down to the
-	EMinicardView contained within.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_attach): Made this attach to an
-	EMinicardViewWidget instead of a EMinicardView.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-util.c, backend/ebook/e-book-util.h
-	(e_book_expand_uri, e_book_load_address_book_by_uri,
-	e_book_use_address_book_by_uri): New functions that take a file://
-	url ending in the directory name and automatically append the
-	addressbook.db and do the appropriate thing.
-
-	* backend/pas/pas-backend-card-sexp.c,
-	backend/pas/pas-backend-card-sexp.h: Added copyright notice here.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/component/addressbook.c
-	(set_prop): Use e_book_expand_uri instead of
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-storage.c: Fixed the fcntl include
-	here.
-
-	* gui/component/addressbook.c (ContactsCopyToFolder,
-	ContactsMoveToFolder): Added handlers for these two verbs.
-
-	* gui/component/addressbook.h: Removed addressbook_expand_uri in
-	favor of e_book_expand_uri.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (transfer_cards):
-	Added code to handle Move to and Copy to right click menu items.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h (e_addressbook_transfer_cards):
-	New function to pop up a dialog and transfer a set of cards to the
-	given folder.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (display_view): Don't attach to
-	the view if it doesn't exist yet.  We have to make this then
-	attach later.
-	(e_addressbook_view_copy_to_folder,
-	e_addressbook_view_move_to_folder): New functions utilizing
-	e_addressbook_transfer_cards.
-	(table_right_click): Add copy_to_folder and move_to_folder to the
-	right click menu for tables here.
-	(e_addressbook_view_discard_menus): Handle menu unmerging here.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): Removed unused field.
-
-2002-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Attach the
-	GalViewMinicard to the EMinicardView here.
-
-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h
-	(gal_view_minicard_load, gal_view_minicard_save): Made these save
-	the column width of the view.
-	(gal_view_minicard_attach, gal_view_minicard_detach): Added these
-	functions to allow the GalViewMinicard to set the column width of
-	a EMinicardView and to monitor its changes.
-
-2002-02-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_get_arg): Added an argument to get the model.
-
-	* gui/widgets/e-addressbook-view.c (writable_status): Don't bother
-	connecting to the writable_status callback on the book, simply
-	rely on the writable_status callback on the addressbook model.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h
-	(set_empty_message): Handle the case of a read only view here.
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): remove
-	"New" from user creatable menu items
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_setup_menus): Changed this function to use the
-	new GalViewMenus which takes a GalViewInstance, instead of a
-	GalViewCollection.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (find_address_mailing): tidy
-
-	* conduit/address-conduit.c (addrconduit_load_configuration): load
-	default address setting
-	(addrconduit_save_configuration): save default address setting
-	(e_addr_gui_new): new gui routine for conduit settings
-	(e_addr_gui_fill_widgets): ditto
-	(e_addr_gui_fill_config): ditto
-	(e_addr_gui_destroy): ditto
-	(e_addr_context_destroy): destroy the gui and new_cfg
-	(local_record_from_ecard): reinstate commented out bits, determine
-	which address to sync to pilot
-	(ecard_from_remote_record): determine which address to sync from
-	pilot
-	(fill_widgets): put the gui widgets in
-	(create_settings_window): create gui
-	(save_settings): fill gui
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/contact-editor/e-contact-editor.c (address_text_changed): if
-	the shown address in the mailing address or there is no mailing
-	address, set the default flag and make sure the button is checked
-	(address_mailing_changed): set the flags properly when the mailing
-	address changes
-	(e_contact_editor_init): listen for the check button being toggled
-	(find_address_mailing): find the address (if any) with the default
-	flag
-	(set_address_field): set the mailing address button appropriately
-	(fill_in_info): find the mailing address
-
-	* gui/contact-editor/e-contact-editor.h: add new class data member
-
-	* gui/contact-editor/contact-editor.glade: show mailing address
-	check button
-
-2002-02-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_auto_recipient):
-	New function to find out if a destination was one which was
-	auto-matically set by Evolution.
-	(e_destination_set_auto_recipient): Set whether or not the dest is
-	an auto-recipient.
-	(e_destination_touch): Don't touch the address if it is an
-	auto_recipient.
-	(e_destination_list_to_vector_sized): New function to avoid having
-	to calculate the length of the list ourselves. Allows for a bit of
-	optimization if our caller knows the length of the list.
-	(e_destination_xml_encode): Encode the auto_recipient bit.
-	(e_destination_xml_decode): Decode the auto_recipient bit.
-
-2002-02-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card): Made
-	this preserve addressbook flags other than the first three.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_ADDR_MASK and
-	E_CARD_ADDR_DEFAULT.
-
-	* backend/ebook/e-card.c (get_address_flags): Added "PREF" to
-	E_CARD_ADDR_DEFAULT mapping.
-
-	* backend/ebook/test-client.c: Added #include "e-book-util.h".
-
-2002-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes):
-	compute the change db filename based on our contact db filename.
-	(pas_backend_file_load_uri): store the filename in
-	bf->priv->filename.
-	(pas_backend_file_destroy): free the filename, and (!) free
-	bf->priv too.
-
-2002-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Revert
-	my previous change as trow says this will break auto-completion
-	stuff.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.
-	* gui/contact-list-editor/Makefile.am: Likewise.
-	* gui/merging/Makefile.am: Likewise.
-	* gui/search/Makefile.am: Likewise.
-	* gui/component/select-names/Makefile.am: Likewise.
-
-2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): Don't
-	check for an @ in the email address. This is to fix bug #10960.
-
-2002-01-24  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 16097 ]
-	* gui/component/addressbook-config.glade: gui love for the new
-	auth stuff.
-	
-	* gui/component/addressbook.c (load_uri_cb): track change to auth,
-	and offer up different prompt strings depending on which method
-	(binddn or email) we're using.
-	
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the
-	new auth types for ldap.
-	(ldap_parse_auth): same.
-	(addressbook_storage_auth_type_to_string): new function.
-	(load_source_data): get the binddn too.
-	(ldap_source_foreach): store out binddn or emailaddr, depending on
-	the auth type chosen.
-
-	* gui/component/addressbook-storage.h: add the more detailed auth
-	types, add "binddn" to the source structure, and add a prototype
-	for addressbook_storage_auth_type_to_string.
-	
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	set the auth stuff  (in)sensitive.
-	(auth_optionmenu_activated): new function.
-	(addressbook_source_dialog_set_source): track UI change.
-	(addressbook_source_dialog_get_source): same.
-	(add_scope_activate_cb): rename add_activate_cb to this to
-	distinguish it from the auth stuff.
-	(add_auth_activate_cb): new function.
-	(addressbook_source_dialog): track change to auth UI stuff.
-	(addressbook_storage_auth_type_to_string): new function.
-
-	* backend/ebook/e-book.h: add auth_method arg to
-	e_book_authenticate_user.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): track change
-	to prototype - add auth_method arg, and pass it along to the CORBA
-	call.
-
-	* backend/ebook/test-client.c (book_open_cb): track api change -
-	keep this building.
-
-	* backend/pas/pas-book.h: add auth_method slot in PASRequest.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add
-	auth_method arg and add it to the PASRequest.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track
-	idl change, add auth_method and pass it along to
-	pas_book_queue_authenticate_user.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): support both
-	"ldap/simple-email" and "ldap/simple-binddn" auth methods.
-
-	* backend/idl/addressbook.idl: add "in string authMethod" to
-	authenticateUser.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
-	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
-
-	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
-	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
-	* backend/pas/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* printing/Makefile.am: Likewise.
-	* backend/ebook/Makefile.am: Likewise.
-	* gui/widgets/Makefile.am (INCLUDES): Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (create_component): Pass a
-	NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: #include
-	<locale.h>.
-
-2002-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug # 16864 ]
-	* backend/ebook/evolution-ldif-importer.c (getValue): create and
-	return a GString here, instead of writing to a fixed size buffer.
-	(parseLine): use a GString here instead of a fixed size buffer.
-
-2002-01-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_search_handler): Set the
-	number of cards to return to the value specified in the ldap uri,
-	leaving the default at 100.  Fixes Ximian bug #13953.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog),
-	gui/component/addressbook-config.glade: Added a limit entry here
-	to edit the limit field of the source.
-
-	* gui/component/addressbook-storage.c,
-	gui/component/addressbook-storage.h
-	(addressbook_storage_init_source_uri): Added a limit field to this
-	class and pass that value through in the uri that's generated.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Made username match with no
-	domain match be vague instead of partial.  Fixes Ximian bug
-	#13612.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (view_contact_cb): New verb to open
-	a bunch of cards.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): Call
-	e_addressbook_show_multiple_cards instead of doing this ourselves.
-
-	* gui/widgets/e-addressbook-util.c,
-	gui/widgets/e-addressbook-util.h
-	(e_addressbook_show_multiple_cards): Added this function to show a
-	bunch of cards, including a dialog if lots of windows are going to
-	appear.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_view,
-	e_addressbook_view_can_view): e_addressbook_view_view calls
-	e_addressbook_show_multiple_cards on the appropriate list of
-	cards.
-
-2002-01-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(fill_in_countries), gui/contact-editor/fulladdr.glade: Sort
-	country list.  Country list moves from fulladdr.glade to
-	e-contact-editor-address.c, but only a few country names have
-	actually changed.  Fixes Ximian bug #16545.
-
-2001-12-20  Zbigniew Chyla  <cyba@gnome.pl>
-
-	Fixes #17725
-
-	* evolution/addressbook/printing/e-contact-print.c (complete_sequence):
-	Do not assume that the first byte of file_as is the first letter, use
-	utf8 functions instead.
-
-2002-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: move all functions here, get rid of
-	header files, use e-pilot-settings to display gui
-
-2002-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/select-names/select-names.glade: remove misleading
-	title and fix spacing
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (alphabet_state_changed): Handle
-	setting the search bar to "Advanced..." when the alphabet buttons
-	are pushed and back when they're cleared.  Fixes Ximian bug
-	#12904.
-	(addressbook_menu_activated): When the user calls Search->clear,
-	set the search to ESB_ANY and "", don't just set the text.  This
-	is especially useful when it's set to ESB_ADVANCED.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (alphabet_state_change): Added
-	this signal which gets emitted when the alphabet buttons are
-	pushed.
-	(command_state_change): Removed the ref pair here.  It's not
-	necessary.  gtk_signal_emit refs the object itself.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (name_synonyms): Added a couple
-	of names here.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_get_nth_obj): Removed an unused
-	variable.
-
-2002-01-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (create_alphabet): Use toggle
-	buttons here.  Fixes Ximian bug #10734.
-
-2002-01-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_fields): Choose the
-	first filled in address field here.  Fixes Ximian bug #2222.
-
-2002-01-03  Joe Shaw  <joe@ximian.com>
-
-	* backend/ebook/test-card.c: Add a test for getting arbitrary
-        fields.
-
-	* backend/pas/pas-backend-card-sexp.c (compare_arbitrary): Added.
-	(prop_info_table): Add a LIST_PROP for arbitrary fields.
-
-2002-01-03  Nat Friedman  <nat@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Free the
-	query if the oaf response is of zero length.
-
-2001-12-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): When we clean, don't clean the model's last
-	element.  This helps keep things working properly when we have
-	signal-character separators.
-	(section_right_click_cb): Changed to work properly with our
-	EText-emitted popup signal.
-	(e_select_names_add_section): Use ETexts for the recipient
-	sections, rather than tables.  This lets us make them directly
-	editable. (Bug #1721)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_new): Pass in a ESelectNamesTextModel, not a
-	ESelectNamesModel.
-	(e_select_names_popup): Adjust for the new signature for
-	e_select_names_model_text_pos.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Schedule a cleaning when we focus out.
-	(focus_in_cb): Cancel pending cleaning when we get focus.  This
-	helps us avoid bad things happening during the fast focus out/ins
-	that happen when the completion dropdown appears.
-	(completion_handler): Adjust for new signatures of
-	e_select_names_model_text_pos and e_select_names_model_name_pos.
-	(e_select_names_manager_entry_new): Pass in our
-	ESelectNamesTextModel when constructing the
-	ESelectNamesCompletion.
-	(e_select_names_manager_entry_free): Cancel any pending clean-ups.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the text off of the text model.
-	Which is the only way that really makes sense when you think about
-	it.
-
-	* gui/component/select-names/e-select-names-completion.c: Added a
-	copy of the associated ESelectNamesTextModel to
-	ESelectNamesCompletionPrivate.  This replaces the
-	ESelectNamesModel.
-	(e_select_names_completion_destroy): Unref ->text_model.
-	(e_select_names_completion_handle_request): Pass in our text
-	model's separator info when calling e_select_names_model_text_pos.
-	(e_select_names_completion_new): Pass in the text model as an arg
-	instead of the model, and ref it as needed.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_init): Set separator as either ", " or
-	",", depending on the value of the EVOLUTION_DISABLE_MAGIC_COMMA
-	environment variable.
-	(e_select_names_text_model_destroy): Free the separator.
-	(changed_cb): Flush our cached text on changed.
-	(e_select_names_text_model_set_source): Use our own changed_cb
-	callback on changed, rather than just connecting up
-	e_text_model_changed.
-	(e_select_names_text_model_set_separator): Added.  Lets the
-	separator between recipients be specified.
-	(e_select_names_text_model_get_text): Cache the text we get from
-	calling e_select_names_model_get_textification.
-	(e_select_names_text_model_insert_length): A bunch of small
-	changes to properly support generic separators, rather than
-	(implicit and explicitly) assuming ", ".
-	(e_select_names_text_model_delete): More small tweaks to handle
-	generic separators.
-	(e_select_names_text_model_get_nth_obj): Use new signature when
-	calling e_select_names_model_name_pos, and use our cached text.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_destroy): We don't cache the text or
-	addr_text anymore, so no need to free them here.
-	(e_select_names_model_changed): ...and no need to reset our text
-	and addr_text caches here.
-	(e_select_names_model_get_textification): Take a separator as an
-	arg, rather than just using ", ".  Also, no caching.
-	(e_select_names_model_get_address_text): Take a separator as an
-	arg, rather than just using ", ".  And no caching here either.
-	(e_select_names_model_clean): Add arg that give us control over
-	whether or not the last entry should get cleaned.  We need this
-	when using a one-character separator, so that new destinations
-	that get tacked onto the end don't get immediately cleaned away
-	for being empty.
-	(e_select_names_model_name_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-	(e_select_names_model_text_pos): Take the separator length as an
-	argument, remove implicit assumption of length 2.
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/component/addressbook-factory.c (main): Push GdkRGB visual
-	and colormap.
-
-2001-12-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Add cut/copy/paste to
-	right-click menu.
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): Add
-	cut/copy/paste to right-click menu.  (Fixes bug #14528.)  Also,
-	disable some right-click options if our addressbook isn't
-	editable.
-
-2001-12-18  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (check_for_slow_setting): go slow and
-	clear the map if the last uri and the current uri do not match
-	(post_sync): save the last uri
-
-	* conduits/address-conduit-config.h: handle a last uri config
-	option
-
-2001-12-18  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_default_book_open):
-	change this to match its e-book counterpart, and only failover to
-	the local addressbook if the protocol wasn't supported.  that way
-	errors like "failure to connect" are still reported to the user.
-
-	* backend/ebook/e-book-util.h: add prototypes for
-	e_book_load_default_book and e_book_get_config_database.
-
-	* backend/ebook/e-book-util.c (e_book_default_book_open): new
-	function, basically cut and paste addressbook_default_book_open
-	from addressbook.c here.
-	(e_book_load_default_book): cut and past
-	addressbook_load_default_book here, pretty much, except leave off
-	the auth stuff.
-	(e_book_get_config_database): new function, returns the
-	Bonobo_ConfigDatabase for e_book_load_default_book to use.
-
-	* conduit/address-conduit.c (start_addressbook_server): use
-	e_book_load_default_book here.
-	
-2001-12-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug 17355 ]
-	* gui/component/select-names/e-select-names.c (new_folder): if
-	we're dealing with an LDAP folder, prepend [LDAP] to it.  Now that
-	we have 3 different places where folders are coming from, it helps
-	to be able to differentiate "Contacts" in ~/evolution and a
-	"Contacts" ldap server and a "Contacts" exchange folder.
-	(add_additional_select_names_uris): loop through the bonobo conf
-	settings for additional folders, adding them to the option menu.
-	(e_select_names_hookup_shell_listeners): call
-	add_additional_select_names_uris.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
- 
- 	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_realize): Use an #ECanvasBackground here
-	instead of a #GnomeCanvasRect.
- 
-2001-12-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Added
-	'cache_complete' flag to ESelectNamesCompletionPrivate.
-	(e_select_names_completion_seq_complete_cb): Set cache_complete
-	to TRUE if our query wasn't interrupted.
-	(e_select_names_completion_start_query): Set cache_complete to
-	FALSE at the beginning of a potentially-cached query.
-	(e_select_names_completion_do_query): Only reuse cached cards
-	if cache_complete is TRUE.  (Fixes bug #10241)
-
-2001-12-15  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (e_addr_context_destroy): don't free
- 	the hash table keys, we didn't allocate them and free the change
- 	objects and unref the associated cards
- 	(local_record_from_uid): unref the temp card we create
- 	(replace_record): ref the new card associated with the card change
- 	and unref the old one
-
-2001-12-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure
- 	to copy the custom fields so they are not overwritten
-
-2001-12-13  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_new): Used
-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.
-	(Bug #17126)
-
-2001-12-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): Remove a reference to code
-	I don't want to commit yet. :-)
-
-	* gui/component/select-names/e-select-names-manager.c: Extensively
-	refactored -- this code had gotten _really_ ugly.  Untangle things
-	to the point where our reference counting problems are fixable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove all of the ugly hacks to work around our
-	memory management problems, and just unref the manager.
-	(Fixes #14412)
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(search_for_dn_with_objectclasses): move search_for_dn's contents
-	here, and add an "existing_objectclasses" parameter that we pass
-	on to build_card_from_entry.
-	(search_for_dn): call search_for_dn_with_objectclasses with NULL
-	for existing_objectclasses.
-	(build_card_from_entry): if existing_objectclasses is non-NULL,
-	fill it in with the list of existing objectclass values for this
-	entry.
-	(add_objectclass_mod): if existing_objectclasses is non-NULL,
-	meaning we're modifying an entry, search in the existing
-	objectclasses for the ones we want to be there, and only add
-	what's missing.  If none are missing, don't add objectclass_mod to
-	the list of mods.
-	(create_card_handler): track change to add_objectclass_mod (pass
-	NULL).
-	(modify_card_handler): use search_for_dn_with_objectclasses
-	instead of search_for_dn, and pass the existing objectclasses to
-	add_objectclass_mod.  also, free the list when we're done.
-	(poll_ldap): track change to build_card_from_entry (pass NULL).
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	we need to be able to disable non-labels here as well.  since
-	we're using enable_widget and not gtk_widget_set_sensitive, it's
-	okay to handle entries/text's, etc, here.
-	(widget_field_mappings): add label-caluri and label-fburl here.
-
-	* gui/contact-editor/contact-editor.glade: change the label names
-	for the freebusy/calendar urls to have more descriptive names,
-	since we use them in e-contact-editor.c now.
-
-	* backend/pas/pas-backend-ldap.c: add support for
-	caluri/calendarURI, fburl/freeBusyURI.
-
-	* backend/pas/evolutionperson.schema: add calendarURI and
-	freeBusyURI.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Fixed up the
-	accelerators and such here.
-
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
-	Translate this string.
-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
-	(setup_tab_order): Fixed up the tab order here.
-
-	* gui/contact-editor/fulladdr.glade: Made the country combo
-	focusable here.
-
-2001-12-03  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_equal): Make address
-	comparisons case-insensitive. (Fixes 11776)
-
-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address
-	host comparisons case-insensitive. (Fixes 11776)
-
-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
-	ESelectNamesModel on focus-out. (Half of a fix for 15656)
-
-	* backend/ebook/e-destination.c (nonempty): Fix this function
-	and make it utf8-safe. (The other half of the fix for 15656)
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency
-	fixes with standard contact editor.  Added Save As, Send As, and
-	Send To.  Replaced Save toolbar with Save and Close and added Save
-	and Close menu item.  Added a trash icon.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
-	Setup the tab order here.  Fixes Ximian bug #13751.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (connect_master_list_changed,
-	make_suboptions): Changed how this list of categories gets
-	computed.  Fixes Ximian bugs #7707 and #7708.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,
-	e_contact_rectangle, e_contact_print_letter_tab,
-	e_contact_print_letter_heading, e_contact_get_card_size,
-	e_contact_print_card, e_contact_print_phone_list):
-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/
-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/
-
-2001-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against
-	LDAP_SUCCESS as the return value, not -1.
-	(pas_backend_ldap_build_all_cards_list): same.
-	(pas_backend_ldap_process_authenticate_user): same.
-
-2001-11-12  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14843 ]
-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a
-	subexpression wasn't filled in.
-
-	* backend/pas/pas-backend-ldap.c (func_or): same.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	Release callback's reference to EContactListEditor.
-	(list_modified_cb): Release callback's reference to
-	EContactListEditor.
-	(save_card): Ref the EContactListEditor on behalf of the
-	e_book_foo callback. (Fixes bug #14743)
-	(save_card): Set changed to false once we've saved.
-	(list_deleted_cb): Release callback's reference.
-	(delete_cb): Hold reference for the callback.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If
-	our call to e_categories_new returns NULL, put up an error dialog
-	and return.  (Fixed #14780)
-		
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14687 ]
-	* backend/pas/pas-backend-file.c
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): do load_uri before add_client,
-	so we know if the load actually worked (add_client uses this
-	information to respond to the new client.)  before this change,
-	the client would still think the book was in a useful state even
-	if the load_uri failed.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if
-	the we're not connected, say so.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	same.
-	(pas_backend_file_load_uri): don't report_writable here,
-	add_client does it.  was only needed before because of the
-	improper ordering in pas-book-factory.c above.
-
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14646 ]
-	* gui/component/addressbook.c (addressbook_default_book_open): new
-	function.  if the default_book failed to load, load the local
-	addressbook in its place.
-	addressbook_load_default_book): if we're loading the default_book
-	uri, use addressbook_default_book_open as the open_response.
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the
-	load_state to NotLoaded so we can attempt another load_uri on
-	the book if it fails.
-
-2001-11-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Explicitly destroy entries.  Part of the fix for
-	the lingering completion window bug.
-
-2001-11-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: Use ordering of the pilot's phone
-	label list to find fields we sync in order to avoid strcmp'ing the
-	pilot's labels rendering phone syncing usable only for english
-	language pilots
-
-2001-11-03  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14410 ]
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	init in_async_call to FALSE.
-	(card_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(card_modified_cb): same.
-	(card_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add in_async_call flag for when we make a wombat call and need to
-	disable the UI.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init in_async_call to FALSE.
-	(list_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(list_modified_cb): same.
-	(list_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add in_async_call flag for when we make a
-	wombat call and need to disable the UI.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for
-	NULL dates before converting them to strings.  Fixes Ximian bug
-	#14394.
-
-2001-11-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Leak select-names related data structures until
-	the memory management issues get sorted out.  Fixed bug #14086.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes
-	and changes match here.
-
-2001-10-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): Check that local_listener and
-	other_contacts_listener are non-NULL before
-	disconnecting/unrefing.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(entry_destroyed): The entry shouldn't unref the manager.
-	(e_select_names_manager_create_entry): The entry shouldn't hold a
-	ref to the manager.  It becomes circular.
-	(e_select_names_manager_create_entry): On the other hand, we
-	should hold a ref to the entry we create.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove the explicit dialog destroy hack.
-
-2001-10-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Force the select names dialog to be destroyed.
-	This is a hack to fix bug #14002 -- I'll clean up the refcounting
-	issues post-freeze.  At least now it won't crash.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): make sure
-	to translate the character sets of the names
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(manager_ok_cb): send a null bonobo arg to prevent explosion
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/widgets/e-addressbook-view.c: correct include typo
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!
-	
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): Convert xml-ified destinations into proper
-	addresses.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/component/select-names/e-select-names-bonobo.c (init):
-	Connect to manager's "ok" signal.
-	(manager_ok_cb): Emit "ok" bonobo-signal.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added "ok" signal.
-	(e_select_names_clicked): Emit 'ok' signal.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): new function, a "Do you want
-	to save changes?" dialog.
-
-	* gui/widgets/e-addressbook-util.h: add prototype for
-	e_addressbook_prompt_save_dialog.
-
-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):
-	call e_addressbook_prompt_save_dialog and save the card if they
-	select save.  return TRUE if the dialog should be closed, FALSE
-	otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog
-	and save the card if they select save.  return TRUE if the dialog
-	should be closed, FALSE otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload
-	this function for modifying objectclasses too, so we can make sure
-	evolutionPerson shows up in the objectclasses of an entry if it
-	shows up in the schema for the server.
-	(create_card_handler): add @replace = FALSE in the call to
-	add_objectclass_mod.
-	(modify_card_handler): call add_objectclass_mod with @replace =
-	TRUE.
-	(anniversary_compare): fix typo - return "equal", not "TRUE".
-	(birthday_compare): same.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* conduit/address-conduit.c (pre_sync): Comment out spew.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	Comment out spew.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): Comment out spew.
-	(get_dnd_selection): Comment out spew.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): Comment out spew.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): Check that
-	our BonoboUIComponent has a container so we don't get a lot of
-	annoying debug spew.
-
-	* printing/smallbook.ecps: Fixed fonts.
-
-	* printing/phonelist.ecps: Fixed fonts.
-
-	* printing/medbook.ecps: Fixed fonts.
-
-	* printing/e-contact-print.c (e_contact_get_card_size): Commented
-	out spew.
-
-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard->card
-	!= NULL.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): We were using
-	book_data->book_view immediately after unrefing it.  Reordered the
-	code a bit to avoid this.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.h: add prototype for
-	pas_book_factory_dump_active_backends.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_dump_active_backends): new function.
-	(dump_active_server_map_entry): new function.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Drop a match if either of the text fields is NULL.
-	This could happen if any of the utf-8 involved is invalid, for
-	example. (Bug #13757)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): fix bug that allowed
-	for phone's not to be in priority order and the item to still be
-	syncable
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get management by id
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (is_syncable): a card also needs to
-	have its phone nums in priority order to be "syncable"
-	
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): move the syncable
-	checking code to a different function
-	(ecard_from_remote_record): set the name parts individually
-	(local_record_from_ecard): use is_syncable
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (file_as_get_style,
-	file_as_set_style): Use the actual ECardName in the ECard instead
-	of parsing the full_name here.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_set_name): New function to set the ECardName on
-	this card and fix the file_as if necessary.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_get): Handle returning dates here.
-	(e_card_simple_get_allow_newlines): New function.  Returns whether
-	it makes much sense to have newlines in this string.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h
-	(addressbook_create_new_source): The first argument here should
-	be const.
-
-	* gui/component/addressbook-storage.c: Added #include
-	"addressbook-config.h".
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an
-	escape here, cancel editing and remove the focus from the text.
-
-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.
-	(field_activated): Stop editing on the activate signal and remove
-	the focus from the text.  Fixes Ximian bug #12286.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.h: tidy
-
-	* conduit/address-conduit-config.h: ditto
-
-	* conduit/address-conduit.c (add_record): unref ecard when done
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this
-	function.
-	(e_card_date_to_string): ...and this one.  Fixes build problem in
-	pas-backend-ldap.c.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change "this should never
-	happen" dialog to not give my name/e-mail.  Sorry translators.
-	But this really should never happen, thanks to my fix below.
-
-	* gui/component/addressbook-component.c: Initialize
-	global_shell_client to NULL. (Bug #6625)
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	[ bug #12979 ]
-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new
-	function.
-	(anniversary_ber): new function.
-	(anniversary_compare): new function.
-	(birthday_populate): new function.
-	(birthday_ber): new function.
-	(birthday_compare): new function.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): free up all the book_data
-	list stuff.
-	(e_select_names_completion_got_book_view_cb): deal with book_data
-	being passed as the closure, and increment the
-	pending_completion_seq counter.
-	(e_select_names_completion_card_added_cb): deal with book_data
-	being passwd as the closure.
-	(e_select_names_completion_seq_complete_cb): same, and decrement
-	the pending_completion_seq if we haven't gotten one for this book
-	view before.
-	(e_select_names_completion_stop_query): cancel all the
-	book_data's.
-	(e_select_names_completion_start_query): use the books_not_ready
-	counter instead of book_ready.  also, do e_book_get_book_view on
-	each of the book's in our list.
-	(e_select_names_completion_do_query): change to deal with our
-	list.
-	(e_select_names_completion_book_ready): decrement the
-	book_not_ready counter.
-	(e_select_names_completion_new): add the book we're created with
-	to our list.
-	(e_select_names_completion_add_book): implement.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_add_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): use addressbook_config_data, and
-	don't unref the db.
-	(e_select_names_manager_create_entry): always add NULL for a book
-	(which corresponds to the local book), and if the completion_book
-	is present, add it to the list of books to complete again.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to
-	EBookCallback signature, and unref the book.
-	(quick_add_merge_card): use addressbook_load_default_book.
-	(ce_have_book): change to EBookCallback signature, and unref the
-	book.
-	(edit_card): use addressbook_load_default_book.
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	change to EBookCallback signature, and unref the book.
-	(add_card_idle_cb): use addressbook_load_default_book, and call
-	the cb if it fails.
-	(e_address_popup_cleanup): fix type -- should be "pop->card =
-	NULL", not "pop = NULL".
-	(contact_editor_cb): change to EBookCallback signature.
-	(edit_contact_info_cb): use addressbook_load_default_book.
-	(start_query): change to EBookCallback signature.
-	(e_address_popup_query): use addressbook_load_default_book.
-
-	* gui/widgets/e-minicard-control.c (book_open_cb): change to
-	EBookCallback signature, and unref the book.
-	(save_in_addressbook): use addressbook_load_default_book instead
-	of e_book_use_local_address_book.
-
-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're
-	including addressbook.h which has it's own set of funky include
-	path requirements.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak
-	stuff. (Bug #13709)
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,
-	nickname_simple_query_cb): Set book_uri when cardification occurs.
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Turned off use_ellipsis (it breaks
-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian
-	bug #13693.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Doh!  We should be sorting our contacts so that the
-	most frequently used ones are at the top of the list, not the
-	bottom.
-
-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a
-	bonobo_object_unref, not a gtk_object_unref.
-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref
-	here.
-	(pas_book_destroy): If our pas_book_check_queue timeout is still
-	active, disable it.  This should never happen, but it never hurts
-	to be careful.
-	(pas_book_destroy): Set book->priv to NULL after we free it.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): copy phone
-	labels and show phone as well, clear correct entry text and
-	correctly detect unsyncable cases
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): touch the
-	record on lookup
-	(check_for_slow_setting): write touched only if we are doing a
-	slow sync
-	(card_removed): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid
-	reentrancy guards.
-	(pas_book_queue_request): Changed our idle handler into a timeout,
-	so as to work w/ reentrancy guards.
-	(pas_book_init): Explicit initialization.
-
-2001-10-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototypes for
-	addressbook_config_database, and addressbook_load_default_book.
-
-	* gui/component/addressbook.c (addressbook_config_database): new
-	function, so we aren't activating the db everywhere we need to use
-	it.
-	(addressbook_load_default_book): load the default book, after
-	getting the uri from bonobo-config.
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return
-	on cancellation.
-	(simple_query_sequence_complete_cb): Act if not cancelled.
-	(simple_query_book_view_cb): Free & return on cancellation.
-	(e_book_simple_query_cancel): Set cancellation flag.
-
-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a
-	reference to ourselves for the duration of our addressbook fetch.
-	(start_query): Release when we've fetched our addressbook.
-	(e_address_popup_cleanup): Break out most of what we do in
-	_destroy into a separate function.
-	(e_address_popup_destroy): Class cleanup.
-	(contact_editor_cb): Paranoid clean-up.
-	(add_contacts_cb): Paranoid clean-up.
-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: remove the merges as valid sync
-	types
-
-	* conduit/address-conduit.c (pre_sync): write out only the touched
-	records if we are doing copies
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get the sync type
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c (e_address_popup_destroy):
-	Cancel any pending queries.
-
-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
-	assert, but check if ce->app != NULL, since this function can
-	(apparently) get called multiple times.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad
-	dialog ref-counting crap.
-
-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our
-	EContactEditor, since we are holding a pointer to it in
-	EditorCloseStruct.
-	(card_modified_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-	(card_added_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (check_for_slow_setting): make debug
-	info more accurate
-	
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (e_addr_context_destroy): prevent
-	double unref
-	(cursor_cb): correct typo
-	(card_removed): remove the card from the map if was archived and
-	is now deleted
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.h: new member
-
-	* conduit/address-conduit.c (print_remote): free the struct after
-	using it
-	(e_addr_context_new): make consistent with other conduits
-	(e_addr_context_destroy): properly destroy the context
-	(cursor_cb): no need to ref the card, its done for us
-	(clear_entry_text): util function to free a field
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer so we don't
-	have to free it later
-	(local_record_from_ecard): only fill in the fields we might not
-	sync, clear a field before replacing the contents
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(set_has_cursor): Added has_cursor argument.  Setting the argument
-	to TRUE if the minicard doesn't have focus will grab the focus.
-	Fixes Ximian bug #3024.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Initialize
-	gnome-vfs.
-
-	* gui/component/addressbook-component.c (xfer_file): Added.
-	(Copied from the calendar.)
-	(xfer_folder): Fixed to allow renaming of contact folders.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): Removed key_press handler here
-	since delete and backspace are now handled by keybindings.
-
-2001-10-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c: Fix command paths when we specify
-	our pixmaps, so we don't get a lot of totally useless & very ugly
-	bonobo-ui spew.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty
-	string as an arg shouldn't generate a warning.
-
-	* gui/component/select-names/e-select-names-completion.c: Removed
-	our cancelled flag and e_select_names_completion_cancel function,
-	since we were just duplicating stuff that had ended up in
-	ECompletion.
-	(match_name): Form our menu_text properly on an additional-name
-	match.
-	(e_select_names_completion_got_book_view_cb): Store handles for
-	our signals, disconnect them properly when we switch book views.
-	(e_select_names_completion_stop_query): Disconnect signals when we
-	stop our query.
-	(check_capabilities): Spew if we are using LDAP for completion.
-	(e_select_names_completion_destroy): Disconnect our signals when
-	we destroy.
-	This all should fix bug #10241.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Set "draw_button" argument to TRUE
-	on this EEntry.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an
-	error dialog if there's an error while saving.  If the person hits
-	cancel on the "file exists" dialog, don't close the file selection
-	dialog.  Fixes Ximian bug #7055.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(model_and_selection_free): right_click_up here when we let go of
-	the popup.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	right_click_up here.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section, e_select_names_set_default): Use an
-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.
-
-2001-10-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_model_force_folder_bar_message when we activate the
-	component. (Fixes bug #11749)
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_force_folder_bar_message): Added.  Forces
-	emission of a folder_bar_message.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_set_default): stick with the style font if the
-	efont bold font does not exist.	
-	(e_select_names_set_default): don't forget to unref the oldstyle.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Fix memory leak.
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our
-	string vector letter_v when we are done with it.
-
-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our
-	QuickAdd structure.
-
-	* gui/component/e-address-popup.c (e_address_popup_construct):
-	Unref our style after we are done with it.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): We
-	shouldn't leak the info returned by oaf_query.
-
-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
-	superfluous call to quick_add_unref.
-	(editor_closed_cb): Remove superfluous call to quick_add_unref.
-
-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We
-	need to unref the card returned by e_addressbook_model_get_card.
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make LDAP servers
-	non-user-creatable.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_card): Check that the
-	string we are checking for xml-ness is non-NULL.
-
-	* backend/ebook/e-destination.c (e_destination_importv): Filter
-	out empty destinations. (also Bug #13036)
-
-	* printing/e-contact-print.c (e_contact_build_style): Use
-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,
-	our spacing gets all messed up. (Bug #10785)
-	
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):
-	Allow printing if there are any cards in our view.  The selection
-	has nothing to do with it.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Check
-	for strings that contain non-whitespace, rather than just looking
-	for a non-zero first character. (Bug #13036)
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	Handle focus_change in event by selecting that contact.  Fixes
-	Ximian bug #3024.
-
-	* gui/component/addressbook-component.c (owner_unset_cb):
-	Repeatedly call gtk_main_quit here as long as there is a main loop
-	around.  This is an ugly hack around Ximian bug #11760.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: Added #include
-	<gal/widgets/e-unicode.h>.
-
-	* gui/widgets/e-minicard-control.c: Made this display the number
-	of extra cards in the attachment as well as made it save them all
-	to the local addressbook if the person selects the button.  Fixes
-	Ximian bug #9507.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not
-	grab on a right click.  Fixes Ximian bug #12660.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_motion): Get @folder_type here too [to
-	match the changes in the EvolutionShellComponentDnd interface].
-	Also, remove a debugging message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (add_menu_item):
-	Translate labels in select-names option menu. (Bug #9604)
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Made the default window size
-	slightly wider. (Bug #7516)
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h
-	(e_card_list_get_vcard): Made this take a const GList.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(check_capabilities): Added.  Check if our book is local or
-	networked.
-	(e_select_names_completion_book_ready): Call check_capabilities.
-	(e_select_names_completion_new): Call check_capabilities.
-	(e_select_names_completion_do_query): If we have a networked book,
-	keep trying if we haven't been able to cache any cards --- our
-	earlier attempts could have failed due to too many matches. (Bug
-	#12932)
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Lag our cardification on focus-out.  This seems to
-	help with the unintended cardifications that can result from the
-	weird focus-out/focus-in events that get generated when the popup
-	disappears.
-
-	* backend/ebook/e-card-compare.c: Removed some debug spew.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	grab focus in the Account entry when preparing the dialog, fixes
-	#10406.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (new_folder): make
-	sure to also add "ldap-contacts" folders to the option menu.
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync all
-	the fields we can, with out overwriting
-	(local_record_from_ecard): write the fields to the pilot in
-	priority order unless there are fields on the pilot we can't
-	store, then fill in the fields as they are on the pilot
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean
-	up here.  Might fix some crashes, specifically Ximian bug #10164.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model
-	column numbers here.  Fixes Ximian bug #12308.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):
-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match
-	vcard id's, fixes longstanding bug (#7406) where cards were not
-	modifiable or removable after having been created during a 1-2
-	week long window in early betas.
-	(PAS_BACKEND_FILE_VERSION): change to 0.2
-	(PAS_ID_PREFIX): #define this here.
-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of
-	the string.
-
-2001-10-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return
-	FALSE if no extension.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_id): If card->id is NULL,
-	return an empty string.
-	(e_card_set_id): Don't allow the card id to be set to NULL; use
-	the empty string instead.
-	(e_card_get_vobject): When building our vcard, pass in the empty
-	string as the id if card->id is NULL. (Bug #10164)
-
-2001-10-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): don't set
-	the phone info if it is blank
-	(ecard_from_remote_record): save up to 3 fax numbers
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	unref the book after we pass it off to evolution-addressbook.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref
-	op->view.
-	(pas_backend_ldap_process_create_card): ref op->view.
-	(remove_card_dtor): unref op->view.
-	(pas_backend_ldap_process_remove_card): ref op->view.
-	(modify_card_dtor): unref op->view.
-	(pas_backend_ldap_process_modify_card): ref op->view.
-	(ldap_search_dtor): unref op->view.
-	(pas_backend_ldap_search): ref op->view.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-	
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): make sure to unref the
-	book_view here so we don't leak them.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init and e_passwords_shutdown.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,
-	e_card_get_vobject): Properly decide whether a property needs to
-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,
-	e_contact_list_save_as): Set the default file name here.  Fixes
-	Ximian bug #7053.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Added linebreaks to our
-	"this shouldn't happen" dialog message. (Bug #12498)
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Add a component name
-	to the e_passwords_init() call.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c: commit the importer
-	originally from Michael M. Morrison, with fixups by toshok.
-
-	* backend/ebook/Makefile.am (bin_PROGRAMS): add
-	evolution-ldif-importer.
-	(oaf_in_files): add
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.
-
-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.
-
-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and
-	IS_LIST.
-	(e_card_simple_set): fix typo.
-
-	* backend/ebook/.cvsignore: ignore
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and
-	evolution-ldif-importer.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:
-	ldif importer oafinfo.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a boolean type here.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Check to see if the uri we are
-	setting is the same as the current uri.  If so, do nothing.
-	(Bug #11324)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c
-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for
-	whether or not we want to revert to an earlier cardified state.
-	(e_destination_cardify): Don't be quite as aggressive about
-	reverting to previous cardified states. (Bug #11890)
-
-2001-10-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
-	e_card_simple_set_address, e_card_simple_set_delivery_address,
-	file_as_get_style, file_as_set_style, e_card_simple_set,
-	e_card_simple_set_arbitrary),
-	gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_destroy,
-	e_contact_editor_address_set_arg,
-	e_contact_editor_address_get_arg),
-	gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_destroy,
-	e_contact_editor_fullname_set_arg,
-	e_contact_editor_fullname_get_arg),
-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
-	address_text_changed, name_entry_changed, full_name_clicked,
-	full_addr_clicked, fill_in_info): Changed these to use the new ref
-	and unref functions for ECard auxillary types.
-
-	* backend/ebook/e-card-simple.h: Added a comment.
-
-	* backend/ebook/e-card-types.h: Added ref_count field to all the
-	types.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
-	unref functions here for all the ECard auxillary types.  Removed
-	the corresponding free functions.  Switched to using these
-	functions where appropriate.
-
-	* gui/component/addressbook-factory.c: #include
-	<e-util/e-passwords.h>
-
-	* gui/component/addressbook.c (load_uri_cb): const correctify.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names.c: #include
-	<addressbook/gui/component/addressbook.h>
-
-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
-	unnecessary ref here.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_folder):
-	Don't need this any more.
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Check that
-	view->view != NULL.
-	(save_contact_cb): Check that view->view != NULL.
-	(search_cb): Check that view->view != NULL.
-	(delete_contact_cb): Check that view->view != NULL.
-	(print_cb): Check that view->view != NULL.
-	(print_preview_cb): Check that view->view != NULL.
-	(stop_loading_cb): Check that view->view != NULL.
-	(cut_contacts_cb): Check that view->view != NULL.
-	(copy_contacts_cb): Check that view->view != NULL.
-	(paste_contacts_cb): Check that view->view != NULL.
-	(select_all_contacts_cb): Check that view->view != NULL.
-	(send_contact_cb): Check that view->view != NULL.
-	(send_contact_to_cb): Check that view->view != NULL.
-	(update_command_state): Check that view->view != NULL.  Hold a
-	reference to the AddressbookView for the duration of the function,
-	in case we exit during bonobo-reentrancy.
-	(addressbook_view_ref): Added.
-	(addressbook_view_unref): Added.  Simple ref counting for
-	AddressbookView objects.
-	(addressbook_view_clear): Zero out an AddressbookView.  This is
-	now separated from the deallocation of the AddressbookView object,
-	so that we don't leave a dangling pointer if we exit during
-	bonobo-reentrancy in update_command_state. (Which often seems to
-	happen if we exit while addressbook operations are going on.)
-	(destroy_callback): Replace previous call to addressbook_view_free
-	with addressbook_view_clear/addressbook_view_unref calls.
-	(addressbook_factory_new_control): Initialize the reference count
-	in the AddressbookView object.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	Carefully zero out our destroyed object.
-	(command_state_change): Hold a reference to ourselves during the
-	signal emission.
-	(get_selected_cards): Ref cards as we add them to the list.
-	(e_addressbook_view_stop): Check for view != NULL.
-	(e_addressbook_view_can_create): Check for view != NULL.
-	(e_addressbook_view_can_print): Check for view != NULL.
-	(e_addressbook_view_can_save_as): Check for view != NULL.
-	(e_addressbook_view_can_send): Check for view != NULL.
-	(e_addressbook_view_can_send_to): Check for view != NULL.
-	(e_addressbook_view_can_delete): Check for view != NULL.
-	(e_addressbook_view_can_cut): Check for view != NULL.
-	(e_addressbook_view_can_copy): Check for view != NULL.
-	(e_addressbook_view_can_paste): Check for view != NULL.
-	(e_addressbook_view_can_select_all): Check for view != NULL.
-	(e_addressbook_view_can_stop): Check for view != NULL.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be
-	careful about zeroing out our destroyed object.
-	
-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops
-	event processing in the underlying listener.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_destroy): If our select names dialog is
-	still around, destroy it.  Otherwise, the dialog will hang around
-	after our composer goes away.
-
-2001-10-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: add an Email Address
-	field/label/help text.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the email entry
-	from the source.  also, set the initial state of the email
-	label/entry.
-	(auth_checkbutton_changed): set the email label/entry
-	sensitive/editable if auth is turned on, and
-	insensitive/uneditable if it's off.
-	(addressbook_source_dialog_get_source): get the email address from
-	the email entry.
-	(addressbook_source_dialog): hook up the email entry to the
-	changed signal foo, as well as the focus handler for displaying
-	help text.
-
-2001-10-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): db isn't a BonoboObject, so don't
-	bonobo_object_unref it!
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/addressbook.c (forget_passwords_cb): new function,
-	call e_passwords_forget_passwords.
-	(verbs): Add ContactsForgetPasswords.
-	(load_uri_auth_cb): new function, call the callback and free up
-	our closure stuff.
-	(load_uri_cb): once the uri is loaded, check if we're configured
-	to authenticate for it, and do so, using the e_passwords stuff.
-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off
-	the parameters and start the load-with-auth machinery.
-	(book_open_cb): remove all the auth stuff from here, as it's
-	handled elsewhere now.
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init.
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	e_book_load_uri -> addressbook_load_uri.
-	(destination_folder_handle_drop): same.
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_load_uri (a wrapper around e_book_load_uri that also
-	handles authentication if the user selects it.)
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Check to make sure our call to
-	e_addressbook_model_get_card doesn't return NULL.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_get_card): Chek that we aren't requesting a
-	negative row.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	Move to the bottom of the scrolled window, so we can see the
-	address we just added.
-	(table_drag_data_received_cb): Move to the bottom of the scrolled
-	window, so we can see the contact we just dropped.
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	We don't own the string returned by e_categories_master_list_nth,
-	so terrible things will happen if we free it. (Bug 10916)
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):
-	don't set the editable field on the model - let the book do that.
-	(book_writable_cb): call writable_status to propagate a ui-change
-	event up (and sensitize the write-only toolbar buttons after you
-	authenticate with ldap.)
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): for some
-	reason, matching on protocol is causing problems for me.
-	disabling it for now.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c: use ldap.png for ldap
-	contacts.
-
-2001-10-03  Iain Holmes  <iain@ximian.com>
-
-	* addressbook/gui/component/addressbook-storage.c 
-	(addressbook_storage_setup): Only load_storages if you have LDAP.
-	(load_source_data): Only do stuff if you have LDAP.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the
-	fields to use properly.
-
-2001-10-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Strip out commas before forming our query.
-	(match_name): Use e_card_compare_name_to_string_full, rather
-	than our crufty old matching code.  Not only is this cleaner,
-	but that crufty old code was very broken when it came to 
-	handling strings with whitespace. (Bug 8988)
-	(match_nickname): utf8 and bug fixes.
-
-	* backend/ebook/e-card-compare.c
-	(e_card_compare_name_to_string_full): Added.  This is basically
-	e_card_compare_name_to_string with a bunch of extra options, so
-	that it can more readily be reused in other contexts.
-	(e_card_compare_name_to_string): This is now just a call to
-	e_card_compare_name_to_string_full with the extra args filled in
-	to defaults that simulate the old behavior.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-        * backend/ebook/e-book.c (e_book_construct): remove most of the
-	oaf stuff from here.  we do it in load_uri, where we'll have more
-	information (namely, the protocol we're using.)
-	(activate_factories_for_uri): do an oaf query to get a list of all
-	objects implementing our BookFactory interface and also supporting
-	the protocol used in the uri.
-        (e_book_load_uri): try activating book factories to handle this
-	uri, and start the iteration over the list.
-        (e_book_load_uri_from_factory): try and load the uri.
-        (e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-        (e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-	
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): Made the max length of
-	the textification be 2047 characters.  Fixes Ximian bug #3021.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): if there
-	was no first name or last name, file as the company.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): if there is a db error,
-	assume deletion
-	(pas_backend_file_changes): write after all is done for efficiency
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): g_strdup
-	(pas_backend_file_changes): ditto, make sure to free all data and
-	do a hash write after each add/remove
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): use
-	the local record category
-	(local_record_from_ecard): ndle the fields and category we don't
-	sync by making sure we don't overwrite them
-
-2001-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to
-	get a list of all objects implementing our BookFactory interface,
-	instead of just activating the one IID.  this should really be a
-	global list, not a per EBook.
-	(e_book_load_uri): start the iteration over our list of
-	BookFactory's.
-	(e_book_load_uri_from_factory): try and load the uri.
-	(e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-	(e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-
-2001-09-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): use the old
-	record (if there was one) so as not to overwrite fields we don't
-	sync
-	(pre_sync): store the dbi in the context and don't make it object
-	data
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use
-	priv->iid instead of the hardcoded string here.
-	(pas_book_factory_activate): parameterize the factory's iid, as in
-	the calendar server, and provide a default if iid == NULL.
-
-	* backend/pas/pas-book-factory.h: add iid parameter for
-	pas_book_factory_activate.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use
-	camel_address_format, not camel_address_encode.
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added help text (thanks 
-	to Aaron) and re-worded the labels, and fixed the shortcuts on the 
-	brand-spanking-new Collaboration tab.
-	
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	completion_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and
-	if it's present, use the corresponding EBook for completing
-	addresses.
-	(focus_out_cb): use manager->completion_book here instead of NULL,
-	which corresponds to the local addressbook.
-	(completion_popup_cb): same.
-	(e_select_names_manager_create_entry): same.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Properly handle names when the individual elements (given,
-	addition, family) contain whitespace.  (Bug #10502)
-
-	* backend/ebook/e-destination.c (e_destination_set_name): Reset
-	textrep when we change the name.
-	(e_destination_set_email): Reset textrep when we change the email.
-	(e_destination_get_textrep): Make sure that the textrep version of
-	the address is properly quoted if it contains unsafe characters.
-	(All related to bug #10796)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Fix nickname matching. (bug #9698)
-	(make_match): Use e_completion_match_new when building our match,
-	rather than ad hoc manipulation of the struct.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set
-	the last_use and use_score fields of the card to known values so
-	the card doesn't register as changed when only they have changed
-
-2001-09-26  Peter Williams  <peterw@ximian.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function
- 	to set email addresses properly, and handle multiple occurrences of
- 	email addresses, home phone numbers, and business phone numbers.
-	
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	Handle creating the new contact in the current folder if it's a
-	contacts folder.  Fixes Ximian bug #7814.
-
-2001-09-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (LDAP_SCHEMA): add
-	evolutionperson.schema
-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync the
-	note the to pilot and make sure to blank fields when appropriate
-	(local_record_from_ecard): sync the note to the desktop
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the
-	error case to plug a memory leak.
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): when creating the cards,
-	don't display any of the subname fields (surname, given, middle,
-	suffix, etc.)
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_get): add getters for the additional name fields.
-	(field_data): move FAMILY_NAME to the end of the list, and add
-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.
-	
-	* backend/ebook/e-card-simple.h: same.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (print_preview_cb): Hooked up print
-	preview button.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_print_preview): Added this function.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_preview): Added this function.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
-	Use the default e-mail address if we have nothing else to go on.
-	Previously we just failed, which basically meant that name-only
-	searches would never work properly.
-	(nickname_simple_query_cb): The logic was a bit tangled here; if
-	our query status isn't SUCCESS, always give up but don't leak the
-	destination.  And if our nickname query fails and we try the
-	name-and-email query, use the textrep for a name-only search.  The
-	only reason we are doing a nickname query in the first place is if
-	we have an obviously invalid e-mail.
-	(launch_cardify_query): Use e_destination_is_valid to determine
-	if we should try a nickname query first.
-	These changes basically fix bug 7728, and generally make the
-	auto-cardification of addresses a lot more clever and robust.
-
-	* backend/ebook/e-book-util.c (name_and_email_cb): Use
-	e_card_compare_name_to_string instead of e_card_name_match_string.
-	(e_book_name_and_email_query): The arguments to g_strsplit were
-	in the wrong order.  Doh!
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Added.  Replaces e_card_name_match_string, and actually works.
-
-	* backend/ebook/e-card.c: Removed e_card_name_match_string
-	function, which didn't work particularly well.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (cursor_cb): don't add to the complete
-	list of cards if the card is a list
-	(card_added): don't add to the list of changes if the card is a
-	list
-	(card_changed): ditto
-	(card_removed): ditto
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change the "this should
-	never happen" message into a request for people to e-mail me
-	directly with info if they encounter that error.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):
-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that
-	they won't be leaked if they are dynamic strings, so that they
-	will be i18n-correct, and so that underscores won't be interpreted
-	as key accelerators.  What a PITA.  Also, don't leak our
-	iterators.  (Bug #10200.)
-	(popup_menu_list): The same GnomeUIInfo tweaking as in
-	popup_menu_card.
-	(popup_menu_nocard): Ditto.
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
- 
- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data
- 
- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri
- 	property when appropriate
- 	(parse_caluri): handle read caluri
- 	(e_card_class_init): add caluri arg
- 	(e_card_destroy): free the caluri
- 	(e_card_get_arg): return caluri arg
- 	(e_card_set_arg): set caluri from arg
- 	(e_card_init): init caluri to null
- 
- 	* backend/ebook/e-card-simple.h: new simple field
- 
- 	* backend/ebook/e-card.h: new member
- 
- 	* gui/contact-editor/e-contact-editor.c (field_changed): util
- 	callback to change the command state
- 	(set_entry_changed_signal_field): hook up a change signal to above
- 	(set_entry_changed_signals): use above function
- 
- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration
- 	page and fields
-	
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_build_cards_list): create a sexp and check if
-	the cards match before adding them to the list
-	(pas_backend_file_process_get_cursor): send extra param
-
-2001-09-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): unref the destination regardless
-	of whether we get an email addresss.
-
-2001-09-17  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): use g_strfreev.
-	(match_name): s/g_free/g_strfreev.
-	(match_file_as): s/g_free/g_strfreev.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix
-	the memory handling here.  All there members of the vector need to
-	be freed all the time.
-
-	* backend/ebook/load-pine-addressbook.c (parse_line): free the
-	string outside of the test that makes sure there are three
-	entries.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): don't malloc a match we will never use.
-
-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd
-	capabilities.
-
-2001-09-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): We want
-	to assume that a destination that comes from a card is
-	automatically valid, but the right way to check that is by calling
-	e_destination_from_card, not by checking if dest->priv->card !=
-	NULL.  (Fixed bug #10017)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Fixed a stupid bug was causing completion to fail
-	for contacts who have only one name.  (The classic example we all
-	know and love is 'George <jirka@5z.com>')  (bug #8353)
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to has no valid e-mail addresses.
-	(bug #10137)
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly
-	assumed that event->button.button is 1, 2, or 3, causing disaster
-	when using a wheel-mouse.  Fixed. (bug #9400)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-	use enable_widget instead of gtk_widget_set_sensitive.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(disable_widget_foreach): same.
-	(enable_writable_fields): same.
-	(set_editable): same.
-	(enable_widget): new function, using both gtk_widget_set_sensitive
-	and *_set_editable to allow the user to select text in GtkEntry's
-	and GtkText's.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_arg): use set_editable as well as
-	set_sensitive, to allow the user to select text in GtkEntry's.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_set_arg): same.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix syntax errors (which are
-	broken, imo...)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so
-	that they match the order of the option menus in the glade file.
-
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	new function, mostly there to house some #ifdef'ed out code.
-	(option_menuitem_activated): new function, to keep track of
-	changes to the ldap scope optionmenu.
-	(addressbook_source_dialog_set_source): set the menu history as
-	well as the dialog's copy of the scope.
-	(addressbook_source_dialog_get_source): fill in the source's scope
-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me
-	code.
-	(add_activate_cb): new function, add an activate callback for the
-	optionmenu's items.
-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me
-	code, always start the dialog on page 0, and hook up the
-	scope optionmenu's items.
-
-2001-09-15  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): No
-	loose name matches on family names. (#8802)
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): We can't use NULL as the
-	first arg for e_addressbook_show_contact_editor anymore.  Damn.
-	(#8535)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
-	"stop" do nothing but set the stopped flag, as in
-	e-book-view-listener.c.
-	(e_book_listener_destroy): Clean up our queue here, rather than in
-	e_book_listener_stop.
-	(response_free): Added.  Move the rather lengthy bit of code
-	needed to free a EBookListenerResponse into one place.
-	(e_book_listener_check_queue): Properly deal with the stopped
-	flag.
-	(e_book_listener_queue_response): If the stopped flag is set, just
-	drop the incoming response.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): Make "stop" do nothing but set the
-	stopped flag.
-	(e_book_view_listener_destroy): Move all of the clean-up that used
-	to be in e_book_view_listener_stop here.  This considerably simplifies
-	the logic required to avoid various race conditions.
-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.
-	(e_book_view_listener_queue_response): Drop all incoming responses if
-	we are stopped.
-
-2001-09-14  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a
-	reference to the book on behalf of our idle function.
-	(pas_book_check_queue): When we are finished, drop the reference
-	we've been holding on behalf of the idle function.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): Hold a reference to the
-	book_view while sending our notifications.
-	(pas_backend_file_process_remove_card): Hold a reference to the
-	book_view while sending our notifications.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
-	debugging spew.
-
-	* backend/ebook/e-book-util.c: Remove a lot of unused code that
-	worked around bugs that have long since been fixed.
-	(simple_query_disconnect): Added.  Breaks out the part of
-	simple_query_free that disconnect signals.
-	(simple_query_free): Replace code w/ a call to
-	simple_query_disconnect.
-	(simple_query_sequence_complete_cb): Call simple_query_disconnect
-	before executing the callback, so that our callbacks don't get
-	triggered by any book changes that might occur during that
-	callback.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Changed to be consistent with
-	e_book_listener_check_queue.
-	(e_book_view_listener_queue_response): Also changed to use a
-	high-frequency timeout.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	OK, I've agonized over this stupid little function, and it should
-	now be race-free.
-	(e_book_listener_queue_response): We process our response queue in
-	a high-frequency timeout rather than an idle.  Using an idle
-	function leads to some tricky race conditions and bad interactions
-	with bonobo's semi-broken attempts to take over event processing.
-	(e_book_view_listener_stop): Manually disable our timeout and
-	clean up.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly
-	instead of using `+='.
-
-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
-	`LDAP_BACKEND_FILES'.
-
-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
-	using `+='.
-
-2001-09-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_init.  ldap_open is deprecated in openldap 2.x.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	Fix the check.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-destination.c: free the values that are being
-	leaked here.
-
-2001-09-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c (match_email): 
-	printf arguments were reversed by mistake.  Fixed bug #9693.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_list): Added.  Treat right-clicks on a contact list as
-	a special case.
-	(e_select_names_popup): Check if we are dealing with a contact
-	list.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): See
-	e_book_listener_check_queue below.
-	(e_book_view_listener_queue_response): See
-	e_book_listener_queue_response below.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	Explicitly prohibit reentrancy.  Use gtk-unref rather than
-	bobobo-unref.
-	(e_book_listener_queue_response): Hold a gtk-ref to the listener
-	while the idle function runs, not a bonobo-ref.  As far as I can
-	tell, it is impossible to avoid a race condition here when we have
-	to worry about bonobo reentrancy.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Alter a copy of the
-	original EDestination, rather than just using a new one.  We need
-	to do this to preserve prior-card information for possible
-	reversion later.
-	(e_select_names_text_model_delete): Ditto.
-
-	* backend/ebook/e-destination.c (e_destination_clear_card): When
-	clearing a destination where ->card != NULL, store it for possible
-	reversion later.
-	(e_destination_revert): If we have an old card stored, go back to
-	using it for the destination.
-	(e_destination_is_valid): Tries to detect obviously broken
-	addresses.
-	(e_destination_cardify): If our destination is invalid, first try
-	to cardify simply by reverting to an older card.
-	(e_destination_destroy): Unref any cached old card.
-	(e_destination_copy): Copy the old card information.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(sync_table_and_models): Show all rows in the table, and then
-	remove the rows that correspond to entries in the
-	ESelectNamesModels in the children.
-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we
-	don't change our table while we are in the middle of iterating
-	over the selection.
-	(remove_address): Just delete the address from the
-	ESelectNamesModel, the signal handler will do the rest.
-	(selected_rows_foreach_cb): Call remove_address to do our dirty
-	work.
-	(e_select_names_add_section): Connect to the 'changed' signal from
-	the ESelectNamesModel, and call sync_table_and_models explicitly to
-	get our initial state correct.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Deal with EDestinations in our table that don't
-	come from cards.
-
-	* gui/component/select-names/e-select-names-manager.c: Added
-	another ESelectNamesModel* to the ESelectNamesManagerSection
-	struct.  Called 'original_model', this contains a copy of the
-	model as it is when we begin using the SelectNames dialog.
-	(section_copy): Copy the original model.
-	(section_free): Free the original model.
-	(e_select_names_manager_add_section_with_limit): Initialize the
-	original model.
-	(e_select_names_clicked): I've changed the semantics of this
-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,
-	we do nothing.  If Cancel is clicked, we revert to the
-	'original_model' copy of our address entry state before we started
-	editting.  Finally, we close the dialog before any of thing. Doing
-	it last caused problems, because signals were being triggered
-	which had dangling pointers as their closures.
-	(e_select_names_manager_activate_dialog): Copy our current state
-	to the original model, and share the same ESelectNamesModel
-	between the dialog and the address entry in the composer..
-	(e_select_names_manager_get_cards): Removed.  It had been
-	#if 0/#endif-ed out for a while.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_freeze): Added.
-	(e_select_names_model_thaw): Added.
-	(e_select_names_model_uncardify): Added.  If possible,
-	"uncardifies" a specific model entry.
-	(e_select_names_model_changed): Changed to pay attention
-	to the freeze count.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(clean_query_text): Strip leading/trailing whitespace from
-	queries.
-
-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.
-	Converts a card-associated destination into a text-associated
-	destination w/ the e-mail address.
-	(e_destination_list_to_vector): Added.  A convenience routine.
-	(e_destination_freev): Added.  A convenience routine.
-	(e_destination_touchv): Added.  I'm lazy.
-
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	(make_contact_editor_cb): show the right contact editor (the list
-	editor for list cards).
-	
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): do the EDestination xml magic on email
-	addresses we put in the popup.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	For every category:
-	- set .translate to FALSE (e_categories_master_list_nth returns
-	translated category name)
-	- convert category name in UTF-8 to locale's encoding
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Fixed two bugs:
-	- missing coversion of contact name to GTK+ locale,
-	- passing dynamically created string (contact name) inside uiinfo struct
-	to gnome-app-helper functions.
-	Remember: these functions may change strings, trying to translate them!
-	(popup_menu_nocard): Ditto
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Removed unused factory
-	variable.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (notify_listener): new
-	function, notify the bonobo listener.
-	(remove_ldap_folder): track change to EvolutionStorage signal.
-	(create_ldap_folder): same, and make sure the type is
-	"ldap-contacts".
-	(load_source_data): folders that we create should have
-	"ldap-contacts" as their type.
-	(addressbook_storage_add_source): same.
-
-	* gui/component/addressbook-component.c: (folder_types): add
-	"ldap-contacts", for display of ldap servers (they get their own
-	icon, and their own name in the Create New Folder dialog.
-	(create_view): use IS_CONTACT_TYPE since we support two folder
-	types now.
-	(create_folder): same.
-	(remove_folder): same.
-	(xfer_folder): same.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change
-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.
-
-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove
-	status messages from here.
-	(e_addressbook_view_delete_selection): same.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a
-	NULL status message along with the stop_state_changed.  The null
-	status message will clear the status bar for this view.
-
-	* gui/component/addressbook.c (set_status_message): use the
-	EvolutionActivityClient stuff.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status
-	message for abandoning a search.
-	(ldap_op_process_current): wrap status messages in _().
-	(ldap_op_process): same.
-	(create_card_handler): same, and remove the notify_status for ""
-	and add a notify_complete call after the card is added.
-	(remove_card_handler): same.
-	(modify_card_handler): same.
-	(poll_ldap): wrap status messages with _(), and remove the "Search
-	Complete" message.
-	(ldap_search_handler): wrap status message.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use
-	_() on status messages, and make sure the last notify_* called is
-	notify_complete.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the addressbook.]
-
-	* gui/component/addressbook-component.c
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.
-	(create_component): Renamed from `factory_fn'.  Just register the
-	thing on OAF.
-	(addressbook_component_factory_init): Just call it.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the
-	ShellComponentFactory.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
-	if the file isn't a valid VCard file.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)
-
-	* backend/ebook/e-card-simple.c
-	(field_data): Marked "name" and "short_name" fields for translation.
-	(e_card_simple_get_name, e_card_simple_get_short_name): Return
-	localized version of the name (using U_() macro).
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):
-	Connect "changed" signal from "entry-web" entry to widget_changed.
-	(changing this field wasn't making "Save and Close" button sensitive)
-
-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.
-
-	* gui/widgets/e-addressbook-view.c
-	(button_labels, button_letters): New strings containing a list of
-	labels and "values" of all buttons placed on the right side of the
-	addressbook view (intended for localization).
-	(struct LetterClosure): Changed the type of letter field to gunichar.
-	(e_utf8_split): New function, similar to g_strsplit, but operates on
-	UTF-8 strings.
-	(jump_to_letter): Don't hardcode letters, build queries dynamically
-	using UTF-8 and localized letters stored in button_letters.
-	(connect_button): Removed.
-	(create_alphabet): Don't use glade file, build buttons manually using
-	(localized) labels from button_labels. Use (localized) values from
-	button_letters when creating LetterClosure.
-
-	* gui/widgets/e-minicard-view-widget.[ch]
-	(e_minicard_view_widget_jump_to_letter): Changed the type of the
-	second argument from char to gunichar.
-
-	* gui/widgets/e-minicard-view.c
-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on
-	UTF-8 string.
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar + conversion to UTF-8 string.
-
-	* gui/widgets/e-minicard-view.h
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
-	backend/pas/pas-backend-file.c (do_create),
-	backend/pas/pas-backend-ldap.c
-	(create_card_handler, remove_card_handler, modify_card_handler,
-	pas_backend_ldap_process_get_vcard, poll_ldap): Use
-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
-	since all internal communications and database storage are assumed
-	to be utf8.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_duplicate): Simplified this function considerably.
-	(e_card_simple_get_vcard_assume_utf8): Added this function.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
-	these functions pay attention to charset attributes.
-	(e_card_new_with_default_charset,
-	e_card_load_cards_from_file_with_default_charset,
-	e_card_load_cards_from_string_with_default_charset): New functions
-	that let you change the default charset from UTF-8.
-	(e_card_get_vcard): Made this write out charset attributes when
-	necessary.
-	(e_card_get_vcard_assume_utf8): New function that writes out a
-	card without writing out charset attributes.
-
-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
-	backend/ebook/test-card.c (main),
-	gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
-	(main), gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(pstream_load): Changed the default charset to be used here to
-	ISO-8859-1.
-
-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
-	backend/ebook/load-pine-addressbook.c (add_card_cb),
-	backend/ebook/test-client-list.c (get_cursor_cb),
-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
-	e_card_get_vcard_assume_utf8 to print out testing strings.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_contains): Changed this to be const
-	EDestination *dest to fix a warning.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Translate window title here.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): s/_/U_/
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):
-	Use g_utf8_collate.
-
-	* gui/widgets/e-minicard.c (e_minicard_compare):
-	Ditto.
-
-	* printing/e-contact-print.c (card_compare):
-	Ditto.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Use e_select_names_model_merge to
-	combine the selected names with any existing ones.  This causes
-	you to not lose addresses typed directly into the entry while the
-	SelectNames dialog is up. (Bug #8058)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_merge): Merge the contents of one
-	ESelectNamesModel into another, avoiding duplicates.
-
-	* backend/ebook/e-destination.c (e_destination_equal): Added.
-	Determines if two destinations appear to refer to the same
-	recipient.
-
-	* backend/ebook/e-card.c (e_card_list_send): Added cast to
-	g_free args to silence compiler warnings.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Paranoia.  Check that name != qa->name.
-	(quick_add_set_email): Check that email != qa->email.
-	(ce_have_book): Store the QuickAdd data structure in object data,
-	so that we can be extra-careful and avoid having a dangling
-	pointer floating around out somewhere as the closure for a signal.
-	Fixes bug #8155, I think.
-	(card_added_cb): Clear object data to ensure single unref.
-	(editor_closed_cb): Clear object data to ensure single unref.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_score): Make sure that comp->priv->query_text isn't
-	NULL.  (Fixes bug #8195)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	This function can be re-entrant during the signal emission; Added
-	extra ref/unrefs and checks to avoid problems if this happens.
-	This is similar to my recent changes to
-	e_book_view_listener_check_queue.  (Fixes bug #7400)
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Get rid of a warning by
-	initializing the closing NULL element in folder_types correctly.
-
-	* gui/component/select-names/e-select-names.c: Updated to match
-	the studlyCapsification of attributes in shell/Evolution*.idl.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_file_as): Added.  Generated queries against file_as.
-	(match_file_as): Added.  Match results of queries against
-	file_as. (Bug #8152)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added ref/unref pair to make
-	sure that our listener doesn't get finalized during the signal
-	emission and leave us with a dangling pointer. (Bug #7661)
-
-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging
-	spew that I left in by mistake.
-
-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging
-	spew.
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to is a contact list. (Bug #6580)
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Display localized status string (added missing _()).
-
-2001-08-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_card): Put a
-	freeze/thaw around our the set of operations that changes the
-	internal state of our card, so 'changed' signal callbacks won't be
-	invoked on a card in an intermediary state.  This fixes the bug
-	that was causing the e-mail addresses in cards to be blank when
-	replying to a message.  (An unexpected side-effect of toshok's
-	change on 8/22 to make sure that priv->email != NULL).
-	(e_destination_get_name): Code slightly rearranged for (IMO)
-	clarity.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): add
-	BUTTON_PRESS_MASK so double clicks still work.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): switch
-	"full_name" to "x-evolution-any-field" in all the queries where we
-	want to match all cards, since the backends universally handle
-	this special case more efficiently.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	In the GUI, the toggle is labelled "hide addresses", not "show
-	addresses" -- so we have to reverse the boolean value we read in.
-	(fill_in_info): Same bug as before: since the GUI reads "hide", we
-	have to initialize the toggle to '!show_addresses', not
-	'show_addresses'.
-
-	* backend/ebook/e-destination.c
-	(e_destination_list_show_addresses): Added.
-	(e_destination_xml_encode): Encode the value of
-	e_destination_list_show_addresses into the XML.
-	(e_destination_xml_decode): Read and store the "show_addresses"
-	flag.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* gui/component/e-address-popup.c (emit_event): emit an event from
-	our event source
-	(contact_editor_cb): emit a destroy event so our control frame can
-	be destroyed.
-	(edit_contact_info_cb): emit a hide event so our control frame can
-	be hidden
-	(e_address_popup_cardify):
-	(add_contacts_cb): emit the destroy event
-	(e_address_popup_factory_new_control): don't unref our object at
-	widget destroy time as that was really really broken
-	(e_address_popup_factory_new_control): create an event source and
-	aggregate ourself with it
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	display a nicer warning when we can't find a widget for a given
-	field
-	(e_contact_editor_raise): only raise if there is a window
-
-	* gui/contact-editor/contact-editor.glade: name some widgets that
-	got unnamed, and set the first entry as defaultable
-
-	* gui/contact-editor/e-contact-editor.c: envelope printing is
-	disabled in 1.0
-
-2001-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_email): make
-	sure we don't get into a situation where priv->email == NULL.
-
-2001-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,
-	drag_button_down won't be true in the BUTTON_RELEASE case, since
-	we set it to false in MOTION_NOTIFY once the threshold is reached.
-	(e_minicard_drag_end): remove this function, since it was needed
-	to work around a bug in gnome-canvas.
-	
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Wrap our addressbook table
-	adapter in an ETableWithout, so that we can make addresses appear
-	and disappear when we remove/add them to the section lists
-	(To/Cc/Bcc) on the right of the dialog.
-	(real_add_address_cb): When we add an address, hide it in the main
-	list.
-	(e_select_names_init): Get pointer to our without table from the
-	table's object data, and store it.
-	(remove_address): When we remove an address, show it in the main
-	list.
-	(card_key): Added.  Allocate a unique key from an ECard.
-	(esn_get_key_fn): Added.  Callback for ETableWithout.
-	(esn_dup_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS
-	type.  This allows the cards in the ESelectName dialog to
-	appear in proper sort order (i.e. as 'Doe, John' rather than
-	'John Doe').  Fixes ximian #6002.
-
-2001-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're
-	only passing 1 GTK_TYPE_POINTER arg, not 2.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for
-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For
-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,
-	and connect to the "drag_end" signal on our canvas so we'll know
-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the
-	grab if we were dragging and get the event.
-	(e_minicard_drag_end): new function, just remove the pointer/gtk
-	grabs and disconnect.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint
-	drag_button"
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_changes): null out card_sexp so that
-	we don't crash when copying
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: fix warnings, get compiling again
-
-	* conduit/address-conduit-config.h: remove c/p typos
-
-	* conduit/address-conduit.h: ditto
-
-	* conduit/Makefile.am: link against the static camel
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
-	toolbar. Used Delete icon in menu.
-
-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'
-	as it seems more appropriate. Also added delete icon for menu.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Update the folder list to
-	include a display name and a description.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search
-	icons.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (set_folder_bar_label),
-	gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
-	(folder_bar_message): Set the folder bar message here.  Fixes
-	Ximian bug #4670.
-
-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
-	strlen(SEPARATOR) here so that if the separator changes the length
-	will work properly.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added full country list.
-	Fixes Ximian bug #5123.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Hook up `delete-message.png' as the
-	icon for "ContactDelete".
-	* gui/contact-editor/e-contact-editor.c: Likewise.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_get_other_contact_storage.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): rename register_storage
-	to this, and return the EvolutionStorage.
-	(load_source_data): register_storage =>
-	addressbook_get_other_contact_storage.
-	(addressbook_storage_add_source): register_storage =>
-	addressbook_get_other_contact_storage.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): connect to the "changed" signal on
-	"entry-web" to update command state.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	call e_card_set_id on the list's card so we can continue to use
-	this dialog.  also, call command_state_changed if we aren't
-	closing the dialog so the toolbar is properly sensitized.
-	(list_deleted_cb): always close the dialog after we successfully
-	delete a list.
-
-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call
-	e_card_set_id on the card so we can continue to use this dialog
-	(to modify or delete the card.)
-	(card_deleted_cb): always close the dialog after we successfully
-	delete a card.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): call
-	e_sexp_encode_string on the search string the user types in so it
-	doesn't break sexp parsing in the wombat.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: changed to new print icon.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: (struct
-	ESelectNamesFolder): rename physical_uri to uri, since it includes
-	the addressbook.db for file: uris.
-	(e_select_names_folder_free): physical_uri => uri.
-	(e_select_names_option_activated): physical_uri => uri, and we
-	don't need to strdup_printf "addressbook.db" onto the end anymore.
-	(new_folder): if the physical_uri is a file: uri, append
-	/addressbook.db onto it.
-	(hookup_listener): new function, split out lots of code from
-	e_select_names_hookup_shell_listener.
-	(e_select_names_hookup_shell_listeners): rename
-	e_select_names_hookup_shell_listener to this, and hookup both the
-	local and "Other Contacts" listener, using hookup_listener.
-	(e_select_names_destroy): disconnect from the
-	other_contacts_listener and unref it.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add a listener for Other Contacts, and rename
-	"listener" to "local_listener."
-
-2001-08-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): If we get the
-	"sequence_complete" signal when we aren't searching, it means the
-	addressbook changed out from under us.  Clear the search cache, so
-	that future completion requests won't use the out-of-date cached
-	data.  Also, don't unref book_view... we leave the EBookView open
-	so that we can catch these addressbook changes.
-	(e_select_names_completion_do_query): Don't use the book_view
-	being non-NULL as a sign that another query is still running.
-	(e_select_names_completion_got_book_view_cb): Properly unref any
-	previous value in book_view.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the
-	messages here in the right click menus.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our
-	card_sexp.
-	(create_card_handler): make sure to set the id of the vcard so it
-	gets properly transmitted back to the BookView, and notify all
-	matching BookViews to add the created card.
-	(remove_card_handler): notify all matching BookViews to remove the
-	card.
-	(modify_card_handler): notify all matching BookViews to modify the
-	card.
-	(pas_backend_ldap_process_get_book_view): init card_sexp based on
-	the view's search.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): use card_sexp.
-	(pas_backend_file_book_view_free): same.
-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.
-	(pas_backend_file_search): use card_sexp.
-	(pas_backend_file_process_get_book_view): same.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-card-sexp.[ch].
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Added code
-	so the user can create a new contact or contact list from anywhere
-	in evolution.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/evolutionperson.schema: Added a closing paren.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_handle_request): Renamed from _begin to
-	match changes in gal 0.10.99.3.
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): 
-	Check that name != NULL before we start messing with it.
-	(Fixes bug #7329)
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Boost scoring on an exact nickname match.
-	Manually addressify match.
-	(match_name): Manually addressify matches.
-	(book_query_score): Remove automatic addressification.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Minor
-	tweak to avoid a crash if we have a negative subid with id
-	ESB_CATEGORY.  This should never happen.
-	(addressbook_menu_activated): Reset the entry/option when we
-	select "Clear".
-	Some changes to reflect renaming in ESearchBar.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Cardify after importing destinations.
-	This might fix a problem that Damon is having.
- 
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: set title of initial
-	dialog to Addressbook Sources (bug #6704).
-
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): don't
-	let people add subdirs in the ldap server storage - everything is
-	toplevel there.
-
-2001-08-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_vcard): implement using
-	search_for_dn.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Tell the search bar to translate the subitem texts.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Add "Any Category" option for category searches.
-	(addressbook_query_changed): Do the right thing on an
-	"Any Category" search.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Fix up to match the
-	pas_book_new/get_vcard changes.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Got rid of an extraneous _ here.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
-	forgot to write this function.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added focus targets
-	here.  Fixes part of Ximian bug #5843.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Grab focus here.  Fixes Ximian bug #2265.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control): 
-	(addressbook_query_changed): Fixed two const warnings here.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Fixed some missing includes
-	here.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view.c (add_book_iterator): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the
-	part where the uri is made part of the uid.  Made uri a separate
-	field.  Fixes Ximian bug #6490.
-
-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:
-	Change this to use ECard's split uids and uris.
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't
-	g_strdup the stuff we're passing into e_list_append, since it does
-	the copy for us.
-	(check_schema_support): don't initialize supported_fields list
-	here, since there's a gross case where the programmer/user can
-	bring up the contact editor before the connection stuff is
-	finished, and we don't want to crash.
-	(pas_backend_ldap_init): move it here to we can guarantee it's
-	there. (bug #6546).
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): don't access source->auth
-	if source == NULL (bug #7086).
-
-2001-08-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,
-	backend/ebook/e-book.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Changed get_card to be asyncronous.
-
-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed
-	these to deal with the new get_card functionality.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/select-names/e-select-names.c: Mark a string for translation.
-	* This fixes bug #7052
-	* printing/e-contact-print.h: Add headers to make it stand on itw own.
-	* printing/e-contact-print.c: Marked some strings for translation.
-	* printing/e-contact-print-envelope.c: Same here.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):
-	Remove single- or double-quotes from names before sticking them
-	into the addressbook. (Bug #6499)
-
-	* gui/component/addressbook.c (addressbook_query_changed):
-	Properly handle "Category is" queries by checking the search bar
-	suboption.
-	(addressbook_factory_new_control): Attach subitems corresponding
-	to all wombat categories to the "Category is" ESearchBarItem.
-
-	* gui/component/addressbook.c: Set the ESearchBarItem
-	subitems explicitly to NULL.
-
-2001-08-10  Anna Marie Dirks <anna@ximian.com>
-	 * gui/component/select-names/select-names.glade: did a little
-	packing-magic to get the two tables at bottom of this dialog
-	to seem to line up. 
-
-	*gui/component/select-names/e-select-names.c: changed the title
-	of this dialog to "Select Contacts from Addressbook". 
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-        * gui/component/select-names/select-names.glade: redesigned
-        this dialog to fix bug #6815. 
-
-	*gui/component/select-names/e-select-names.c: connected the
-	widgets (or one of them anyway. clahey did the rest) for my
-	new and lovely glade file.
-	
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: remove passwd_cb.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	This change is dedicated to Jacob Berkman.
-	(e_select_names_text_model_insert_length): If the last character
-	we inserted was a "magic comma", remember its position.
-	(e_select_names_text_model_delete): If the last character we
-	inserted was a "magic comma", and if the next thing we do is to
-	hit backspace, delete both the comma and the extra whitespace we
-	added.
-	(e_select_names_text_model_init): Initialize our last magic comma
-	position.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Hook up some magic to
-	(basically) cardify an entry on focus-out.  (What we do is actually
-	more complicated than that.)
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): After we set an entry's text, try to
-	cardify it.  We need to do this so that (for example) reply
-	e-mails get properly cardified.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): Use e_select_names_model_append,
-	rather than manipulating lists directly.
-	(e_select_names_model_insert): Connect "changed" signal proxy for
-	added EDestination.
-	(e_select_names_model_append): Ditto.
-	(e_select_names_model_replace): Ditto, and disconnect signals for
-	replaced EDestination.
-	(e_select_names_model_delete): Ditto on the disconnection.
-	(e_select_names_model_delete_all): Ditto.
-	(e_select_names_model_cardify): Added.  Try to cardify a specified
-	EDestination.
-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending
-	cardification of a single EDestination.
-	(e_select_names_model_cardify_all): Added.  Cardify all of the
-	EDestinations in the model.
-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any
-	and all pending cardifications.
-
-	* backend/ebook/e-destination.c (e_destination_class_init): Added
-	"changed" and "cardified" signals.
-	(e_destination_freeze): Added (static).
-	(e_destination_thaw): Added (static).
-	(e_destination_clear_card): Reset allow_cardify and
-	cannot_cardify, cancel any pending cardifications, and emit the
-	"changed" signal.
-	(e_destination_clear_strings): Emit the "changed" signal.
-	(e_destination_clear): Do freeze/thaw to prevent multiple signal
-	emissions.
-	(e_destination_set_card): Check that the card we are setting is
-	not equal to the current card, and emit the "changed" signal if we
-	are actually changing.
-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.
-	(e_destination_set_name): Emit "changed" signal, if necessary.
-	(e_destination_set_email): Emit "changed" signal, if necessary.
-	(e_destination_set_html_mail_pref): Emit "changed" signal, if
-	necessary.
-	(use_card_cb): If we've just loaded/set the ECard, emit the
-	"changed" signal.
-	(e_destination_set_raw): Emit "changed" signal, if necessary.
-	(e_destination_allow_cardification): Added.
-	(e_destination_set_allow_cardification): Added.
-	(e_destination_cardify): Added.  Tries to automatically convert
-	a string-based EDestination to one based on an ECard.
-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.
-	(e_destination_cancel_cardify): Added.  Cancels any pending
-	cardifications.
-	(e_destination_xml_decode): Added freeze/thaw.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A
-	canned simple query for nicknames.
-
-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given
-	a card and an string containing an email address, return the index
-	number of the address inside of the card, or -1 if the address is
-	not found.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] 
-	
-	* gui/component/addressbook.c (book_open_cb): create our own
-	dialog that prompts for both the email address and the password.
-	the email address is stored in the source and filled in for the
-	user after the first time they enter one and press OK.
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): has a
-	return value, not a int* parameter.
-	(create_ldap_folder): new function, we can create ldap servers
-	from the File->New->Folder menu item now.
-	(register_storage): hook up the "create_folder" signal.
-	(addressbook_storage_init_source_uri): remove the file case, we
-	only build ldap uris here.
-	(load_source_data): remove the file source stuff, and handle
-	"emailaddr".
-	(save_source_data): call ldap_source_foreach directly.
-	(addressbook_source_free): remove file source stuff.
-	(addressbook_source_copy): same.
-
-	* gui/component/addressbook-storage.h: get rid of all the file
-	source stuff from AddressbookSource, since this is only being used
-	for ldap servers.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): look up the ldap
-	entry based on the provided email address and use the resulting
-	DN/passwd to authenticate.
-
-	* gui/component/addressbook-config.c: pretty much gutted to make
-	it work with the new UI.
-
-	* gui/component/addressbook-config.glade: new version from anna.
-	
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width
-	on all addressbook columns to 75.  Fixes Ximian bug #2773.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark
-	the dialog as changed so the save button is immediately available.
-
-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once
-	we save reset the change flag to false if we aren't closing the
-	dialog.
-	(card_added_cb): same.
-	(e_contact_editor_class_init): add a "changed" arg.
-	(e_contact_editor_set_arg): add setter for "changed".
-	(e_contact_editor_get_arg): add getter for "changed".
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better
-	to assume that we can write to the local addressbook than that we
-	can't write to it :)
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):
-	call e_pixmap_update so we can use the same save/save-as pixmaps
-	as the contact editor.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new
-	function, used by the context menu.
-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top
-	of the menu.  also, disable "Delete" if the addressbook isn't
-	writable.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,
-	and ), as per rfc2254.
-	(func_contains): escape the string.
-	(func_is): same.
-	(func_beginswith): same.
-	(func_endswith): same.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
-	since Envelope printing is disabled for 1.0.	
-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Removed "Print
-	Envelope" menu item.
-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
-	this HAVE_LDAP.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): set the title of the window to
-	"Advanced Search".
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): pass view->view instead
-	of the EBook.
-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
-	(addressbook_search_option_items): add "Advanced..." here.
-	(addressbook_query_changed): add special handling for Advanced...
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add EAddressbookView and remove the
-	model/adapter fields.  Also fix prototype of
-	e_addressbook_search_dialog_new.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_class_init): get rid of
-	set_arg/get_arg.
-	(button_press): set the query on the EAddressbookView, and always
-	close the dialog.
-	(e_addressbook_search_dialog_init): get rid of the minicard view,
-	and pack the other widgets accordingly.
-	(e_addressbook_search_dialog_new): pass EAddressbookView instead
-	of EBook.
-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #5066 ]
-	* gui/component/addressbook-storage.c (remove_ldap_folder): new
-	function, remove the source.
-	(register_storage): connect to the "remove_folder" signal so we
-	know when to remove the folder.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use
-	g_strcasecmp since ldap attribute names are not case sensitive.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): make sure we update the changed
-	state if a successful drop happens.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make the OK button the keyboard default
-	instead of Cancel.  Bug #4942.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor
-	(e_book_unqueue_op): use e_book_op_free
-	(e_book_do_response_create_card): ditto
-	(e_book_do_response_generic): ditto
-	(e_book_do_response_get_cursor): ditto
-	(e_book_do_response_get_view): ditto
-	(e_book_do_response_get_changes): ditto
-	(e_book_do_response_open): ditto
-	(e_book_do_response_get_supported_fields): ditto
-
-2001-08-05  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): set
-	op->listener to NULL to catch possible use of freed op
-	(e_book_do_response_get_changes): ditto
-
-	* backend/ebook/e-book-view-listener.c
-	   (e_book_view_listener_check_queue): this callback could be (and
-	   indeed is) called from signal emited above, 
-	   signal handler could call e_book_view_listener_stop, so we need to check
-	   if idle is still set and if not we don't want to unref again
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so
-	that if there's one less match than possible compares are
-	considered more VAGUE.  Fixes Ximian bug #3400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check for storage != NULL
-	here.  This shouldn't come up unless addressbook has crashed
-	previously within this session of evolution, but this is just a
-	bit of insurance.  Fixes Ximian bug #3699.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the
-	criteria of whether the first part of each iteration matched or
-	the second one did.  Before it got it wrong sometimes and caused
-	the pointer to jump off the end of the array.  Fixes Ximian bug
-	#4674.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Update
-	for EvolutionStorage API changes.
-	(addressbook_storage_add_source): Ditto.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this
-	change the query based on which letter is clicked.  Fixes Ximian
-	bug #2202.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Fixed warnings here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(hash_cleanup_fn): Removed this unused function.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
-	fill_in_info): Made the list of E_CARD_PHONE types in
-	phone_correspondences more complete by adding the new 5
-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some
-	types (E_CARD_PHONE_HOME will actually match
-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card
-	and fill_in_info search for an exact match in the list of
-	phone_correspondences and then look for a partial match.  Got rid
-	of not going forward when doing a remove from an EList since EList
-	handles this case automatically.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for
-	assistant, callback, radio, telex, and ttytdd.
-
-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):
-	Handle the new E_CARD_PHONE types.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/Makefile.am (ecpsdir): Add camel dependency.
-
-	* gui/component/Makefile.am: Add camel dependency.
-
-	* backend/ebook/Makefile.am: Add camel dependency.
-
-	* gui/component/addressbook-factory.c (main): Properly init camel.
-
-	* backend/ebook/e-destination.c (e_destination_clear_strings):
-	Clear ->raw.
-	(e_destination_is_empty): We aren't empty if ->raw is set..
-	(e_destination_set_raw): Replaces e_destination_set_string.
-	(e_destination_get_name): Use camel's parser to extract the name
-	from ->raw.
-	(e_destination_get_email): Use camel's parser to extract the email
-	address from ->raw.
-	(e_destination_get_address): Use camel to produce properly quoted,
-	RFC-compliant addresses.  Thanks camel! (Bug #5860)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Always append an e-mail address, as long as it
-	doesn't have one already at it's beginning or end.  Don't limit
-	self to just emailifying entries tied to cards with multiple
-	addresses.  (I didn't really want to do this, but people seem to
-	like keeping multiple cards for the same person, and other
-	solutions (like scanning all matches for duplicate names, and only
-	emailifying those) just seemed like way too much work for such a
-	limited payoff.)
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	s/e_destination_set_string/e_destination_set_raw/.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"
-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug
-	#5558)
-	(popup_menu_nocard): Ditto.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Removed some extra padding and pack the addressbook view into a
-	frame with inward shadowing, just because it looks prettier.
-
-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,
-	Save As, and Print icons for the menus and toolbar.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs
-	here.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,
-	e_addressbook_view_send, e_addressbook_view_send_to): New
-	functions to allow outside users to cause the addressbook to save,
-	send, or send a message to its selection.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/.cvsignore: Removed this file from this unused
-	directory.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Added file-exists.glade.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists),
-	gui/contact-editor/file-exists.glade: Added a dialog to ask the
-	user whether to replace an already existing file.  Mostly from a
-	patch by Jos Dehaes.  Fixes Ximian bug #2231.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Removed thrash checking code
-	here since thrashing shouldn't happen now that we've cleaned this
-	up some.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly
-	handle cases where construction fails.
-
-2001-07-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c: Added #include
-	<e-util/e-path.h>.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	Convert translated string to UTF8 before calling put_html.
-
-2001-07-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_do_query): Properly handle the case
-	where our "cleaned" completion is the empty string.  This happens,
-	for example, if the query text is the string "\"".  (Bug #5610).
-
-	* backend/ebook/e-destination.c (e_destination_get_address_textv):
-	Reassure fejj that I'm not doing something stupid here.
-	(e_destination_get_address): Fix address quoting.  This is a
-	stop-gap measure until I can change this code to use Camel's
-	superior address-handling routines.  (Also Bug #5610)
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Fix a
-	return value bug, to make it so if it fails to load an
-	addressbook-sources.xml file (either a parse error or it doesn't
-	exist for example), it deregisters the storage.
-	(register_storage): Don't make a storage for users who don't have
-	LDAP support built in.  Bug #1950.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* addressbook/gui/component/addressbook-factory.c: Fix crashes
-	when gtkhtml is compiled with gconf support
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Tidy ldadds
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a
-	small, stupid mistake; use e_select_names_model_get_textification
-	for the getter for "text".
-
-	* backend/ebook/e-card.c: Removed some debugging chatter.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Store the completion
-	handler in the entry's object data.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added support for getting "destinations"
-	and "allow_contact_lists" properties.
-	(entry_set_property_fn): Added support for setting "destinations"
-	and "allow_contact_lists" properties.
-	(impl_SelectNames_get_entry_for_section): Added definitions for
-	"destinations" and "allow_contact_lists" properties.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_get_match_contact_lists): Added.
-	(e_select_names_completion_set_match_contact_lists): Added.
-	Controls whether contact lists are offered as options during
-	completion.
-	(book_query_process_card_list): Check if match_contact_lists
-	is set before (duh!) matching on a contact list.
-	(e_select_names_completion_init): Set match_contact_lists
-	to TRUE by default.
-
-2001-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_contains): change the way
-	x-evolution-any-field is converted to an ldap query.  it used to
-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).
-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more
-	efficient (both in the building, and on the server side no doubt).
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup
-	the results of e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(e_select_names_popup): Check that our destination isn't empty
-	before building our popup. (Bug #5250)
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Made
-	argument const.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: Added checks
-	for all of the args of the exposed functions, so that
-	we won't crash on bad inputs.  (Related to bug #4856.)
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to
-	"Add Anyway".
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added
-	fallbacks for the name in the case of an e-card, to avoid the
-	"nameless contact" bug.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic
-	here too for when we modify an already shown card.
-
-	* gui/contact-list-editor/e-contact-list-model.c: make
-	parent_class static, just to be anal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(remove_entry_cb): removing entries changes the list, so flag it.
-	(table_drag_data_received_cb): restrict cards we add to lists to
-	be non-list cards.
-	(extract_info): clear out the email list in the card before we
-	repopulate it from the contact list model.
-	(fill_in_info): set the checkbox to active/inactive based on
-	thecard.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call
-	widget_changed.
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(widget_changed): new function that we can either call or set as a
-	signal to change the "changed" flag on the dialog.
-	(set_entry_changed_signals): connect lots of "changed" signals on
-	widgets to widget_changed.
-	(add_lists): connect "changed" to widget_changed.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check if
-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,
-	which it should never do.  If it does, print a warning in a dialog
-	and try to recover w/o crashing.  (Bug #5193)
-
-2001-07-24  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't
-	stop the idle_queue and unref from here, since this might be
-	called from inside e_book_listener_check_queue, and we don't want
-	to return to that function with the listener having been
-	destroyed.
-	(e_book_listener_check_queue): Don't exit early if the queue is
-	stopped. Proceed through the check if the queue is NULL (which is
-	must be if the queue is stopped), and then reach the existing code
-	to remove the idle handler. Combined with the above, this fixes
-	ximian #4485 (again). This is not a plot to boost my
-	showstopper-bugfixing count by fixing the same bug over and over
-	again.
-
-2001-07-23  Dan Winship  <danw@ximian.com>
-
-	Re-fix for my 07-18 not-quite-fix.
-
-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like
-	EBookViewListener.
-	(e_book_listener_check_queue): Don't emit signals if the listener
-	is stopped.
-	(e_book_listener_queue_generic_response, etc): Don't queue
-	responses if the listener is stopped.
-	(e_book_listener_stop): Flush the queue and stop queue/emitting
-	further responses.
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous
-	change and call e_book_listener_stop() instead.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): When removing an idle handler, unref
-	the listener as well, since e_book_view_listener_queue_response
-	will have ref'ed it.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): Add a
-	@type arg.  If the type is not "contacts", report an
-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove
-	`g_print()' debugging messages.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make the "contacts"
-	folders user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	[ patch contributed by Jos Dehaes <jos.dehaes@bigfoot.com> ]
-	
-	* gui/component/addressbook-storage.c (register_storage): new
-	function, register our evolution_storage.
-	(addressbook_storage_setup): remove storage registration from
-	here.
-	(load_source_data): register the storage here before we load
-	addressbook-sources.xml, and deregister it if there are no sources
-	listed.
-	(addressbook_storage_remove_source): unregister the storage if the
-	list of sources hits 0 length.
-
-2001-07-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's
-	queue before unreffing it to ensure that it doesn't emit any more
-	"responses_queued" signals after the EBook is destroyed.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,
-	e_book_listener_queue_response, e_book_listener_new): Use
-	bonobo_object_ref/unref rather than gtk_object_ref/unref.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response, e_book_view_listener_new):
-	Likewise.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list
-	of cards that match our query using the avoid list here, instead
-	of using the avoid list in the query itself, since ldap can't
-	handle that.
-	(use_common_book_cb): remove the block of code including the avoid
-	list in the query sent to wombat.
-
-2001-07-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"
-	        and  #4554 - general ldap search crash ]
-	
-	* backend/pas/pas-backend-ldap.c (func_contains): the length of
-	the big query string needs to take into account the length of the
-	footer as well as the header - fix random memory corruption here.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	list can be NULL, specifically if there's a parsing error in the
-	sexp, so deal with it.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): Hold a reference to our
-	listener while the idle function is active.
-	(e_book_view_listener_check_queue): Only unref the listener when
-	the idle function is finished.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Instead of replacing section->model with
-	source, copy source onto section->model with
-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the
-	stuff related to ETextModels, because it doesn't make any sense to
-	me, and everything appears to work without it.
-	(Die bug #2059.  Die! Die! Die!)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_overwrite_copy): Added.  Copies the contents
-	of one ESelectNamesModel onto another.
-
-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument
-	const.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): Removed
-	old, broken code and annoying g_messages.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_response): Hold a reference to the listener
-	while the idle function is active.
-	(e_book_listener_check_queue): Only release our reference to the
-	listener when the queue is empty.  These two changes fix a race
-	condition, since the listener could be unrefed while the listener
-	was still active. (Seems to fix bug #4485)
-
-2001-07-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade,
-	gui/merging/e-card-duplicate-detected.glade,
-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
-	printing/e-contact-print.glade: Patch from Taylor Hayward
-	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
-
-2001-07-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added addSectionWithLimit to the SelectNames interface.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_add_section_with_limit): Added.  Implements
-	addSectionWithLimit.
-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.
-	(init): Listen for "changed" signals from our manager.
-	(manager_changed_cb): Notify our listeners if we get a changed
-	signal from our manager.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added a "changed" signal".
-	(section_copy): Propogate the signal connection.
-	(section_free): Disconnect the changed handler.
-	(e_select_names_manager_add_section_with_limit): Connect to the
-	new section's model, listening for changes.
-	(e_select_names_manager_activate_dialog): Connect to the "working
-	copy" model, listening for changes.
-	(e_select_names_manager_add_section_with_limit): Added.
-	(e_select_names_manager_add_section): Changed to just be a special
-	case of e_select_names_manager_add_section_with_limit.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_set_limit): Added.  Allows a max number of
-	names allowed in the model.
-	(e_select_names_model_get_limit): Added.  Returns the limit.
-	(e_select_names_model_at_limit): Added.  Returns TRUE if the
-	model is "full".
-	(e_select_names_model_insert): Check that we aren't at the
-	limit before inserting.  Silently return if we are.
-	(e_select_names_model_append): Check that we aren't at the
-	limit before appending.  Silently return if we are.
-
-2001-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]
-	
-	* gui/component/addressbook-config.c (addressbook_dialog_apply):
-	call addressbook_storage_write_sources here after we're done
-	rebuilding them.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): don't write the source file
-	here.
-	(addressbook_storage_add_source): same.
-	(addressbook_storage_remove_source): same.
-	(addressbook_storage_write_sources): new function, write the
-	source file out.
-	(addressbook_source_copy): g_strdup the binddn so we don't end up
-	free'ing it multiple times thanks to copies freeing theirs.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	address_storage_write_sources.
-
-2001-07-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just 
-	use the default directory. Use the directory that is passed into the
-	load file function.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_string):
-	Commented out some unused variables and labels.
-	(e_destination_importv): Check for the xml not parsing correctly
-	and just return NULL here.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_import_destinationv): Handle a NULL destv
-	here.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a
-	call to e_table_view_to_model_row here.
-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,
-	e_addressbook_view_can_copy): If the selection model is NULL here,
-	return NULL (this was done before in a g_return_val_if_fail which
-	is only conditionally included.)
-
-2001-07-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Changed Company to
-	Organization here.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/Makefile.am: add ldap cflags
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_xml_decode):
-	Oops. I introduced my own bug, accidently set `email' to a
-	g_free'd pointer - eek!
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_importv): Optimized
-	the same way I optimized g_strsplit. If you use a GPtrArray
-	instead of a linked list, you save yourself from having to iterate
-	through the list an extra 3 times.
-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!
-	e_utf8_xml1_decode something which is already in UTF-8 or you'll
-	corrupt it!! I smack thee who hath done this evil deed!
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):
-	Check for no extension. Actually same as Jason's fix below :) but
-	also check the file contents.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-config.glade: add accelerators,
-	taylor's patch
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):
-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Added
-	some comments for clarity and fixed a pretty noticable bug with
-	how right click "Remove" was deleting more than it should with
-	consecutive runs.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: assign OID's to the schema
-	entries, and add schema support for contact lists.
-
-2001-07-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
-	bf->priv->file_db before calling do_create.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Fixed order
-	of arguments to evolution_shell_component_new.
-
-2001-07-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Check that str isn't
-	the empty string before doing an insert.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): We were
-	being too smart for our own good here, and causing problems for
-	the completion code... (bug #4253, bug #4255, bug #4280)
-	(e_destination_set_name): Clear any cached address.
-	(e_destination_set_email): Clear any cached address.
-	(e_destination_get_address): Handle the cases where the name
-	contains some e-mail information.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a
-	string for translation. Also add the neccesary includes to make
-	_() macros work.
-	
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard.c (add_field): Detect the embedded
-	EDestination XML, and convert it to a nice-looking e-mail address.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to
-	reflect changes to EContactListModel.  (Yeah, this is vague,
-	but the changes are _really_ obvious and boring.)
-
-	* gui/contact-list-editor/e-contact-list-model.c: Revamped
-	to make everything an EDestination, rather than storing either
-	cards or strings.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Use
-	e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use e_destination_get_name and
-	e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Use e_destination_get_name instead of
-	e_card_name_to_string.
-	(quick_add_cb): Use e_destination_get_address.
-	(popup_menu_nocard): Use e_destination_get_name.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_changed): Removed obsolete debugging code.
-	(e_select_names_model_get_textification): Use e_destination_get_textrep.
-	(e_select_names_model_get_address_text): Use e_destination_get_address.
-	(e_select_names_model_get_string): Use e_destination_get_textrep.
-	(e_select_names_model_replace): Use e_destination_get_textrep.
-	(e_select_names_model_name_pos): Use e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Match only if this isn't a contact list.
-	(match_email): Match only if this isn't a contact list.
-	(match_name): Do the right thing in the case of a contact list.
-	(book_query_process_card_list): Don't construct a match for
-	each possible e-mail address if this is a contact list.
-
-	* backend/ebook/e-destination.c: Major-league de-crufting and
-	rationalization, combined with lots of hacks to make things work
-	properly with contact lists.
-	(e_destination_copy): Copy contact list info.
-	(e_destination_clear_card): Clear contact list info.
-	(e_destination_is_empty): If we contain a contact list, we aren't
-	empty.
-	(e_destination_set_card_uri): Added.  Allows us to set a
-	destination by card URI.
-	(e_destination_set_name): Allows the contact's name only ("Jane
-	Smith") to be set.
-	(e_destination_set_email): Allows the contact's e-mail only
-	("jane@assbarn.com") to be set.
-	(e_destination_set_string): Takes a free-form string containing a
-	contact's name and/or e-mail, and tries to do the right thing with
-	it.
-	(e_destination_contains_card): Renamed.  Used to be
-	e_destination_has_card.
-	(e_destination_from_card): Added.  Returns TRUE if the
-	EDestination comes from either a ECard (which we presently hold)
-	or is specified by an ECard URI.
-	(e_destination_use_card): Allows an EDestination's ECard to be
-	accessed, via a callback.  If we only are holding the URI, the
-	card will be loaded and stored in the EDestination.
-	(e_destination_get_name): Returns the name only ("Jane Smith"), or
-	NULL.
-	(e_destination_get_email): Returns the email only
-	("jane@assbarn.com"), or NULL.
-	(e_destination_get_address): Added.  Returns a "full address" if
-	both the name & e-mail are available ("Jane Smith
-	<jane@assbarn.com>"), or just the e-mail if the name is unknown
-	("jane@assbarn.com>").  If the destination is a contact list,
-	returns a comma-separated list of addresses.
-	(e_destination_get_textrep): Added.  Returns a "text
-	representation" of the EDestination.  This is what is now
-	displayed for completed, "cardified" destinations in addressbook
-	entries.
-	(e_destination_is_evolution_list): Check to see if this
-	destination is for a contact list.
-	(e_destination_xml_encode): Added.  Build an XML data structure
-	representing an EDestination.
-	(e_destination_xml_decode): Added.  Parse an XML data structure,
-	constructing an EDestination.
-	(e_destination_export): Added.  Returns a null-terminated string
-	containing an XML representation of the EDestination, with
-	newlines and excess whitespace removed.
-	(e_destination_import): Added.  Parses a string containing an XML
-	representation of an EDestination.
-	(e_destination_exportv): Added.  Returns a null-terminated string
-	containing an XML representation of a collection of EDestinations,
-	with newlines and excess whitespace removed.
-	(e_destination_importv): Added.  Takes an XML representation of a
-	collection of destinations, parses it, and returns a vector of
-	EDestinations.
-
-	* backend/ebook/e-card.c (e_card_duplicate): Copy the ->book
-	pointer.
-	(e_card_get_id): Check that the argument is valid.
-	(e_card_set_id): Check that the argument is valid.
-	(e_card_get_book): Added.  Return the EBook the ECard came from.
-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,
-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL
-	if the EBook URI or the ID are unknown/not set.
-	(e_card_get_vobject): If we have the URI, use it as the
-	VCUniqueStringProp, rather than just the ID.  This is a hack to
-	make DnD work properly.
-	(parse_id): Detect if the unique ID we've been passed is a URI or
-	just a plain card ID, and do the right thing in either case.
-	(e_card_uri_extract_book_uri): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_uri_extract_card_id): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its
-	URI.
-
-	* backend/ebook/e-book-view.c: Added a EBook * to the
-	_EBookViewPrivate struct.  This is meant to contain the EBook the
-	EBookView is associated with.
-	(add_book_iterator): Added.  A convenience function for attaching
-	the EBook to a GList of cards (if no EBook is already stored).
-	(e_book_view_do_added_event): Record the EBook in the added
-	ECards.
-	(e_book_view_do_modified_event): Record the EBook in the modified
-	ECards.
-	(e_book_view_set_book): Added.  Stores a pointer to the
-	EBookView's "parent" EBook.
-	(e_book_view_init): Init book_view->priv->book to NULL.
-	(e_book_view_destroy): Unref book_view->priv->book.
-
-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.
-	(e_book_unqueue_op): Removed debugging spew.
-	(e_book_do_response_get_view): Attach the current EBook to the
-	created EBookView.
-	(e_book_do_response_get_changes): Attach the current EBook to the
-	created EBookView.
-	(e_book_load_uri): Save a copy of the uri in the EBook.
-	(e_book_get_uri): Added.  Just returns book->priv->uri.
-	(e_book_get_card): Attach a pointer to the Ebook to the
-	newly-loaded ECard.
-	(e_book_add_card): Attach a pointer to the EBook to the
-	newly-added ECard.
-	(e_book_commit_card): Attach a pointer to the EBook to the
-	committed ECard.
-	(e_book_init): Initialize the uri to NULL.
-	(e_book_destroy): Free the uri string on destruction.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	Removed.  [It was just bogus testing code for the right-click menu
-	populating interface in the shell].
-	(factory_fn): Pass NULL as the PopulateContextMenuFn.
-
-2001-07-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	Added some accelerators, padding, and a "memebers" frame;
-	also fixed spacing and growth behaviour of this dialog. 
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory
-	leak here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Set
-	info->avoid = NULL.  This shouldn't make a difference, but it
-	can't hurt.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Check if the row is within our
-	table and return from this function as if the card is a standard
-	card, not a list.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): 
-	added $(BONOBO_CONF_LIBS) to get it to compile.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	$(BONOBO_CONF_LIBS).
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories),
-	gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Switched to an ECategoriesMasterListWombat instead of an
-	ECategoriesMasterListArray here.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
-	builddir compile fix.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same.
-
-	* gui/search/Makefile.am (INCLUDES): Same.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Turned off wombatification of the categories master list here.
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	use ECARD_UID_LINK_PREFIX.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.
-
-	* backend/ebook/e-destination.h: add prototype for
-	e_destination_importv_list.
-
-	* backend/ebook/e-destination.c (e_destination_importv_list): new
-	function, take an ECard corresponding to an address list and
-	resolve any linked cards, returning an EDestination vector.
-
-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,
-	since we need to use it in a few places.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	related_contacts field.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_import_destinationv): Added this function.
-
-	* gui/contact-editor/contact-editor.glade: Replaced the entry here
-	for related contacts with a table which is filled in in the C code.
-
-	* gui/contact-editor/e-contact-editor.c,
-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
-	names entry here for the related contacts field.
-
-	* gui/widgets/Makefile.am: Removed all the test programs here
-	since there are circular dependencies now.
-
-2001-07-01  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Fall
-	back to use the name field if all else fails (which can happen
-	with imported EDestinations).
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
-	"recipient not specified" bug --- we were not correctly checking
-	for whether or not an EDestination was actually empty.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.
-	Somewhere in the code (somewhere in the minicard stuff) this can
-	be called with a NULL arg, which was causing crashes.
-	(e_card_evolution_list_show_addresses): Check args.
-
-	* backend/ebook/e-destination.c (build_field): I was accidentally
-	comparing characters and strings here, and didn't see the compiler
-	warning.  Fixed.
-	(e_destination_exportv): Don't export any empty destinations.
-	(bug#3825).
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked
-	strings for translation.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/merging/e-card-merging.c (match_query_callback): Make the
-	standard for considering two cards to be match stricter.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Use the card's use-score to set the match's
-	sort_major value.
-	(match_name): Removed obsolete code.
-	(e_select_names_completion_begin): Added (double) cast to make
-	match->score calculation come out properly.
-
-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and
-	X-EVOLUTION-USE-SCORE to attribute_jump_array.
-	(e_card_get_today): Added.  A convenience routine for getting
-	today's date and putting it in a GDate.
-	(e_card_get_use_score): Added.  Compute the current, time-decayed,
-	use-score for the card.
-	(e_card_touch): Increment the use-score by one; update the last
-	used date.
-	(e_card_date_to_string): Added as a convenience routine, getting
-	rid of some code duplication.
-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and
-	X-EVOLUTION-LAST-USE.
-	(parse_last_use): Added.
-	(parse_use_score): Added.
-	(e_card_class_init): Added args for last-use and use-score.
-	(e_card_get_arg): Added handlers for last-use and use-score.
-	o
-	(e_card_set_arg): Added handlers for last-use and use-score.
-
-	* backend/ebook/e-destination.c: Added pending_card_id to
-	EDestinationPrivate struct.
-	(e_destination_copy): Copy the pending_card_id.
-	(e_destination_is_empty): Check for a pending_card_id.  We are
-	non-empty if we have one.
-	(e_destination_clear_card): Clear pending_card_id.
-	(e_destination_set_card): Clear pending_card_id.
-	(e_destination_has_pending_card): Added.
-	(e_destination_use_card): Added.  An asynchronous way to load a
-	pending card and then apply a callback to it.
-	(build_field): Be paranoid, map our special characters to '_'.
-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a
-	hard-wired array size.  Added the "card" entry.
-	(e_destination_import): Fix bug in handling of the "name" field.
-	Process the "card" field.
-	(e_destination_touch): "Touch" and commit the ECard corresponding
-	to the e-mail address in the destination.  (A query against the
-	local addressbook is actually performed, in case the destination
-	isn't cardified.
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the
-	way E_CARD_MATCH_FOO results are mapped to comparison results.
-	Report better matches when the family name is matched.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Added a search field to the query here.
-	(e_select_names_init): Update the query on a number of signals here.
-
-	* gui/component/select-names/e-select-names.h: Added search_entry
-	here.
-
-	* gui/component/select-names/select-names.glade: Added the search
-	entry here.  Added some labels.  Removed the update button.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_option_activated): Change the uri here to have
-	addressbook.db at the end.
-
-	* gui/component/select-names/select-names.glade: Changed the name
-	of the folder option menu here to match the name used in the code.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Change the query when the "Update List" button is pushed.
-
-	* gui/component/select-names/e-select-names.h: Removed
-	currently_selected field.  Added categories_entry field.
-
-	* gui/component/select-names/select-names.glade: Added "Update
-	List" button.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR
-	define.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and
-	pixbuf size.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf
-	and its size.
-	(e_minicard_destroy): unref the list_icon_pixbuf.
-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.
-	(e_minicard_resize_children): clip the header_text by the
-	list_icon, and place the list_icon in the right spot.
-	(remodel): show the list_icon if we're a list, and hide it
-	otherwise.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up
-	list editor for lists, contact editor otherwise.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to
-	GtkOjbect, since it can be either a contact editor or contact list
-	editor.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): don't allow editting of any fields
-	except the name and file_as for lists.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient
-	e-table include, and add include for contact-editor so we can
-	reuse the confirm_delete dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): remove prototype for
-	e_contact_list_editor_close, since the function no longer exists.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_deleted_cb): new function, emit our "list_deleted" signal.
-	(delete_cb): new function, called from the Delete toolbar item.
-	(e_contact_list_editor_raise): flesh out function.
-	(extract_info): "evolution_list" => "list".
-	(fill_in_info): same.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): add support for
-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.
-	(parse_list_show_addresses): new function, parse the boolean
-	X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(e_card_class_init): add args for "list" and
-	"list_show_addresses".
-	(e_card_set_arg): add support for list and list_show_addresses.
-	(e_card_get_arg): same.
-	(e_card_init): init list and list_show_addresses.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_row_count): track storage change - we're only using
-	1 array now.
-	(contact_list_value_at): same.
-	(contact_list_model_destroy): same.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_card): same.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): new function - just free/unref
-	all existing rows.
-	(e_contact_list_model_get_email): new function, returns the
-	alloc'ed string containing either an email address or an encoded
-	ECardId.
-
-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2
-	separate arrays for email and cards, and store them in the same
-	array.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add the visible_addr_checkbutton widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(visible_addrs_toggled_cb): new function.
-	(e_contact_list_editor_init): connect to "toggled" on
-	visible_addrs_checkbutton.
-	(file_save_cb): new function.
-	(tb_save_and_close_cb): new function.
-	(verbs): add Save and Save & Close.
-	(list_added_cb): new function.
-	(list_modified_cb): new function.
-	(save_card): new function - we do *not* use e_card_merging_* calls
-	here.
-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"
-	getter.
-	(e_contact_list_editor_set_arg): same for the "card" setter.
-	(extract_info): new function.
-	(fill_in_info): new function.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add a
-	checkbutton at the bottom to determine whether to visibly include
-	mail addresses in mail sent to this list.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Oops.  Can't use the wombat
-	version of the master categories list yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove
-	counts were off in this function.
-	(remove_card, modify_card): Moved the table notifications around a
-	bit here.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade
-	(e_select_names_create_categories): Added a categories combo here.
-	It's not used yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/search/addresstypes.xml: Added category searching to the
-	advanced search dialog here.
-	
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Added
-	category searching to the file backend.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Added
-	category searching to the search bar.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
-
-2001-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: change layout
-	slightly, the icon no longer pushes everything to the left, and
-	make the buttons on the right smaller and more in line with the
-	other widgets.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): return the SimpleAndString->string
-	instead of querying the ecardsimple.
-	(e_contact_list_model_init): initially allocate 10 of each type
-	(email and simple).
-	(e_contact_list_model_add_email): realloc if need be.
-	(e_contact_list_model_add_card): same, and initialize the string
-	displayed to be "[Name] [<email>]".
-	(e_contact_list_model_remove_row): change for SimpleAndString.
-	(contact_list_model_destroy): free our 2 arrays.
-
-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
-	and the SimpleAndString struct.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
-	Ximian.
-	(e_contact_list_editor_init): hook up d&d destination signals, and
-	un-#if 0 the delete_event signal.
-	(table_drag_motion_cb): new function.
-	(table_drag_drop_cb): new function.
-	(table_drag_data_received_cb): new function.
-	(file_close_cb): new function.
-	(verbs) uncomment the close verb.
-	(close_dialog): new function.
-	(app_delete_event_cb): new function.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
-	Ximian.
-
-2001-06-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Add a huge steaming pile of
-	code to handle the case of single-address merging.  In other
-	words, if you go to "harvest" an address by right-clicking on it
-	in the mail viewer, and you already have a closely-matching
-	contact (w/ a different e-mail address), this gives you the
-	option of editting that contact's e-mail addresses to add the
-	one you just clicked on.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): It is
-	amazing how much better things work when you don't try to
-	dereference the pointer you just freed.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
-	libecontacteditor.a.
-	(minicard_widget_test_LDADD): same.
-	(INCLUDES): same, for the includes.
-
-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
-
-	* gui/widgets/e-addressbook-util.h: correct path to
-	e-contact-editor.h, and add e-contact-list-editor.h.  Add
-	prototype for e_addressbook_show_contact_list_editor.
-
-	* gui/widgets/e-addressbook-util.c: remove #include
-	"e-contact-editor.h" (our header includes it.)
-	(added_cb): rename card_added_cb to this, and make it so it can be
-	reused in both the list and card cases.  remove the g_print too.
-	(modified_cb): same for modified case.
-	(deleted_cb): same for deleted case.
-	(editor_closed_cb): change first arg to GtkObject* so we can reuse
-	this for both list and card.
-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,
-	deleted_cb, and pass FALSE as user_data.
-	(e_addressbook_show_contact_list_editor): new function, same as
-	above but creating a contact-list-editor, and pass TRUE as
-	user_data.
-
-	* gui/component/e-address-popup.c: correct path to contact-editor.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/select-names/e-select-names-popup.c: same.
-
-	* gui/component/select-names/e-select-names-text-model.c: same.
-
-	* gui/component/addressbook.c (new_contact_list_cb): new function.
-	(update_command_state): update ContactNewList command.
-	(verbs): remove ViewAll from the toolbar from the verb list.  Add
-	ContactNewList.
-	(pixmaps): same for pixmaps.
-	
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new
-	path for contact-editor.
-	(INCLUDES): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor
-	  commit.
-
-	* gui/Makefile.am (SUBDIRS): add contact-editor.
-
-	* Makefile.am: (SUBDIRS): remove contact-editor.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): Renamed.  (The old name,
-	edit_contact_info_have_book_cb was a hold-over from before, when
-	we weren't using e_book_use_local_address_book.)
-
-	* gui/component/e-address-popup.c
-	(e_address_popup_schedule_refresh): A Added.  We now do the name
-	refreshes in an idle function, rather than in the setters.
-	(e_address_popup_set_free_form): Added.  Properly handle inputs of
-	the form "Foo <bar@zar.com>", extracting the name and e-mail
-	address.
-	(e_address_popup_set_name): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_set_email): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_name_only_matches): Temporary place-holder for
-	handling name-only matches.
-	(query_cb): If our initial query fails (and included e-mail
-	information), do a name-only query.  This is to handle the case of
-	adding new e-mail addresses to existing contacts.
-	(e_address_popup_query): Eliminated the "common_book" crap; using
-	e_book_use_local_address_book instead.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Make
-	sure that the ->avoid list gets properly freed.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): fix a refcounting
-	memleak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fix memory
-	leak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c: add prototype for
-	close_dialog to remove warnings.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): track
-	change to e_addressbook_show_contact_editor signature.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	add an entry for "Card ID already exists".
-	(e_addressbook_show_contact_editor): track the change to signal
-	names and e_contact_editor_new signature here.
-
-	* gui/widgets/e-addressbook-util.h: change
-	e_addressbook_show_contact_editor's signature to match
-	e_contact_editor_new more closely.
-
-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
-	up the simple mapping to plug a potentially sizeable memory leak.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): call
-	e_addressbook_show_contact_editor here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_have_book_cb): remove the get_supported_fields
-	stuff, since the contact editor handles it for us now, and call
-	e_addressbook_show_contact_editor.
-
-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.
-
-	* gui/component/addressbook.c (new_contact_cb): track change to
-	e_addressbook_show_contact_editor.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename
-	ce_book_found_fields to this, remove the fetching of fields (the
-	contact editor code handles that now.), and change the add_card
-	signal to card_added.
-	(card_added_cb): copied somewhat from merge_cb above.  we don't
-	need to do the merge here, just call the callback.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	track signal change.  add book arg, and is_read_only -> editable.
-	(wants_html_changed): if the card isn't already changed, flag it
-	as such (and update the commands.)
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(full_name_clicked): is_read_only -> editable.
-	(full_addr_clicked): same.
-	(card_added_cb): new function, emit our card_added signal, and
-	close the dialog if we're supposed to.  properly deal with error
-	status here.
-	(card_modified_cb): same, modulo card_added -> card_modified.
-	(save_card): actually call e_card_merging_book_{add/commit}_card
-	instead of using a signal.  Also, add a gboolean arg to tell
-	whether or not to close the dialog after saving the card.
-	(card_deleted_cb): new function, just emit our "card_deleted"
-	signal.
-	(delete_cb): actually call e_book_remove_card here, instead of
-	using a signal.
-	(tb_save_and_close_cb): call save_card with TRUE for should_close.
-	(e_contact_editor_init): init changed = FALSE;
-	(e_contact_editor_destroy): unref our book if we have one.
-	(e_contact_editor_new): new signature, set the "book" arg, and
-	call e_book_get_supported_fields here.
-	(supported_fields_cb): new function, show the contact editor.
-	(e_contact_editor_set_arg): initialize changed to FALSE when
-	setting the card (but *after*, since the changed callbacks will
-	set it to TRUE.)  also, call command_state_changed if editable
-	changes.  also handle setting "book".  oh, and is_read_only ->
-	editable.
-	(command_state_changed): new function - set the state of the
-	commands we care about.
-	(e_contact_editor_get_arg): add "book" handling, and is_read_only
-	-> editable.
-	(_phone_arrow_pressed): is_read_only -> editable.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-	(set_editable): rename set_read_only to this, and is_read_only ->
-	editable.
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor):
-	is_read_only -> editable, add a "changed" flag so we can sensitize
-	commands correctly, and add an EBook* arg to e_contact_editor_new
-	and to the EContactEditor struct.  Also, change all the signals to
-	past tense, and send the EBookStatus in them.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): is_read_only -> editable.
-	(e_contact_editor_address_set_arg): same.
-	(e_contact_editor_address_get_arg): same.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): same.
-	(e_contact_editor_fullname_set_arg): same.
-	(e_contact_editor_fullname_get_arg): same.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): same.
-
-	* contact-editor/Makefile.am: don't build contact-editor-test now,
-	until contact-editor gets moved to gui/ and we can more easily
-	depend on the e_card_merging_* calls.
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return
-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.
-
-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the
-	BookListener status enum.
-
-	* backend/ebook/e-book-types.h: add
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add support for
-	CardIdAlreadyExists.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,
-	removal of gtk_object_set_data() hacks, simplified by using
-	some of the newer ebook convenience routines, etc.
-	(ce_book_found_fields):
-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the
-	small changes in the contact editor API.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduit/address-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this
-	properly, using base and (objectclass=*).
-
-2001-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a
-	function call - call close_dialog instead of file_close_cb.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-component.c: Set the
-	"expoted_dnd_types" to NULL in the folder_types.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(search_override_check): Add a workaround for an EText bug.
-	(e_select_names_completion_begin): Fix up the match scoring in the
-	search_override case so the lines are offered in the correct
-	order.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/Makefile.am (glade_DATA): Added
-	e-card-merging-book-commit-duplicate-detected.glade here.
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Added this file.  The GUI for asking whether to commit a modified
-	card.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
-	(e_card_merging_book_commit_card): Added this function.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
-	e_card_merging_book_commit_card instead of e_book_commit_card here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Made e_card_simple_get_id return const char *.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
-	e_card_get_id return const char *.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
-	variable const here.  Added a break to make it slightly more
-	efficient.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
-	e_minicard_get_card_id return const char *.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle
-	the "id" property in searches.
-	(pas_backend_file_process_modify_card): Made id variable const
-	here.
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id
-	variable const here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled
-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving
-	e-book-listener.[ch] and e-book.c.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri,
-	e_book_get_supported_fields, e_book_authenticate_user,
-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,
-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made
-	it so that all of these functions queue their ops before calling
-	their CORBA functions.  This way, if the response is sent back
-	before the CORBA function returns there's no problem.  Added
-	e_book_unqueue_op so that the op could be unqueued if the CORBA
-	call fails.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h
-	(e_book_listener_unpop_response): Added this function to put a
-	response back into the queue.
-
-	* backend/ebook/e-book.c (e_book_check_listener_queue,
-	e_book_queue_op): Handle the case where the op hasn't been queued
-	yet when we get the response.  In this case we unpop the response.
-	Also, when queueing an op, we check to see if there are any
-	responses waiting.
-
-	* This change has been reverted.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h
-	(e_card_locate_match_full): Added this function to let you do
-	slightly more complicated searches.
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use
-	e_card_locate_match_full to check if the card exists in the book
-	it's being added to instead of in the default book.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Removed unused email variable.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null
-	terminate the strv here.
-	(e_card_locate_match): ref here instead of unref.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
-	card here.
-
-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
-	(INCLUDES): Added addressbook/gui/merging here.
-
-	* contact-editor/e-contact-quick-add.c (book_ready_cb),
-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),
-	gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_append_row), gui/widgets/e-addressbook-util.c
-	(add_card_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(book_open_cb): Use e_card_merging_book_add_card instead of
-	e_book_add_card here.
-
-	* gui/Makefile.am (SUBDIRS): Added merging.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD),
-	gui/widgets/Makefile.am (minicard_test_LDADD,
-	minicard_widget_test_LDADD): Added libecardmerging.a here.
-
-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
-	New addressbook library.
-
-	* gui/merging/e-card-duplicate-detected.glade: Glade file for
-	duplicate detected dialog.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
-	files for detecting duplicates before adding and putting up a
-	dialog if duplicates are found.
-
-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
-	here.
-
-2001-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
-	the gtk_widget_show call...
-	(e_contact_editor_show): and put it here.
-
-	* contact-editor/e-contact-editor.h: add prototype for
-	e_contact_editor_show.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): call
-	e_addressbook_show_contact_editor.
-	(card_modified_cb): call e_addressbook_error_dialog if status !=
-	SUCCESS.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
-	e_addressbook_show_contact_editor.  also, use card_modified_cb as
-	the commit_card callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): clean
-	this area up alot, call e_addressbook_show_contact_editor.
-	(card_deleted_cb): call e_addressbook_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(card_modified_cb): new function, call e_addressbook_error_dialog
-	if the status != SUCCESS.
-	(addressbook_set_value_at): use card_modified_cb as the callback
-	for e_book_commit_card.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
-	e-addressbook-util.[ch].
-
-	* gui/component/addressbook.c (new_contact_cb): use
-	e_addressbook_show_contact_editor here.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Remove
-	references to ECategoryMasterListWombat.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Make
-	this work when multiple names are selected then right
-	click->Remove.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
-	in.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
-	pas_backend_file_process_remove_card,
-	pas_backend_file_process_modify_card,
-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
-	them.
-	(pas_backend_file_build_all_cards_list): Reindented.
-
-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
-	with a custom widget that creates an EDateEdit.
-
-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
-	of a GnomeDateEdit.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #655: SelectNames doesn't let you remove addresses after
-	 you add them)
-	
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): New function, provides a popup menu with
-	just "Remove" in it.
-	(remove_cb): New callback to do the remove.
-	(e_select_names_add_section): Attach the "right_click" signal to
-	the section_right_click_cb above.
-
-2001-06-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(completion_handler): Change the completion handler to use the
-	ECompletionMatch.
-
-	* gui/component/select-names/e-select-names-completion.c
-	General changes to convert for ECompletionMatch use.
-	(emailify_match): Use extra sort keys in ECompletionMatch to let
-	us ensure that the primary email address is always the first
-	option, the secondary comes second, etc.  There was no nice way to
-	do this previously.
-	(match_name): Removed code that adjusted score based on
-	similarities between the "real name" and the e-mail address.  It
-	seemed like a good idea at the time, but produced unexpected and
-	confusing results.
-
-2001-06-04  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Added.  Code for testing
-	if two ECards appear to pertain to the same contact (using loose
-	matching rules, as opposed to requiring exact equality) and to
-	query the addressbook for the "best match" to ECard.
-
-2001-06-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): remove spew,
-	and don't call the ShellView CORBA method if the interface doesn't
-	exist (for whatever reason.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	unref the EAddressbookModel.
-	(create_minicard_view): unref the adapter.
-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.
-	(card_modified_cb): same.
-	(card_removed_cb): new function, and same.
-	(delete_card_cb): pass card_removed_cb as the callback.
-	(emit_status_message): new function, just emit status_message.
-	(status_message): change to call emit_status_message.
-	(card_deleted_cb): emit_status_message ("Done."), and call
-	e_book_error_dialog if status != SUCCESS.
-	(do_remove): pass view in the closure arg.
-	(e_addressbook_view_delete_selection): emit status "Removing
-	cards..." before starting the removal.
-	(e_book_error_dialog): new function - pop up a (possibly) helpful
-	message about why an operation failed.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.
-	(e_minicard_view_widget_destroy): unref the adapter.
-	(e_minicard_view_widget_get_selection_model): if there isn't a
-	minicard view return NULL.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(e_addressbook_table_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): rename this from addressbook_destroy, to
-	reflect the method change.
-	(e_addressbook_reflow_adapter_class_init): same.
-	(e_addressbook_reflow_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-model.h: add editable_set flag.
-
-	* gui/widgets/e-addressbook-model.c (writable_status): only record
-	the writable state of the addressbook if the user hasn't set it.
-	(e_addressbook_model_init): init editable_set to FALSE.
-	(e_addressbook_model_set_arg): set editable_set to TRUE.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
-	`$(DB3_LDADD)' before libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
-	$(DB3_LDADD)'.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.
-
-	* backend/pas/pas-backend-file.c: Updated this to use db3.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added
-	fields for the GalViewMenus and GalViewCollection; we need to keep
-	them around while the component is active.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.
-	Unref the factories.  Do not unref the collection, since we need
-	it for the signal emission (okay, so the views object adds a
-	reference to it, but if we are interested in it we should keep a
-	reference anyways).
-	(e_addressbook_view_setup_menus): Create the collection and views
-	on the EAddressbookView's fields so that we can keep them around.
-	(e_addressbook_view_discard_menus): New function; gets rid of the
-	collection and views objects.
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_view_discard_menus().
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add the EAddressbookModel* and change the
-	ETableModel's name to "adapter".
-
-	* gui/component/select-names/e-select-names.c (set_book),
-	(addressbook_model_set_uri): these two things take an
-	EAddressbookModel* instead of an ETableModel now.
-	(e_addressbook_create_ebook_table): don't case the
-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter
-	on the EAddressbookModel instead.
-	(e_select_names_init): set e_select_names->adapter.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (remove_card): decrement
-	data_count before emitting the card_removed signal, and break
-	after we've removed the matching card.
-	(e_addressbook_model_class_init): change signature of
-	"card_removed" signal to match what we emit (and what is
-	expected.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
-	signal name is "destroy", not "destroyed".
-	(do_remove): new function, actually remove the card.
-	(e_addressbook_view_delete_selection): get this working for both
-	view types.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: Print Preview =>
-	ContactsPrintPreview.  Changed peter's change so that the node
-	name is more in line with "Print.."'s
-
-2001-05-30  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/addressbook.c: Use the correct path to the print
-	preview menu item.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (cut_contacts_cb): new function, for
-	the Cut verb.
-	(copy_contacts_cb): new function, for the Copy verb.
-	(paste_contacts_cb): new function, for the Paste verb.
-	(select_all_contacts_cb): new function, for the Select All verb.
-	(update_command_state): add handling for sensitivity of
-	Cut/Copy/Paste/Select All.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init
-	the invisible and set up selection/destroy signals.
-	(get_selection_model): new function, so we can get the
-	ETableSelectionModel from either view type.  makes lots of the
-	other functions easier, since we can get the list of selected
-	cards using the same code regardless of view type.
-	(invisible_destroyed): new function.
-	(selection_get): new function.  convert the clipboard list to
-	string.
-	(selection_clear_event): new function - free up the list of
-	ECards.
-	(selection_received): if the selection data is valid and
-	well-formed, add the corresponding cards to the ebook.
-	(add_to_list): new function.
-	(get_selected_cards): new function.
-	(e_addressbook_view_cut): new function, implement in terms of
-	_copy and _delete_selection.
-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD
-	selection after saving the list of selected ECards.
-	(e_addressbook_view_paste): call gtk_selection_convert.
-	(e_addressbook_view_select_all): new function, using
-	e_selection_model_select_all.
-	(e_addressbook_view_can_print): re-implement in terms of
-	get_selection_model.
-	(e_addressbook_view_can_delete): same.
-	(e_addressbook_view_can_cut): new function.
-	(e_addressbook_view_can_copy): new function.
-	(e_addressbook_view_can_paste): new function.  hmm, always return
-	TRUE here.
-	(e_addressbook_view_can_select_all): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	selection stuff - the list of selected cards, and the GtkInvisible
-	selection owner, and add prototypes for
-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.
-	
-	* gui/widgets/e-minicard-view-widget.h: add a prototype for
-	e_minicard_view_widget_get_selection_model.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_get_selection_model): new function.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/Makefile.am: Reference libeshell.la instead of
-	libeshell.a.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
-	Correct the height calculation here to not include the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.
-
-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to
-	be more consistent and simpler.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
-	that ones that happening at the beginning or during an operation
-	are followed by "..." and those that stop the operation are
-	followed by "."
-	(create_card_handler): same.
-	(ldap_op_process_current): same, and also call _notify_complete if
-	we can't connect to ldap server.
-	(poll_ldap): same, and change "Polling for LDAP search result" to
-	"Receiving LDAP search results"
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call
-	notify_status_message at the beginning of this function, and
-	whenever we call _notify_complete.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
-	EAddressbookModel and stop_state_changed to
-	EAddressbookModelClass.  also, add prototype for
-	e_addressbook_model_can_stop.
-
-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect
-	from "sequence_complete", and set search_in_progress to FALSE.
-	(sequence_complete): set search_in_progress to FALSE and emit
-	"stop_state_changed."
-	(e_addressbook_model_class_init): create the "stop_state_changed"
-	signal.
-	(e_addressbook_model_init): init stuff.
-	(book_view_loaded): connect to "sequence_complete" signal.
-	(book_view_loaded): set search_in_progress to TRUE and emit
-	"stop_state_changed"
-	(e_addressbook_model_stop): set search_in_progress to false, emit
-	"stop_state_changed", and set our status to "Search Interrupted."
-	(e_addressbook_model_can_stop): return search_in_progress.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	connect to the stop_state_changed signal on EAddressbookModel.
-	(stop_state_changed): new function.
-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.
-
-	* gui/component/addressbook.c (update_command_state): use
-	e_addressbook_view_can_stop to set the sensitivity of the stop
-	button.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	ref the listener for the duration of this function, since emitting
-	"responses_queued" may cause it to be unreffed by its EBook in
-	some cases, which could cause the second response_queue check to
-	look at garbage data if it got destroyed.
-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: track the change in
-	evolution-addressbook.xml's bonobo ui path's.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (change_view_type): update_view_type
-	is gone, since the menu item is gone.
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use
-	e_table_model_rows_inserted here.
-
-2001-05-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_item_new): Removed an unused variable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Made text here non-const.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Cast to a gpointer here.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Do a better job constructing match strings, so we
-	never try to use a segment of the name that isn't there (resulting
-	in ugly (null)'s in the string).  Boost our score if some part of
-	the name also matches the front part of the e-mail address, so the
-	name match will always trump the e-mail match.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Return the serialized EDestinations
-	(rather than just a string w/ e-mail addresses) through the bonobo
-	component's property bag.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_export_destinationv): Added.  A convenience routine
-	for serializing the model's EDestinations into a string.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(add_html_mail): Added.  Puts in a check menu item for whether or
-	not the recipient wants HTML mail.
-	(popup_menu_card): Add menu item for HTML mail.  Enable edit
-	contact info item.
-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit
-	contact info item.
-
-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):
-	Added.  Fetches the local addressbook and caches it on the first
-	call.  This is meant to be an easy and efficient way to get at the
-	local addressbook with the minimum of code.
-	(e_book_query_address_locally): Added.  Convenience code that
-	does an e-mail only e_book_name_and_email_query against the
-	local address book.
-
-	* backend/ebook/e-destination.c
-	(e_destination_set_html_mail_pref): Added.  Allows the intended
-	recipient's HTML mail preference to be manipulated.
-	(e_destination_get_email_verbose): Added.  Cleaned up to use
-	e_destination_get_name.
-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail
-	preference.  If the destination is linked to a card, the
-	preference is taken from the card (unless it has been explicitly
-	overridden by a called to e_destination_set_html_mail_pref).
-	(e_destination_get_address_textv): Added.  Form a unified address string
-	from a NULL-terminated vector of EDestinations.
-	(e_destination_export): Added.  Serialize an EDestination to a string.
-	(e_destination_import): Added.  Unserialize a string to build an
-	EDestination.
-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of
-	EDestinations to a string.
-	(e_destination_importv): Added.  Unserialize a string to build a
-	NULL-terminated vector of EDestinations.
-
-	* gui/component/select-names/e-select-names-completion.c:
-	Implemented local versions of g_strcasecmp and g_strncasecmp
-	(which should really be in glib, I think...) for utf8, and used
-	them to make this code utf8-safe.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): no more
-	ContactFind command.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add our selection_change
-	signal.
-	(e_minicard_view_widget_realize): connect to the ESelectionModel's
-	selection_changed signal.
-	(e_minicard_view_widget_selected_count): new function.
-	(selection_change): new function - emit our "selection_change"
-	signal.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidgetClass): add selection_change signal.  also,
-	add prototype for e_minicard_view_widget_selected_count.  
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add our command_state_change
-	signal.
-	(e_addressbook_view_init): connect to the writable_status signal
-	on the EAddressbookModel.
-	(minicard_selection_change): new function - calls
-	command_state_change.
-	(create_minicard_view): connect to selection_change on the
-	minicard_view so we know when to update command state.
-	(table_selection_change): new function - calls
-	command_state_change.
-	(writable_status): new function - calls command_state_change.
-	(command_state_change): new function - emits our
-	"command_state_change" signal.
-	(create_table_view): connect to the selection_change signal so we
-	know to update the command state.
-	(change_view_type): update the command state every time we change
-	view types.
-	(e_addressbook_view_can_create): new function.
-	(e_addressbook_view_can_print): new function.
-	(e_addressbook_view_can_delete): new function.
-	(e_addressbook_view_can_stop): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add command_state_change signal, and
-	prototypes of functions the component can use to test the state of
-	commands.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink
-	the writable_status signal on the EBook.
-	(writable_status): new function.
-	(e_addressbook_model_class_init): add our writable_status signal.
-	(e_addressbook_model_init): init writable_status_id.
-	(e_addressbook_model_set_arg): unlink the writable_status signal
-	on the old EBook, and connect it on the new one.
-
-	* gui/widgets/e-addressbook-model.h: add writable_status signal.
-
-	* gui/component/addressbook.c (update_command_state): new
-	function, set the sensitivity of the bonobo commands.
-	(control_activate): update our command state immediately upon
-	activating the control.
-	(addressbook_factory_new_control): register command_state_change
-	to update the commands.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): initialize the model and
-	adapter.
-	(button_press): set on the model.
-	(e_addressbook_search_dialog_new): same.
-	(e_addressbook_search_dialog_set_arg): same.
-	(e_addressbook_search_dialog_destroy): unref the model and
-	adapter.
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add our model and reflow adapter.
-
-2001-05-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed
-	up the lifetime of the drag_data_get signal a bit.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
-	-> ReflowAdapter name change.
-	(get_card_list): same.
-	(e_minicard_view_drag_begin): same.
-	(supported_fields_cb): model -> adapter.
-	(adapter_changed): hook up signals and set the empty message on
-	our adapter.
-	(e_minicard_view_set_arg): add support for "adapter", and set
-	model -> adapter.
-	(e_minicard_view_get_arg): same.
-	(disconnect_signals): no more status_message.
-	(do_remove): track to use adapter.
-	(e_minicard_view_class_init): add adapter arg, and remove
-	status_message.
-	(e_minicard_view_init): all the code here is in adapter_changed
-	now.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
-	EMinicardViewModel -> EAddressbookReflowAdapter.
-	(struct _EMinicardViewClass): get rid of status_message.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): remove the status_message
-	signal.
-	(e_minicard_view_widget_new): take the adapter as our argument,
-	and store it away for when we create the view.
-	(e_minicard_view_widget_realize): when we create the view just set
-	the adapter field on it.  also, don't connect to status_message.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add our adapter here, so we can pass it
-	into the view when we create it.
-	(struct _EMinicardViewWidgetClass): remove status_message.
-
-	* gui/widgets/e-addressbook-view.c (status_message): new function,
-	no more propagating status messages!
-	(e_addressbook_view_init): create our model and conenct to its
-	status_message signal.
-	(book_writable_cb): set "editable" on the model, not our object.
-	(e_addressbook_view_set_arg): same, but with "book" and "query" as
-	well.
-	(create_minicard_view): create our reflow adapter and pass it to
-	the minicard view widget.  also, call e_reflow_model_changed so
-	it'll pick up any already present cards.
-	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(get_card_list_1): remove the cast, since we don't need it any
-	longer.
-	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(table_drag_data_get): same.
-	(create_table_view): create the table adapter, and use it as our
-	ETableModel.
-	(change_view_type): remove the status_message hook up and setting
-	of query/book/editable.
-	(e_addressbook_view_stop): just call e_addressbook_model_stop here
-	instead of switching on the view type.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	our EAddressbookModel.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
-	adapter files, and remove e-minicard-view-model.[ch].
-
-	* gui/widgets/e-minicard-view-model.[ch]: removed.
-	
-	* gui/widgets/e-addressbook-table-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-table-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-model.c: rework this class to now
-	subclass from ETableModel anymore.  It not subclasses from
-	GtkObject, and we use table and reflow adapters to get at the
-	data.
-
-	* gui/widgets/e-addressbook-model.h: same.
-
-2001-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small
-	error not decreasing the data_count here.
-
-2001-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): create an EBook for
-	@physical_uri.
-	(dnd_drop_book_open_cb): actually add the dropped cards.
-
-	* gui/component/addressbook.c (addressbook_expand_uri): abstract
-	this code out from the set_prop method so we can use it in the
-	component.
-	(set_prop): call addressbook_expand_uri.
-
-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new
-	function.
-
-	* backend/ebook/e-card.h: add prototype for
-	e_card_load_cards_from_string.
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): spew the data passed to us.
-	(destination_folder_handle_motion): the suggested_action is not an
-	ActionSet, but an Action, so don't or together multiple actions.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	correct bug causing the Ok button to never be enabled.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	example.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):
-	use e_card_list_get_vcard to build up the data to send.
-	(e_minicard_view_init): connect to the model's drag_begin signal.
-	(e_minicard_view_drag_begin): gather the list of cards being
-	dragged and call gtk_drag_begin.
-	(add_to_list): new function.
-	(get_card_list): same.
-	(disconnect_signals): disconnect the drag_data_get signal.
-	(e_minicard_view_init): connect to the drag_begin signal on our
-	model.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change
-	drag_card to drag_list.
-	
-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new
-	function, emit our drag_begin signal.
-	(addressbook_incarnate): connect to the item's drag_begin signal.
-	(e_minicard_view_model_class_init): init our drag_begin signal.
-
-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	always loop through all source types here, making LDAP first so
-	it's forces as the first notebook item.
-	(addressbook_config_auth_label): remove SASL case.
-	(addressbook_source_edit_changed): same.
-	(addressbook_source_item_new): flag the area of code that needs to
-	go into the advanced dialog (if we add one before someone
-	graciously redesigns the entire addressbook gui :)
-
-
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove
-	SASL case.
-	(ldap_parse_auth): same.
-
-	* gui/component/addressbook-storage.h: make LDAP come first in our
-	source type enumeration, and remove the SASL auth type.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and
-	the full_name or file_as haven't been yet, set them.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c: Reordered the includes here.
-	(string_to_dbt): The sleepycat libdb documentation suggests
-	memseting the DBT to 0 so we do that here.
-
-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-	* gui/widgets/e-minicard.c (remodel): Skip the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	check schema support if we've connected.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (enable_writable_fields):
-	don't leak the ECard or ECardSimple.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:
-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.
-
-	* Makefile.am: Rename all the GnomeCard to VCard.
-
-	* evolution-vcard-importer.c: Make the GnomeCard a generic 
-	vcard importer.
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed
-	e-card-pairs.h since we're not using it.
-
-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):
-	Added break; to default: case here.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added changed variable so as to avoid sync_card when possible.
-	(e_card_simple_destroy): Free all the data here properly.
-	(e_card_simple_get_arg): Slight simplification here.
-	(fill_in_info, e_card_simple_arbitrary_foreach,
-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to
-	save a bit of memory.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up
-	includes a bit.
-	(e_card_list_get_vcard, e_card_list_send): Added these functions
-	for acting on a group of cards.
-	(parse_org): Cleaned up this function a bit.
-	(e_card_free_empty_lists): Added this function to delete
-	unnecessary ELists and save a bit of memory.
-	(e_v_object_get_child_value): Made this return NULL if not found
-	instead of g_strdup("").
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added
-	this function to save multiple contacts.
-
-	* gui/widgets/Makefile.am: Commented out reflow test.
-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and
-	e-minicard-view-model.h.
-
-	* gui/widgets/e-minicard-view-model.c,
-	gui/widgets/e-minicard-view-model.h: Model for use in
-	EMinicardView.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Reworked this to use the new EReflow stuff.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle
-	right click menus now.  Emits a signal on the parent canvas item
-	instead.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h
-	(e_contact_print_envelope_list_dialog_new): Added this function to
-	print multiple envelopes (only prints first for now.)
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_card_list_dialog_new): Added this function to
-	print multiple cards.  Only prints the first for now.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): flesh out
-	the function more.  It should work now, but there's no way to
-	invoke this method from the ui at the moment, heh.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): Use a different
-	error message in the ldap support/no ldap support/file cases.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/component/addressbook.c: use define from
-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu
-	names.
-
-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:
-	removed EVOLUTION_VERSION.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): un-#if 0
-	this.
-	(xfer_folder): add skeleton code to validate xfer request.  always
-	notifies with PERMISSION_DENIED at present.
-	(populate_context_menu): un-#if 0 this.
-	(get_dnd_selection): same.
-	(destination_folder_handle_motion): new function.
-	(destination_folder_handle_drop): new function.
-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder
-	interface, and add it to our shell component.
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): init change_id to NULL
-
-2001-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_free): unref the
-	book if the view is being destroyed
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): unref the book_view when
-	we are finished, it is only interesting if someone else has reffed
-	it now (weak reference)
-	(pas_backend_file_add_client): unref the book for the same reason
-	as above
-
-	* Fixes bug #2255
-
-2001-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the
-	view does not contain a search context, the result is by default
-	false fixes #2470
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Remove call to
-	unicode_init.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Lots of code has been
-	simplified here.
-	(e_address_popup_factory_new_control): Rather than directly pop
-	our control up in a window (via the e_address_popup_popup
-	function, which is now gone), just return the widget and let the
-	caller do the popping.  This works better, since it means we don't
-	have to work around the vagaries of bonobo focus & event handling.
-	(e_address_popup_set_name): Refresh when both name & email have
-	been set, rather than checking a stupid counter.
-	(e_address_popup_set_email): Ditto.
-
-2001-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): Added save_source_data here.
-
-2001-04-21  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly
-	convert to utf8. (Bug #2256)
-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)
-
-2001-04-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Use e_select_names_model_append.  It's
-	nicer.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_append): Added.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): Filter out completion matches that
-	don't have an associated e-mail address.
-	(book_query_score): Give a bonus to the primary address, so that
-	it always comes up first in the completion results.
-
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	Convert utf8 strings into gtk strings before displaying.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h: Added the function
-	e_book_view_listener_stop to tell the book view listener to stop
-	sending signals.
-
-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
-	EBookViewListener to stop when we're destroyed.
-
-	* backend/pas/pas-backend-file.c (view_destroy,
-	pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): Cleaned these up a bit
-	using bonobo_object_ref and bonobo_object_unref.
-	(pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): bonobo_object_release_unref
-	the EBookListener here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
-	using bonobo_object_ref.  Make sure to unref the listener when
-	we're done with it.  Put the new book_view in the list before
-	telling the book_listener that it's ready.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
-	this up a bit using bonobo_object_dup_ref.
-	(pas_book_view_destroy): Cleaned this up a bit using
-	bonobo_object_release_unref.
-
-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
-	just duplicating.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_cursor): Ref the cursor here when
-	we receive it.
-	(impl_BookListener_respond_get_view,
-	impl_BookListener_respond_get_changes): Ref the book_view here
-	when we receive it.
-	(impl_BookListener_respond_open_book): Ref the book here when we
-	receive it.
-	(e_book_listener_destroy): Unref the objects in our queue here.
-
-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
-	this up using bonobo_object_dup_ref.
-	(e_book_view_destroy): Cleaned this up using
-	bonobo_object_release_unref.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,
-	e_book_do_response_get_view, e_book_do_response_get_changes,
-	e_book_unload_uri): Cleaned this up using
-	bonobo_object_release_unref.
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the ESelectNamesModel from the
-	widget's text model instead of storing it as a gtk_object_set_data
-	since it may change.
-
-2001-04-12  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
-	and Fax phone numbers too, finishing off bug #1667.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built
-	in VCard.
-
-2001-04-12  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): put the
-	business address into the pilot record as that is what we put into
-	the desktop record
-	(ecard_from_remote_record): set both the address label and
-	delivery address to avoid bad parser guessing, fixes #2143
-
-	* backend/ebook/e-card-types.h: remove deprecated pilot code
-
-	* backend/ebook/e-card.c: ditto
-
-	* backend/ebook/e-card.h: ditto
-	
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Don't add
-	more than five phone numbers and set the remaining blank entries
-	to some reasonable defaults
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Added
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.
-
-	* gui/component/addressbook-component.c (accepted_dnd_types):
-	Fixed a warning here.
-
-	* gui/widgets/e-addressbook-model.c: Modified this to have more
-	columns, but not let them be edited if they're not a simple
-	string.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a
-	warning and a memory leak here.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.
-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were
-	not translated after selecting one of them.
-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().
-	Updated list[] for translators.
-	* gui/widgets/e-minicard.c: same.
-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning
-	for "editable" arg.
-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): stubbed,
-	#if 0'ed
-	(xfer_folder): same.
-	(populate_context_menu): same.
-	(get_dnd_selection): same.
-	(factory_fn): add the accepted drag types ("text/x-vard") to
-	folder_types.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if
-	it's button 1, store the button x, y, and set drag_button_down to
-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.
-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3
-	pixels.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for
-	button x, y, and a bit for if the button has been pressed so we
-	can tell whether a motion should be a drag.
-	(struct _EMinicardClass): add drag_begin signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new
-	function, starts the drag.
-	(book_view_loaded): connect the "drag_data_get" signal.
-	(e_minicard_view_drag_data_get): new function.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	drag_card and id for canvas_drag_data_get_id.
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new
-	function.
-	(create_table_view): add d&d stuff.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c: add #include <sys/types.h> since
-	gnome-print.h uses time_t without including it.  this really
-	should be fixed in gnome-print.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	make sure to notify new clients to the writable status of an
-	already open (and authenticated) book.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* contact-editor/e-contact-editor.[ch]: Fix headers.
-	* component/addressbook-storage.c: Same here.
-	* gui/search/e-addressbook-search-dialog.c: Same here.
-	* gui/widgets/e-addressbook-view.c: Same here.
-	* gui/widgets/e-minicard-label.c: Same here.
-	* gui/widgets/e-minicard-view-widget.c: Same here.
-	* gui/widgets/e-minicard-view.c: Same here.
-	* gui/widgets/e-minicard-widget-test.c: Same here.
-	* gui/widgets/e-minicard-widget.c: Same here.
-	* gui/widgets/e-minicard.c: Same here.
-	* gui/widgets/test-minicard-label.c: Same here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a
-	crash here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model
-	more consistent in the number of columns it has.
-	(addressbook_append_row): Fixed this function.  We removed the col
-	offset.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut
-	down and unregister the factory on exit. 
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* contact-editor/contact-editor.glade: changed icon to
-	evolution-contacts-plain.png.
-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new
-	contact, print, print preview, changed filenames of renamed icons.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Call e_select_names_model_clean after
-	adding address.  This should deal with the bug reports related
-	to stray commas.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_clean): Added.  Remove all empty destinations.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check
-	if an EDestination is in essentially a null state.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Tell new clients that are added whether they're writable.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c: Added #include <libgnome/gnome-paper.h>
-	
-	* printing/e-contact-print-envelope.c: Added #include <time.h>
-	and #include <libgnome/gnome-paper.h>
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_email): Better handle matching of "nameless" contacts.
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Better
-	handle the case of a "nameless" contact.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
-	<gtk/gtk.h> with more finegrained headers where needed.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of
-	getting the NAME and then the ORG.  That way if we expand
-	NAME_OR_ORG, this will use it.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table, SPEC): Use the correct column
-	in the SPEC.
-
-2001-03-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): Rather than starting
-	the pending query by directly calling
-	e_select_names_completion_do_query, call
-	e_completion_begin_search.  Circumventing the ECompletion API was
-	causing it to get confused in some cases.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):
-	Added.  Call me old-fashioned, but I just prefer to have a real
-	API rather than doing everything via gtk_object_get/set-type
-	calls.
-	(e_minicard_widget_set_arg): Changed to call
-	e_minicard_widget_set_card.
-
-	* backend/ebook/e-book-util.c: Small changes to get rid of
-	compiler warnings.  (Casting out const, removed unused variables,
-	etc.)  Removed some debugging messages.
-
-	* gui/component/addressbook-factory.c (main): Added call
-	to e_address_popup_factory_init.
-
-	* gui/component/e-address-popup.c: Added.  A popup gadget that is
-	invoked (as a bonobo control) when an address is left-clicked in
-	the mailer.  The addressbook is queries, and the address is either
-	displayed as a minicard (if it already exists) or in a "generic
-	format".  A button is provided for editting/adding the contact.
-	Some of the semantics of this widget are a bit... non-standard,
-	because of bonobo issues.  I can't really seem to replicate
-	popup-menu behavior because of how bonobo propogates events, etc.
-	so I've tried to produce something that I think is non-annoying.
-	YMMV.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new
-	IDL.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Added artwork from
-	Jakub. 
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged branch:
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: Call
-	e_selection_model_simple_insert_rows and
-	e_selection_model_simple_delete_rows instead of
-	e_selection_model_simple_insert_row and
-	e_selection_model_simple_delete_row.
-
-End of branch
-
-2001-03-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Brutally
-	refactored to boost performance in large-addressbook situations.
-	These fixes give accepable performance (even with the suboptimal
-	pas-backend-file searching) using tigert's addressbook-of-death.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): 
-	Start feeding query matches back to the caller before the
-	entire search is complete; this gives us some "instant feedback"
-	rather than causing evolution to totally lock up...
-
-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.
-	(e_book_cancel_op): Added.  Search for a pending op with a given
-	tag, and mark it as inactive.
-	(e_book_do_response_get_cursor): Don't execute callback if this
-	operations has been cancelled.
-	(e_book_do_response_get_view): Ditto.
-	(e_book_do_response_get_changes): Ditto.
-	(e_book_do_response_get_supported_fields): Ditto.
-	(e_book_get_supported_fields): Return an operation tag (that can
-	be used to cancel the operation) rather than just TRUE/FALSE.
-	Zero is always an invalid tag and is returned in the case of an
-	error, so this shouldn't break any code that looked at the return
-	value (unless it did so in a particularly stupid way, of course).
-	(e_book_get_cursor): Ditto.
-	(e_book_get_book_view): Ditto.
-	(e_book_get_changes): Ditto.
-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically
-	a call to e_book_cancel_op with error checking, etc.)
-
-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.
-
-2001-03-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_writable_status): new function.
-	(impl_BookListener_report_writable): new function.
-	(e_book_listener_get_epv): fill in epv->notifyWritable.
-
-	* backend/ebook/e-book-listener.h: add writable status entries.
-
-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.
-	(e_book_check_listener_queue): add WritableStatusEvent to the
-	switch.
-	(e_book_class_init): register writable_status signal.
-
-	* backend/ebook/e-book.h: add writable_status signal.
-
-	* backend/idl/addressbook.idl: add notifyWritable method to
-	BookListener.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"
-	arg.
-	(e_minicard_init): init editable.
-	(e_minicard_set_arg): loop over the minicard fields setting their
-	"editable".
-	(e_minicard_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the
-	contact_editor.
-	(add_field): set "editable" when creatin the e_minicard.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add
-	editable arg.
-	(e_minicard_view_init): init editable.
-	(create_card): pass editable to e_minicard canvas item.
-	(e_minicard_view_set_arg): bit of a hack - loop over all the
-	canvas items setting their "editable."
-	(e_minicard_view_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the contact
-	editor.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	"editable."
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add "editable" field.
-	(e_minicard_view_widget_init): init editable to FALSE.
-	(e_minicard_view_widget_set_arg): save editable, and pass it along
-	the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_arg): add editable.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add "editable" field.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add
-	"editable" field.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	add "editable" arg.
-	(e_minicard_label_set_arg): editable, set it on the e_text too.
-	(e_minicard_label_get_arg): editable.
-	(e_minicard_label_construct): set the "editable" field when we
-	create the e_text cavas item
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	default editable to FALSE.
-	(book_writable_cb): new function, set our editable field and
-	gtk_object_set it on the active view.
-	(e_addressbook_view_set_arg): set the active view's editable when
-	we set the view's book, and connect the "writable_status" signal
-	to book_writable_cb.
-	(change_view_type): same.
-	(supported_fields_cb): use our "editable" when creating the
-	contact editor.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	editable field.
-
-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):
-	change the default of editable to FALSE.
-
-	* backend/pas/pas-book.c (pas_book_report_writable): new function.
-
-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if
-	we open the file O_RDWR (or create it) report it as writable.  if
-	we can't open it as O_RDWR, try opening it read-only before we
-	attempt to create it.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): if we authenticate
-	successfully, grant write permissions (this is lacking but there's
-	really nothing we can do to determine the extent of the access
-	afforded a user.)
-
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-widget.c: Added addressbook querying and
-	"cardification" functions, which are turned off by default for now
-	because of addressbook bugs.  Added a popup menu option to turn
-	queries on, so that others can enjoy the thrill of massive flaming
-	death.
-
-	* gui/component/addressbook-factory.c (main): Made warnings always
-	be fatal.
-
-	* backend/pas/pas-book-view.c: Added some debugging spew.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added
-	a little experimental code to try to make file searches scale
-	better.  #if 0/#endif-ed out for now.
-
-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Added.
-	Looser name-matching function.
-	(e_card_email_match_string): Added.  Loose e-mail matching.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added code to cause us to
-	abort rather than get trapped in a 100%-CPU-consuming loop in
-	certain situations.  Now we just need to figure out how to avoid
-	these situations altogether.
-
-	* backend/ebook/e-book-util.c: Added.  Now contains the simple
-	query stuff and the open local addressbook functions.
-
-	* backend/ebook/e-book.c: Moved simple query stuff and open local
-	addressbook functions into e-book-util.c.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): 
-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):
-	Update arguments to e_canvas_item_grab_focus.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Fix a warning
-	here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to
-	ld order from Greg Williams.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): Moved where we call
-	pas_book_respond_get_book_view.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for
-	categories.
-
-	* backend/pas/evolutionperson.schema: add categories attribute.
-
-	* backend/ebook/e-card-simple.c (field_data): add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-	* backend/ebook/e-card-simple.h: add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only
-	param.
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): add is_read_only param.
-	also, include a little policy here and make it TRUE, as the user
-	shouldn't be editting in this context anyway (imo).
-
-	* gui/component/addressbook.c (supported_fields_cb): add
-	is_read_only param.
-
-	* contact-editor/test-editor.c (main): add is_read_only param.
-
-	* contact-editor/e-contact-editor.c (set_read_only): new function,
-	that either enables or disables all the text fields, combo boxes,
-	and some buttons, depending on the state of is_read_only.
-	(e_contact_editor_class_init): add read/write arg "is_read_only".
-	(full_name_clicked): set the is_read_only of the fullname dialog
-	to the editor's.
-	(full_addr_clicked): same.
-	(e_contact_editor_new): add is_read_only param, that gets set
-	along with the other params.
-	(e_contact_editor_set_arg): add setter for is_read_only.
-	(e_contact_editor_get_arg): add getter for is_read_only.
-	(_phone_arrow_pressed): change TRUE to !editor->is_read_only for
-	entry.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_fullname_set_arg): add setter for is_read_only
-	that enables/disables all the entries/combos.
-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): add is_read_only flag.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_address_set_arg): add setter for is_read_only
-	that disables/enables all the entries/combos.
-	(e_contact_editor_address_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): add is_read_only flag.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/Makefile.am: Change the importer includes around a bit.
-
-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-2001-03-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_simple_query): Added. A
-	simplified, cancellable query mechanism that lets you avoid
-	dealing with EBookView.
-	(e_book_simple_query_cancel): Added. Cancels a running query.
-
-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
-	Removed debugging code, hopefully without introducing any bugs
-	in the process.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix bug with commas
-	inside of name/address combos.  As long as the comma is inside of
-	quotes, it will be treated as part of the name rather than as a
-	break between addresses.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Use e_card_name_to_string for nickname match
-	strings.
-	(match_email): Use e_card_name_to_string for email match strings.
-	(e_select_names_completion_begin): Strip quotes out of query text,
-	so we don't produce malformed sexps.
-	Added William Blake quote easter egg.
-
-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
-	mostly unsuccessful.
-	(e_contact_quick_add_free_form): Added.  Takes a single string
-	and tries to parse out (using some simple, loose rules) the
-	name and e-mail -- then calls e_contact_quick_add.  An attempt to 
-	get the computer to automatically Do The Right Thing.
-
-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
-	anal.
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/addressbook-factory.c (main): Add call to
-	e_address_widget_factory_init.
-
-	* gui/component/e-address-widget.h: 
-	* gui/component/e-address-widget.c: Added.  A little widget (and a
-	Bonobo control, BTW) for displaying addresses, with a left-click
-	menu.  Used to display addresses in the mail viewer (as embedded
-	GtkHTML objects, replacing the text previously used).  Still quite
-	incomplete.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Specify a
-	NULL `EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix glitch with
-	inserting comma-delimited stuff when length > 1.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.
-	Just encapsulates opening
-	file://~username/evolution/local/Contactes/addressbook.db, so that
-	path doesn't need to be hardwired in throughout the code.
-
-2001-03-06  Benjamin Kahn  <xkahn@cybersites.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): 
-	Added the third argument to e_contact_editor_new.  (Cheated
-	and send NULL for the field argument, which is probably
-	troublesome.  It will be fixed soon by either clahey or 
-	toshok.)
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_replace): Fix a reference counting bug.
-
-	* gui/component/select-names/e-select-names-manager.c (popup_cb):
-	A callback for creating the appropriate popup by calling
-	e_select_names_popup.
-	(e_select_names_manager_create_entry): Connect popup_cb to the
-	entry's popup signal
-
-	* gui/component/select-names/e-select-names-popup.c: Added.  Code
-	for popup right-click menus for recipient entries.  Still a bit
-	incomplete.
-
-	* backend/ebook/e-destination.c (e_destination_get_email_num):
-	Added.
-
-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a
-	dialog for very quickly adding entries to the address book.
-	Still not fully working.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this
-	file a bit.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):
-	Made it so that passing in NULL to the writable_fields arg sets
-	the set of writable fields to the empty set.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Pass NULL as the
-	writable_fields argument here.
-
-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.
-	This way we will get the file_as field as one of our
-	ETableColumns.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the
-	changes in ECardSimple.
-
-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item
-	isn't realized.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: doh, track renaming of
-	objectclass from evolvePerson to evolutionPerson.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: rename evolveperson.schema
-	to this, and add remaining attributes.
-
-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up
-	ones that were incorrent (either the ldap_attr or the query prop).
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: update sed script
-
-	* conduit/e-address.conduit.in: update for new pilot foo
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): track change to
-	e_contact_editor_new.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add
-	objectclasses for "person", "organizationalPerson", and "top" as
-	well, just to be complete.
-	(check_schema_support): rename check_for_evolve_person to this, to
-	reflect that we're doing more than just checking for that
-	objectClass.
-	(add_oc_attributes_to_supported_fields): new function.
-	(add_to_supported_fields): new function.
-	(pas_backend_ldap_destroy): unref supported_fields.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new
-	function.
-	(e_minicard_view_event): split out the creation of the contact
-	editor to the supported_fields callback.
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.
-	(e_minicard_event): split out the creation of the contact editor
-	to the supported_fields callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): split
-	function into two functions, since e_book_get_supported_fields
-	requires a callback now.
-	(supported_fields_cb): new function.
-
-	* gui/component/addressbook.c (new_contact_cb): split this into
-	two functions, since e_book_get_supported_fields requires a
-	callback now.
-	(supported_fields_cb): new function.
-
-	* contact-editor/test-editor.c (main): track change to
-	e_contact_editor_new (pass NULL for the writable_fields arg.)
-
-	* contact-editor/contact-editor.glade: fix several labels so they
-	make better sense (since we look them up in e-contact-editor.c.)
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add
-	writable_fields.  also, add it to e_contact_editor_new.
-	
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	add writable_fields arg.
-	(e_contact_editor_destroy): unref the writable_fields list.
-	(e_contact_editor_new): pass @fields as the writable_fields arg.
-	(e_contact_editor_set_arg): add writable_fields support.
-	(enable_writable_fields): new (very hairy) function, to disable
-	everything and reenable just the fields listed in the
-	writable_fields list.
-	(_email_arrow_pressed): set label-email1, entry-email1, and
-	checkbutton-htmlmail to be sensitive since the only way to get
-	here is to activate a writable field in the menu.
-	(_address_arrow_pressed): set label-address, button-fulladdr, and
-	text-address to be sensitive for the same reason.
-	(_phone_arrow_pressed): sensitize the label and entry for the same
-	reason.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c (field_data): add new entries for
-	phone enums, and fill in the ecard_field with (bogus in all but a
-	few cases) strings.  these are the strings sent from wombat to
-	evolution-addressbook for supported_fields.
-	(e_card_simple_get_ecard_field): new function.
-	(e_card_simple_map_phone_to_field): new function.
-	(e_card_simple_map_email_to_field): new function.
-	(e_card_simple_map_address_to_field): new function.
-
-	* backend/ebook/e-card-simple.h: add a few phone entries to the
-	ECardSimpleField enum, and add prototypes for mapping the list
-	types (phone, email, address) to ECardSimpleField.  Also, add
-	prototype for e_card_simple_get_ecard_field.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): don't build the EList
-	here, it's already built.
-
-	* backend/ebook/e-book-listener.h: change fields from the CORBA
-	sequence to the EList in our reponse struct.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): we make the
-	EList here, since after we return the CORBA list is freed up.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): implement
-	properly, we support everything.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Oops, we do need to be able to write to
-	"text" after all (for things like Reply-to: to work properly).
-	Fixed.
-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable
-	property again.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Increment pos so that
-	we don't reverse strings when length > 1 (a particularly amusing
-	bug).
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): Check for NULL before calling
-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error
-	messages.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-	
-	* gui/component/select-names/e-select-names-completion.c: I am an
-	idiot.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_get_source): Added.  A function for
-	looking up the ESelectNamesModel by id.  (I didn't end up using
-	this function, but it might come in handy later.)
-	(e_select_names_manager_get_cards): #if 0/#endif out this
-	function.
-	(e_select_names_manager_create_entry): Modified to attach an
-	ESelectNamesCompletion to the entry we create.
-	(completion_handler): A post-completion handler for our EEntry, to
-	take the completion's extra data (an EDestination) and properly
-	stick it into our ESelectNamesModel.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Changed to operate on EDestinations rather
-	than ECards and to use the new ESelectNamesModel API.  This leads
-	to a rather nice code simplication.
-	(remove_address): Changed for new ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Rather than just passing the entry's text
-	through the property bag, get the "address text" from the model.
-	This returns a nice, verbose string of addresses with names
-	expanded when the address is tied to an ECard (i.e. "Jon
-	Trowbridge <trow@ximian.com>").
-	(impl_SelectNames_get_entry_for_section): Make the text property
-	read-only.
-	(entry_set_property_fn): ...and since it is read-only now, chop
-	out the setter code.
-	
-	* gui/component/select-names/e-select-names-text-model.h: 
-	* gui/component/select-names/e-select-names-text-model.c: Again,
-	this code has been (pretty much) totally rewritten to convert all
-	text operations into changes on the ESelectNamesModel.  This lets
-	us give the associated EEntry some (IMHO) nice semantics regarding
-	whitespace, etc.  Includes object activation, so destinations tied
-	to ECards are underlined and can be double-clicked to bring up a
-	contact editor.
-
-	* gui/component/select-names/e-select-names-model.h: 
-	* gui/component/select-names/e-select-names-model.c: I've heavily
-	modified this object to both hide all implementation details
-	(which the old version exposed a bit too much for my peculiar
-	tastes) and to act as an EDestination container.  The old code put
-	the text model operations here.  I've moved them all to
-	ESelectNamesTextModel --- so the text model actions (insert,
-	delete, etc.) are all done through the API rather than operating on
-	ESelectNamesModel internals.
-
-	* gui/component/select-names/e-select-names-completion.c: Added.  A
-	fairly complicated object derived from ECompletion that searches
-	our local addressbook in various and sundry ways.
-
-	* gui/component/select-names/e-select-names-completion.h: 
-
-	* backend/ebook/e-destination.h: 
-	* backend/ebook/e-destination.c: Added.  This object encapsulates
-	a place to sent an email to, which can either be just a address as
-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge
-	<trow@ximian.com>"), or an ECard and a specific address within
-	that ECard.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used
-	ESelectionModelSimple and the changes to EReflow and EReflowSorted
-	to get multiple selection in the minicard view.
-
-	* gui/widgets/test-reflow.c: Changed this to get it to compile
-	with the changes to EReflow.
-
-2001-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
-	this pay attention to the return value of e_sexp_parse.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Fixed a const
-	inconsistency here.
-
-2001-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
-	new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track
-	change to idl.
-	(pas_book_respond_get_supported_fields): new function.
-
-	* backend/pas/pas-book.h: add GetSupportedFields to the
-	PASOperation enum.  Also, add a stringlist field to the PASRequest
-	struct.  lastly, add a prototype for
-	pas_book_respond_get_supported_fields.
-	
-	* backend/pas/pas-backend.h: remove prototype for
-	pas_backend_get_supported_fields, and remove it from the vtable.
-
-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):
-	remove.
-	(pas_backend_class_init): no vtable entry for get_supported_fields
-	anymore.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_supported_fields): new function.
-	(pas_backend_ldap_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_ldap_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): new function.
-	(pas_backend_file_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_file_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/idl/addressbook.idl: Book::getSupportedFields now
-	returns void and add BookListener::notifySupportedFields.
-
-	* backend/ebook/test-client.c (get_fields_cb): new function.
-	(auth_user_cb): track change to e_book_get_supported_fields.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): new function.
-	(e_book_check_listener_queue): add case
-	GetSupportedFieldsResponse.
-	(e_book_get_supported_fields): switch to async model.
-
-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an
-	async model.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): new
-	function.
-	(impl_BookListener_response_get_supported_fields): new function.
-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"
-
-	* backend/ebook/e-book-listener.h: add an async response for
-	GetSupportedFields and add a stringlist member to the
-	EBookListenerResponse struct.
-
-2001-02-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Moved the register_factory() code to here, since it was the only
-	thing being called anyways.
-	(PasBookFactoryPrivate): Added a "registered" flag.
-	(pas_book_factory_activate): Set the registered flag.
-	(pas_book_factory_destroy): Deactivate the factory when we go away.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.
-
-	* backend/ebook/e-book.h: add e-book interface to getting
-	supported fields.
-
-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some
-	spew about supported fields.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Remove PISOCK_LIBDIR
-
-2001-02-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): When creating the entry,
-	open up an ebook (corresponding to the local addressbook) and make
-	the entry use an EAddressCompletion.
-	(completion_handler): Added; this is the actual completion
-	handler, which manipulates the entry when the user selects
-	something from the drop-down.
-
-	* gui/component/select-names/e-select-names-model.c: Various hacks
-	by clahey to unbreak e_select_names_model_add_item,
-	e_select_names_model_replace_item (which I added) and
-	e_select_names_model_remove_item.
-	
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_obj_count,
-	e_select_names_text_model_get_nth_obj): Make chunks of text that
-	correspond to ECards in the ESelectNamesModel be embedded objects.
-	(e_select_names_text_model_activate_obj): On activation, pop up a
-	contact editor for the embedded object's card.
-	(e_select_names_text_model_model_changed): Fixed to work with
-	ETextModel API changes.
-	(e_select_names_text_model_set_text): Make const correct.
-	(e_select_names_text_model_insert): Make const correct.
-	(e_select_names_text_model_insert_length): Make const correct.
-
-	* backend/ebook/e-address-completion.h,
-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion
-	is a derived class of ECompletion that does asynchronous address
-	lookups for completions.
-
-2001-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add sequence<string> typedef, and
-	add getSupportedFields method.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new
-	function.
-
-	* backend/pas/pas-backend.c (pas_backend_class_init): init
-	get_supported_fields = NULL.
-	(pas_backend_get_supported_fields): new function.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_fields.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): new function.
-	(pas_backend_file_class_init): fill in get_supported_fields.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_supported_fields): new function.
-	(pas_backend_ldap_class_init): fill in get_supported_fields.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and
-	E_LIST_PROP here.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added
-	this function.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(e_minicard_event): Added an editor field to the EMinicard object.
-	Made it so that if you double click on the same card twice, it
-	doesn't open a new window, but instead raises the old.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	Free the ldap.binddn.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Free the dir strings.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Set the
-	header on the category dialog we pop up.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
-	Marked strings for translation in this newly created file.
-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
-	xml-i18n-tools framework.
-	* gui/component/Makefile.am: Same as above.
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
-	too.
-	
-2001-02-11  Jason Leach  <jasonleach@usa.net>
-
-	* gui/component/addressbook.c: Removed an ancient #include
-	<libgnorba/gnorba.h>
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-	
-	* conduit/e-address-conduit-control-applet.desktop: removed.
-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.
-	* conduit/Makefile.am: reflect above changes, merge translations.
-	
-	* contact-editor/e-contact-editor-strings.h,
-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
-	contact-editor/e-contact-editor-confirm-delete.glade.h,
-	gui/component/select-names/select-names.glade.h:
-	removed these files, xml-i18n-extract takes care of strings itself.
-	
-	* contact-editor/*.glade,
-	gui/component/select-names/select-names.glade,
-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:
-	changed project options to not output_translatable_strings.
-	
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,
-	gui/component/select-names/Makefile.am, printing/Makefile.am:
-	do not include removed files in EXTRA_DIST.
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh
-	out this check.  #ifdef the entire thing OPENLDAP2, as it only
-	works with the new schema stuff in openldap 2.x (both on server
-	and client, so upgrade your server.)
-	
-2001-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add
-	a contact *").
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	set the DEBUG_LEVEL if we're OPENLDAP2.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if
-	equal, FALSE otherwise.
-	(business_compare): same.
-	(homephone_compare): same.
-	(email_ber): return NULL if there are no elements in our list.
-	(homephone_ber): same.
-	(business_ber): same.
-	(build_mods_from_ecards): add smarts to handle list elements
-	properly (like email, business_phone, home_phone.)  now we'll
-	properly send updates if any element in the list changes.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): Added
-	-DEVOLUTION_DATADIR=\""$(datadir)"\".
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Changed the local and system
-	directories.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,
-	didn't mean to commit this.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolveperson.schema: new file.  this will eventually
-	form the suggested additions to an existing openldap server that,
-	along with support for inetorgperson, will allow people to store
-	all evolution attributes in ldap.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't
-	need the = NULL's since we g_new0.
-	(check_for_evolve_person): new function.
-	(pas_backend_ldap_connect): check to see if the evolvePerson
-	objectclass is there.
-	(build_mods_from_ecards): right now, just silently skip the extra
-	attributes if we don't support evolvePerson.
-	(add_objectclass_mod): new function, add both inetOrgPerson and
-	(if it's available) evolvePerson as objectclasses.
-	(pas_backend_ldap_process_authenticate_user): also check to see if
-	evolvePerson is there, if we couldn't do it (due to auth reasons)
-	in the connect method.
-	(prop_info): change the telephoneNumber LDAP attribute to be used
-	for evolution's business phone numbers.  the primary phone number
-	will be a single valued attribute on evolvePerson.
-	(business_populate): new function.
-	(business_ber): new function.
-	(business_compare): new function.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,
-	allocate 2 char*s when i assign 2 char*s.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to
-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.
-	(build_mods_from_ecards): don't include the mod if the value is ""
-	- this isn't valid on schema checking ldap servers.
-	(homephone_populate): new function.
-	(homephone_ber): new function.
-	(homephone_compare): new function.
-	(create_card_handler): add spew when adding cards so I can see
-	what's going on.
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-config.c (table_add_elem): Save the
-	help_text in the closure.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added
-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,
-	gal-view-minicard.c, and gal-view-minicard.h.
-
-	* gui/widgets/gal-view-factory-minicard.c,
-	gui/widgets/gal-view-factory-minicard.h,
-	gui/widgets/gal-view-minicard.c, and
-	gui/widgets/gal-view-minicard.h: New classes for minicard view
-	type.
-
-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff
-	properly.
-	
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
-	be quoted printable.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): This should be a close button,
-	not a cancel button.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Call
-	e_select_names_set_default when appropriate.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added support for
-	double clicking sending the selected contacts to the default
-	section.  Added a set_default function.  Made multiple selection
-	work.
-
-2001-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.
-	(table_add_elem): add help_text parameter and set up focus_in
-	events to display the help in the dialog's html area.
-	(focus_help): new function, calls put_html on the help text.
-	(addressbook_ldap_auth_item_new): add help texts.
-	(addressbook_source_item_new): add help texts.
-	(addressbook_source_dialog): add help texts.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Remove the butt-ugly arrow icon and
-	replace it with a less invasive "->" icon.
-
-2001-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add
-	comment about the else block here.
-	(prop_info): add home_address, business_address, business_fax,
-	assistant, and isdn.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made
-	this only add the initial VCard if it finds a file
-	"create-initial" in the directory it's creating the database in.
-
-	* gui/component/addressbook-component.c (factory_fn): Added a
-	create_folder function.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Fixed an unused variable
-	warning.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Setup the view collection
-	properly and handle the "display_view" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-	
-	* gui/component/addressbook.c (update_pixmaps): Consider the
-	placeholder in the path for the "Print" item.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Set the icon for
-	"/Toolbar/Find" to "24_find_contact.xpm".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_pixmap): New.
-	(update_pixmaps): New function, setting the pixmaps for the items
-	of type "pixbuf", using `set_pixmap'.
-	(control_activate): Call it.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.
-
-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.
-	(vcard_matches_search): esexp api fixes.
-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).
-
-2001-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to
-	add the lengths here (include the \0?  anyone?).
-	(build_mods_from_ecards): if we're filling in mod->mod_bvalues,
-	set mod_op |= LDAP_MOD_BVALUES.
-
-2001-01-23  Jason Leach  <jasonleach@usa.net>
-	
-	(Fix #1225: advanced search cancel/close)
-	
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Set it up with Search and a
-	Cancel button, Search is still the default.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): properly ref
-	the ecard. still need to kill some memory leaks.
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: remove vfs dependency
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (delete_record):  Remove
-	deleted records from the pilot map so we don't have dupes in the future
-	
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): 
-	* gui/widgets/e-minicard.c (e_minicard_event): Update for
-	e_popup_menu_run prototype change.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Use a gtk_object_set_data to set the
-	property to TRUE here.
-
-	(entry_changed): New function, calls bonobo_control_set_property
-	if entry_changed hasn't been set to TRUE yet.
-	
-	(impl_SelectNames_get_entry_for_section): Connect "changed" on
-	each entry_widget to the new entry_changed() func.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): always free 
-	the delivery elements and correct embarrassingly stupid memory error 
-	that was causing the addressbook conduit problems.
-
-	* backend/ebook/e-book-view-listener.c 
-	(e_book_view_listener_check_queue): ref/unref ourself when processing 
-	in case someone we signal unrefs us.
-
-	* conduit/address-conduit.c (sequence_complete): disconnect signals
-	when complete
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made
-	it return a gboolean; it was completely ignoring the return value
-	from register_factory().
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.
-
-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine
-	oainfo file until it is actually added to the repository.  We need
-	to keep the build working for nightlies to work.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix
-	Code/Ximian/ for the initial contact card.
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (print_local): prevent segfaults and 
-	buffer overflows
-	(print_remote): ditto
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: pass -module and -avoid-version to conduit
-	linker
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @copy_folder_fn arg to `evolution_shell_component_new'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: added i18n for etable.
-
-2001-01-11  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_create_card): get a book view from
-	somewhere so we can give status messages - choose the first one in
-	the list.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_remove_card): same.
-	(prop_info): add more properties, like home_phone, mobile, pager,
-	uri, org_unit, office, title, and manager.
-
-2001-01-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME
-	libraries at the end to make the thing compile.
-
-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	connect with the EAddressbookView's status_message signal.
-	(set_status_message): set the status message on the ShellView
-	Interface associated with our control.
-	(retrieve_shell_view_interface_from_control): new function.  get
-	the shell view inteface associated with a control.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): register status_message signal.
-	(status_message): new function, emit our status_message signal.
-	(change_view_type): connect with the view->object's
-	"status_message" signal.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add status_message signal.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): register our status_message
-	signal.
-	(status_message): new function, emit our status_message signal.
-	(e_minicard_view_widget_realize): connect to the EMinicardView's
-	status_message signal.
-
-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):
-	register our status_message signal.
-	(e_minicard_view_init): init status_message_id.
-	(status_message): new function, emit our status_message signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal.
-	(disconnect_signals): disconnect status_message_id.
-
-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and
-	status_message signal.
-
-	* gui/widgets/e-addressbook-model.c (status_message): new
-	function, emit our status_message.
-	(e_addressbook_model_class_init): register our "status_message"
-	signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal, so we can chain it to our parent.
-	(e_addressbook_model_init): init status_message_id.
-	(remove_book_view): disconnect status_message_id.
-
-	* gui/widgets/e-addressbook-model.h: add status_message_id, and
-	status_message signal.
-
-	* backend/pas/pas-backend-ldap.c change the objectclass we create
-	objects with to "inetOrgPerson" as it encompasses the fields we
-	use.
-	(create_dn_from_ecard): remove the mail/org handling from
-	here.  we just prepend cn=$cn onto the base dn.
-	(create_card_handler): remove the NULL that build_mods_from_ecards
-	adds at the end, and insert our objectClass.
-	(modify_card_handler): call search_for_dn to get the ECardSimple
-	of the old card, since it might (and does in the current code)
-	doing a brute force search.
-	(search_for_dn): new function, to search for an entry by its dn.
-	right now we brute force (objectclass=*) under the base dn and
-	compare dn's.  going to add a first pass that explodes the dn and
-	searches that way, using (objectclass=*) as a last resort.  also,
-	here's where we'd put the extensibleMatch code if we want to go
-	that route.
-
-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the
-	full name regenerate ecard->name.
-
-2001-01-04  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_authentication_response): new function.
-	(impl_BookListener_respond_authentication_result): new function.
-	(e_book_listener_get_epv): fill in
-	epv->notifyAuthenticationResult.
-
-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to
-	EBookListenerOperation.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_authenticate_user.
-
-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):
-	add authenticateUser method.
-	(GNOME:Evolution:Addressbook:BookListener): add
-	AuthenticationFailed and AuthenticationRequired to CallStatus.
-	also add notifyAuthenticationResult method.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_authenticate_user): dummy
-	authenticate_user function that always succeeds.
-	(pas_backend_file_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	gtk_object_unref(sexp) => s_exp_unref(sexp).
-	(pas_backend_ldap_process_authenticate_user): fill in to use
-	ldap_simple_bind_s.
-	(pas_backend_ldap_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new
-	function.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new
-	function.
-	(pas_book_respond_authenticate_user): new function.
-	(pas_book_get_epv): fill in epv->authenticateUser.
-
-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and
-	add user/passwd to the PASRequest struct.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_get_source_by_uri): new function.  should use
-	a hashtable, perhaps, but the lists will generally be small
-	anyway.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_storage_get_source_by_uri.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the binddn if the
-	auth page is shown.
-
-	* gui/component/addressbook.c (book_open_cb): shoe-horn
-	authentication in here.  if the source was configured to use
-	authentication, authenticate the user after opening the ebook.
-	also, be paranoid and clear out the password after authenticating.
-	(book_auth_cb): callback for auth.  set the "book" arg on the
-	view->view here.
-	(passwd_cb): set the view's passwd that'll be used in
-	book_open_cb.
-	(addressbook_view_free): g_free view->passwd.
-
-2001-01-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c,
-	gui/component/addressbook-component.h
-	(addressbook_component_get_shell_client): Added this function.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added code for the
-	ability to switch between different folders.  This doesn't work
-	yet.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Added an option
-	menu to this dialog.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Fix hard coded library names that were 
-	accidentally committed (i'm looking at you miggie)
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect
-	renaming.
-
-	* contact-editor/e-contact-editor-categories.[hc]: These are
-	living in gal now
-	
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view): check
-	capabilities is valid before doing a strstr.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search):
-	g_strdup things we g_free.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this
-	won't crash if the given contact is removed from the database
-	while this function is being called.
-
-	* gui/widgets/e-minicard.c: Made sure this won't crash if the
-	given contact is removed from the database while the right click
-	menu is being displayed.
-
-2000-12-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook-config.c (edit_source_clicked): copy
-	the dialog's source, destroy the dialog after we're done, and make
-	sure to update both columns in the clist.
-	(add_source_clicked): copy the dialog's source, and destroy the
-	dialog when we're done.
-	(addressbook_source_dialog_destroy): free up all the dialog's
-	memory.
-
-	* gui/component/addressbook.c (set_prop): allow file: uri's that
-	point to files, not just dirs that contain addressbook.db.  The
-	rule is the addressbook file has to end in .db.
-
-	* gui/component/addressbook-storage.c (file_source_foreach):
-	contactserver => contactfile.  cut and paste error.
-	(addressbook_storage_init_source_uri): use file://%s to build the
-	uri.
-
-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these
-	in my last commit.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (config_cb): new function, calling
-	our new config ui code.
-	(control_activate): no longer load evolution-addressbook-ldap.xml,
-	as it's not there.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	setup_ldap_storage => addressbook_storage_setup.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].
-	(glade_DATA): remove ldap-server-dialog.glade and add
-	addressbook-config.glade.
-	(EXTRA_DIST): same.
-
-	* gui/component/addressbook-config.[ch]: add another dialog to
-	give a list of our sources and offer the Add/Delete/Edit
-	interface.  This plugs into the previous dialog work (the source
-	editor.)
-
-	* gui/component/addressbook-storage.[ch]: new files, containing
-	the remains of e-ldap-storage.[ch] and adding the new
-	AddressbookSource type and it's subordinates.  Also, the xml
-	format has changed slightly and the file name is no longer
-	~/evolution/ldap-servers.xml - it's
-	~/evolution/addressbook-sources.xml.
-
-	* gui/component/addressbook-config.glade: new file, new config
-	interface.
-
-	* gui/component/ldap-server-dialog.glade: removed.
-
-	* gui/component/e-ldap-storage.[ch]: removed.
-
-2000-12-28  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	addressbook-config.[ch].
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: new files, containing at the
-	moment a beautiful "new/edit source dialog" inspired by the
-	mail-config-gui code.  It'll be ready for prime time after rev'ing
-	the .xml file the addressbook uses to store it's "other sources"
-	to include files, and the addition of the ldap auth stuff.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw
-	background to FALSE.
-	
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
-	(e_minicard_label_construct): ditto
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix
-	drop down box.  Patch submitted by Martin Hicks <mort@bork.org>.
-
-2000-12-21  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put
-	in the change list
-	(next_changed_item): util function to get the real next changed item
-	(compute_status): really compute the status of the record
-	(local_record_from_uid): Set the id of the temporary card
-	(check_for_slow_setting): Make this check a little saner
-	(card_added): Only record the CardObjectChange if the card is not
-	archived
-	(card_changed): ditto
-	(card_removed): ditto
-	(set_status_cleared): actually clear the status
-	(for_each_modified): Clean out cruft and use next_changed_item
-	(add_record): Set the new id properly in our local card copy
-	(replace_record): handle the case where the record has been deleted
-	and we need to call add.  need to update the changed_hash entry
-	(delete_record): Don't panic if the card is not found, its already
-	been deleted.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	The change_context no longer has a del_cards member
-	(pas_backend_file_book_view_free): ditto
-	(pas_backend_file_process_get_changes): ditto
-	(pas_backend_file_changes_foreach_key): just record the id
-	(pas_backend_file_changes): notify_remove needs an id not a vcard
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (match): Use my own wrapper
-	functions instead of trying to *directly* access the the data 
-	structures my self
-	(post_sync): Put in hack to prevent syncing the same records twice
-	(local_record_from_uid): set the card id when creating a blank one
-	(add_record): Set the id of the card we have and don't go to the
-	server to get the latest version
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Convert
-	pilot strings to utf for the e-cards.
-	
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard
-	strings to pilot encodings
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if
-	you select multiple contacts, the right click menu to delete
-	deletes them all.
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always
-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to
-	NAME_ERROR).
-	(build_card_from_entry): ldap_get_values can return NULL.  also,
-	openldap2 keeps us from getting at ldap->ld_errno, so we can't
-	tell if there was a decoding error like we used to.  the double
-	free problem where ldap would free the ber if there was a decoding
-	problem might be fixed now..  further investigation is needed.
-	for now we leak in openldap2.
-	(ldap_search_handler): the ldap structure is opaque, so use
-	ldap_search_ext to give the extra information (the max responses,
-	timeout, etc.) in the openldap2 case.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test
-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,
-	use it instead of NAME_ERROR.
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut
-	and paste description error.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate
-	the returned vcard so we don't sometimes end up with trailing
-	junk that makes libversit unhappy.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_add_section): Make the -> into a GNOME stock image.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Connect to the "cursor_change" signal on
-	the ETable here instead of the ETableScrolled.
-	(remove_address): Added the col and event parameters to this
-	callback to match the added parameters to the double click signal.
-	(e_select_names_add_section): Connect to the "double_click" signal
-	on the ETable here instead of the ETableScrolled.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"
-	argument, copy the incoming name.  This fixes a crash.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made editing the name using
-	the full name button set the file as entry properly.  Made it
-	so that the address parse that the user chooses after
-	clicking on the Full Address... button gets saved.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it
-	so that the editor->name is set after the entry is changed.  This
-	means that the reparse that the person chose is saved.
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
-	as the @toplevel_node_handler_id argument to
-	`evolution_storage_new'.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed some formatting.
-
-	* contact-editor/e-contact-editor-categories.h: Removed an
-	unneeded #include.
-
-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the
-	ETable instead of the ETableScrolled.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather
-	than NULL to e_card_new.
-	(local_record_from_ecard): Make sure ecard->name is valid
-	(check_for_slow_setting): Remove hard coded test value
-	(card_added): g_strdup the resul of e_card_get_id
-	(card_changed): ditto
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing
-	the ETableScrolled proxy functions.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Moved the gal view menu stuff from
-	here to EAddressbookView.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New function to set up the menus
-	for the EAddressbookView.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Another conduit build fix
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): 
-	Create an empty vcard with the appropriate id for deleted cards
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the
-	address fields are added sensibly
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the
-	call to `evolution_storage_new()': pass NULL for
-	@toplevel_node_uri.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(view_cb): kill warning
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Remove "complete" field
-
-	* conduit/address-conduit.c (print_local): Make it print useful debug
-	info
-	(print_remote): ditto
-	(local_record_from_ecard): Make sure phone numbers get out to the pilot
-	(ecard_from_remote_record): Set phone strings to "" if they are null
-	(sequence_complete): unref the book view
-	(view_cb): ref the book view
-	(free_prepare): do nothing
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Destroy the card lists with the rest of the view.
-	(pas_backend_file_changes): Don't destroy the card lists here
-	(pas_backend_file_book_view_free): Free the card/id lists in the
-	change context here, the correct place.
-	(pas_backend_file_changes): instead of here...
-
-2000-11-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL
-	in pas_backend_file_process_get_book_view.  Changed
-	pas_backend_file_book_view_copy a bit.
-
-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.
-
-2000-11-18  Matt Bissiri  <matt@bissiri.org>
-
-	* gui/component/Makefile.am:
-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD
-	so that it will link properly now that gal-view-menus.[ch]
-	was moved from gal into evolution.
-
-2000-11-15  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Initialize destination struct with '0's.
-
-2000-11-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"
-	to "text/x-vcard".
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* backend/ebook/.cvsignore: Add idl-generated files.
-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):
-	* backend/ebook/e-card.c: (e_card_send):
-	s/Evolution_/GNOME_Evolution_/g;
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Link in composer bonobo code.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	send mail to an ECard or send an ECard as a VCard attachment.
-
-	* contact-editor/e-contact-editor.c: Add verbs to send the contact
-	as a VCard or send mail to the contact.
-
-	* gui/search/e-addressbook-search-dialog.c: Removed some unused
-	variables.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:
-	Added menu items to send the contact as a VCard or send mail to
-	the contact.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/component/addressbook.oafinfo:
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Fixed a warning.
-
-	* gui/component/addressbook.c: Put in gal view menus for testing
-	purposes.
-
-	* printing/e-contact-print-envelope.c: Fixed up envelope printing
-	a bit.  Added code for printing return addresses.
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool
-
-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
-	(card_added): callback for book view
-	(card_changed): ditto
-	(card_removed): ditto
-	(sequence_complete): ditto
-	(view_cb): callback for the get changes call
-	(pre_sync): force synchronous loading of book view
-	(for_each): we already have the card so create the local record directly
-	(for_each_modified): Uncomment and fix
-	(delete_record): ditto
-
-	* conduit/Makefile.am: link against gal for ebook - needs fixing
-
-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
-	to a get_changes call
-	(e_book_check_listener_queue): define the get changes response operation
-
-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
-	Queue up a get changes response
-	(impl_BookListener_respond_get_changes): Implement the get_changes method
-	(e_book_listener_get_epv): add get_changes implementation to epv
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
-	copy the search_context and change_context elements if they actually exist
-	(pas_backend_file_changes): Hard code a path for now, only notify if
-	there is something to notify about
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-book.h: Update PASRequest structure
-
-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name
-	(pas_book_queue_get_changes): Use PASRequest change_id slot
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Properly copy change_id and change_context
-	(pas_backend_file_book_view_free): Free change_id/change_context
-	(pas_backend_file_changes_foreach_key): Callback to figure out the
-	deleted cards
-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.
-	Write out updated hash
-
-	* backend/idl/addressbook.idl: Rename get_changes param
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Switched from EAddressbookSearch to
-	ESearchBar.
-
-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.
-	This has been moved to filter/ and renamed ESearchBar.
-
-	* printing/e-contact-print-envelope.c: Forgot to set the font.
-	This works for me now.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_get_entry_for_section): Duplicate the object
-	reference before returning.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add
-	menus items to the envelope printing stuff.
-
-	* gui/component/addressbook.c: Hook up the search menu.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Add the search menu.
-
-	* printing/Makefile.am: Add e-contact-print-envelope.c and
-	e-contact-print-envelope.h.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Added envelope printing.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Clean the idl-generated
-	files properly.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
-	unnecessary .cvsignores.
-
-	* gui/component/addressbook.c: Switch to using EAddressbookSearch
-	instead of custom quick search widget.
-
-	* gui/component/select-names/e-select-names.c: Made this do a
-	slightly better job of rendering names.
-
-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
-	e-addressbook-search.h.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: New class that puts up an
-	entry and a combo box.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): 
-	(e_ldap_storage_add_server): Add "highlighted" flag to
-	evolution_storage_new_folder
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense
-	(compute_pid): remove
-	(local_record_from_ecard): Create local record from ecard - not finished
-	(local_record_from_uid): Obtain local_record from uid with the proper
-	e-book way
-	(set_status_cleared): Add empty callback
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): Add empty callback
-	(conduit_get_gpilot_conduit): Update signal connects
-
-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine
-	the type of change - not finished
-	(pas_backend_file_search_changes): Create a view and callback based on 
-	how the cards have changed
-	(pas_backend_file_process_get_changes): Implement the get changes operation
-	for files
-	(pas_backend_file_process_client_requests): Add GetChanges method for
-	processing
-
-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to
-	the list
-	(impl_Evolution_Book_get_changes): implement object method
-	(pas_book_get_epv): Add get changes to epv
-	(pas_book_respond_get_changes): Respond to the get changes operation
-
-	* backend/pas/pas-book.h: Add GetChanges PASOperation
-
-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes
-	methods
-
-	* backend/ebook/e-book.c (e_book_get_changes): Client function
-	to a view of the changed objects
-
-	* backend/ebook/e-book.h: New prototype
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/e-book/e-card.c: Fixed marking of strings
-	for translation. Use "_(" instead of "_ (".
-	* gui/component/addressbook-factory.c: Add missing
-	calls to bindtextdomain() and textdomain noticed by
-	Dan Winship.
-	* gui/component/addressbook.c: Marked string for translation.
-	
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/Makefile.am, gui/search/Makefile.am,
-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
-
-	* gui/component/select-names/e-select-names-manager.c: Turned off
-	newlines in header fields.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* printing/e-contact-print.c (e_contact_print_letter_tab),
-	(complete_sequence, e_contact_do_print_phone_list, lowify):
-	unsigned charness.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only
-	call the handler if the if we're connected, and if we fail to
-	connect finish the op and post a message.
-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.
-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY => LDAP_SUCCESS.
-	(modify_card_handler): only perform the ldap_modify_s if we have a
-	list of modifications.
-	(get_cursor_handler): use ldap_error_to_response here.
-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant
-	389.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): 
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* backend/pas/Makefile.am (INCLUDES): 
-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduit/address-conduit.c: ditto
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read
-	(post_sync): Use e_pilot_map_write
-
-	* conduit/Makefile.am: Link libeconduit and not libical
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
-
-	* gui/component/addressbook.c (toggle_view_as_cb): 
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: New structure of file - similar
-	to calendar/todo conduits
-
-	* conduit/address-conduit.c: ditto
-
-	* conduit/address-conduit-config.h: Config stuff for conduit
-
-	* conduit/.cvsignore: Update
-
-	* conduit/Makefile.am: Build fixes
-
-	* conduit/address-conduit-control-applet.desktop: Renamed
-	to e-address-conduit-control-applet.desktop
-
-	* conduit/address.conduit.in: Renamed to e-address.conduit.in
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name
-	column since it's a bit weird.  This also fixes the initial state
-	since all of the column choices were off by one.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* printing/Makefile.am (glade_DATA): Remove
-	`e-contact-print.glade.h'.
-	(EXTRA_DIST): Move here.
-
-	* gui/component/Makefile.am (glade_DATA): Remove
-	`ldap-server-dialog.glade.h'.
-	(EXTRA_DIST): Move here.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Change how the extension field acts when
-	converting delivery addresses to labels.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the
-	function e_card_delivery_address_to_label.
-
-	* contact-editor/e-contact-editor-address.c: Fixed a potential
-	crash.
-
-	* contact-editor/e-contact-editor.c: Made this save the changed
-	data to the string version of the address.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (change_view_type): update to new
-	UI handler.
-	(update_view_type): split from (change_view_type).
-	(control_activate): add an update_view_type.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the
-	email address if both name and organization are taken.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the spec
-	strings in this class.  Removed the "cursor_mode" argument to
-	ETable since it's part of the spec now.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Change the initial dialog 
-	visibility to FALSE
-	so the contact editor doesn't flash when it appears.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per manager.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
-	bit better.
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am:
-	* gui/component/Makefile.am: Remove CPPFLAGS since they just
-	duplicate flags that were already in INCLUDES.
-
-	* printing/Makefile.am (ecpsdir): 
-	* gui/widgets/Makefile.am:
-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
-	INCLUDES so they don't override any CPPFLAGS set at configure
-	time.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): if we are in
-	LDAP mode then merge in the extra few items, otherwise just merge
-	the standard thing; saves duplication.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per id.
-	(e_select_names_manager_destroy): Destroy the hashtable.
-	(e_select_names_manager_init): Init the hashtable.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged these fields a bit more.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Changed these for boolean
-	ascending attribute instead of int ascending attribute.  Fixed
-	e-select-names to not use a column past the end of its array.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged the address editor dialog.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed the column
-	elements, the no-headers attribute and added a cursor-mode=line
-	attribute.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Updated these to the new style
-	ETables.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed
-	ondemand callback nonsense from rule_context_load().
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-	(e_contact_editor_init): upd.
-
-	* gui/component/addressbook.c (control_activate_cb): upd.
-	(control_deactivate): kill.
-	(control_activate): upd.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-Fri Sep 29 07:33:54 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so
- 	that minicard doesn't write out changes to the backend unless
- 	something's actually changed.
-
-Tue Sep 26 16:28:47 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make sure that card->name and
- 	card->full_name are always valid.
-
-	* contact-editor/e-contact-editor.c: Removed some unused
- 	variables.
-
-2000-09-22  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* contact-editor/e-contact-editor-fullname.c (extract_info): If
-	(editor->name == NULL), store ptr to newly allocated ECardName in
- 	editor->name, not just in a stack variable.  This fixes a crash
- 	which happened when you click "New", then click "Full Name...",
- 	then enter name, then click "OK".
-
-	* backend/ebook/e-card.c (e_card_name_to_string): Add
- 	g_return_val_if_fail.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/widgets/Makefile.am:
-	* gui/component/Makefile.am:
-	* contact-editor/Makefile.am:
-	* printing/Makefile.am: Look for ename in /e-util/ename instead of
-	/addressbook/ename
-	
-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
-
-	* ename: Moved to /e-util so it could be shared
-
-	* Makefile.am (SUBDIRS): took out ename
-
-2000-09-25  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added a ton of new prefixes and
-	suffixes.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
- 	remove/modify/create functions.  add another flag for the property
- 	table, PROP_DN, which makes it easy for us to determine when we
- 	need to create a new DN for a record when we're modifying.  also
- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills
- 	in the list of bvalues that we send to the ldap server.  The
- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly
- 	complex (yay ldap).
-	(ldap_search_handler): act synchronous when ldap_search responds
- 	with -1.
-	(view_destroy): use pas_book_view_notify_status_message.
-	(ldap_op_process_current): same
-	(ldap_op_process): same
-	(poll_ldap): same
-	(ldap_search_handler): same
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-simple.h: add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.
-
-	* backend/ebook/e-card-simple.c (field_data): add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.
-	(e_card_simple_get): add getter for FAMILY_NAME.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Made addresses be quoted printable again
- 	so that they will encode properly if they have carriage returns in
- 	them.  This is possible now because of a fix in libversit.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a
- 	function to set the status message associated with a given view.
-  	This is not yet implemented in the gui.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c, backend/ebook/e-book.h,
-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,
-	backend/pas/pas-backend.h, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Added a function to query static
-	capabilities (capabilities that can be reported immediately) and
-	implemented them in the 2 servers.
-
-	* gui/component/addressbook.c: Added a View All button and a Stop
-	button.  Sorted out the new directory server stuff a bit.
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop
-	function.  Check for capabilities before deciding whether to load
-	all cards when initially viewed.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: Added stop and view all
-	functions.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added a stop function.  Check for capabilities before deciding
-	whether to load all cards when initially viewed.
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): remove _UIHandler
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Added a missing include
-	of ctype.h.
-
-	* backend/pas/pas-backend-file.c: Fixed a problem where using a
-	GList was causing us to not be reentrant.  We now use an EList
-	here and so now this is reentrant.  This should fix the "wombat
-	crashes every time you run evolution" bug.
-
-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Make this work when a
-	field is spread across multiple lines.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
-	wants_html field to cards.  Uses "x-mozilla-html".
-
-	* contact-editor/Makefile.am: Added definition of
-	EVOLUTION_DATADIR.
-
-	* contact-editor/contact-editor.glade: Make Wants HTML check
-	button visible.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Make Wants HTML check button
-	active.  Fix UI stuff to use XML.  Set parent window of
-	confirm_delete dialog.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
-	the parent window of the confirm_delete dialog.
-	
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards
-	when the addressbook was first loading.  (It was overwriting a
-	string with NULL during init.)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* gui/search/Makefile.am (ruledir): Use $(datadir), not
-	$(prefix)/share
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
-	ename/Makefile.am, gui/component/Makefile.am,
-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h,
-	contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
-	ename/test-ename-western-gtk.c,
-	gui/component/addressbook-factory.c, gui/component/addressbook.c,
-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
-	gui/component/select-names/e-select-names-bonobo.c,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
-	printing/e-contact-print.c: Fixed the #include lines to deal
-	properly with gal.
-	
-2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.h,
-	contact-editor/e-contact-save-as.h,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,
-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.
-
-	* gui/component/addressbook.c: Removed all of the code to actually
-	create and display the correct view of the addressbook and moved
-	it to the new class gui/widgets/e-addressbook-view.c.
-
-	* gui/widgets/Makefile.am: Added everything necessary for
-	e-addressbook-view.c and e-addressbook-view.h.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New class to deal with actual
-	display of addresses and switching between card view and table
-	view.
-
-	* gui/widgets/e-minicard-view-widget.c: Made this deal more
-	gracefully with having the book set to NULL.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: fix broken include.
-
-	* gui/component/Makefile.am (INCLUDES): define datadir.
-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
-
-	* gui/component/addressbook.c (control_activate): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/widgets/Makefile.am (gladedir): Define.
-	(glade_DATA): Install `alphabet.glade'.
-	(EXTRA_DIST): Define.
-
-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.
-	(EXTRA_DIST): Remove `alphabet.glade.h'.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add
-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this
-	is what Chris meant to do.
-
-	* gui/component/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/gui/widgets'.
-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'
-	and `e-addressbook-model.h'.
-
-	* gui/component/select-names/e-select-names.c: #include
-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of
-	"addressbook/gui/component", as it has been moved there.
-
-2000-09-15  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: split all the ldap operations
-	into 2 halves, a handler, and destructor, and create a structure
-	containing two function pointers and any data they need.  this
-	allows us queue up pending operations (since the LDAP*'s are no
-	longer view specific.  there's one per backend.)  also, add
-	support for restarting async operations if the SERVER DOWN error
-	isn't communicated until sometime after the handler is called (as
-	is the case with the async search stuff.)
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Call unicode_init
-	for e-font stuff.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added
-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.
-
-	* gui/component/addressbook.c: update include.
-
-	* gui/component/addressbook-factory.c: update include.
-
-	* gui/widgets/e-minicard-view.h: update include.
-
-	* gui/search/e-addressbook-search-dialog.c: update include path.
-
-2000-09-13  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.
-	(create_toolbar): ditto.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c: Radicaly update UI handler code.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to
-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,
-	and e-reflow-sorted.h.
-
-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and
-	libereflow.a to a bunch of LDADD lines.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libereflow.a here.
-
-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Add space after `-I'
-	when invoking `orbit-idl'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a crash error.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-11  Jesse Pavel <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: fixed certain address parsing
-	problems.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Made this a bit better balanced.
-
-	* gui/component/addressbook.c: Make the toolbar button for find do
-	the same thing that the menu item for search does.
-
-	* gui/search/e-addressbook-search-dialog.c: Made the top half of
-	this not expand.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Removed a bunch of redundant code.  Made it so that when you set
-	an address label, it sets the delivery address as well.  Added
-	functions to set and get the delivery address.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	convert and address label to a delivery address.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],
-	fulladdr.glade, fulladdr.glade.h.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Switched from a label
-	to a button to show the parsed address.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-address.h: New class to implement
-	the parsed address dialog.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h: Added const to the
-	_new function.
-
-	* contact-editor/e-contact-editor.c: Implemented clicking on the
-	address button.
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	New glade files for the parsed address dialog.
-
-	* contact-editor/fullname-strings.h, fullname.glade: Changed these
-	accellabels to labels.
-
-	* ename/Makefile.am: Added e-address-western.c.
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Added by Jesse.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):
-	Use canvas default font
-
-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto
-	(get_left_width): Ditto
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
-
-2000-09-02  Lauris kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers
-
-	* contact-editor/e-contact-editor.c: e_utf8 wrappers
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the
-	extra arg now needed by `evolution_storage_new_folder()'.
-	(e_ldap_storage_add_server): Likewise.
-
-2000-08-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and
-	`-I$(top_srcdir)'.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook
-	and load-pine-addressbook.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Add a name to the minicard
-	viewer.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* backend/ebook/e-book.c: 
-	* backend/ebook/test-client.c: 
-	* backend/ebook/test-client-list.c: 
-	* backend/ebook/load-gnomecard-addressbook.c: 
-	* backend/ebook/load-pine-addressbook.c: 
-	* backend/pas/pas-book-factory.c: 
-	* conduit/address-conduit.h: Remove USING_OAF checks
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Use the right argument name to turn
-	on grid lines.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Comment out minicard-view-test
-	since its gnorba dependent
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):
-	ditto
-
-	* gui/component/addressbook.c: ditto
-
-	* gui/component/addressbook-factory.c: ditto
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* demo/* Removed the demo directory since it's no longer used.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.gnorba: Kill
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook.gnorba: Kill
-
-	* gui/component/Makefile.am:  Remove gnorba stuff
-
-2000-08-25  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
-	-export-dynamic so libglade will be able to resolve custom widget
-	callbacks.
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase
-
-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper
-	(extract_field): Same
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash
-
-	* ename/Makefile.am: Link demo with libeutil.la
-
-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper
-
-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper
-	(search_entry_activated): Same
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the
-	arguments to rule_context_load.
-
-	* backend/ebook/e-card.c: Fix this to not mess up if the person
-	passes a VCard with a carriage return in the mailing address.
-
-2000-08-14  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/addresstypes.xml: Fixed fullname->full_name for
-	search field.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we
-	actually got any parts to build the dialogue with.
-
-2000-08-13  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Set the
-	global_shell_client nastyhack when we know it.
-	This is only required to link with the filter code ...
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libfilter.a to the link line.
-
-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name
-	from libaddressbooksearchdialog to libaddressbooksearch, as used
-	elsewhere.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget):
-	Implement.
-	(get_query): Likewise.
-	(e_addressbook_search_dialog_destroy): Unref filter stuff when
-	done.
-
-	* gui/component/addressbook.c (control_deactivate): Added chris's
-	patch to put the meny in
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/e-card.h: Started adding a time zone field to ECard.
-
-	* gui/component/e-addressbook-model.c: Added
-	e_table_model_pre_change where appropriate.
-
-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Linked in the search dialog again.
-	It looks like some changes in the shell made this not work.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed
-	this to use ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Fixed a memory leak.
-
-	* gui/component/addressbook.c: Added stuff to the right click
-	menu.  Activated the new search dialog that doesn't quite work
-	yet.
-
-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.
-
-2000-08-15  Larry Ewing  <lewing@helixcode.com>
-
-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors
-	for the selected state.  This doesn't properly redraw the minicard
-	when there is a style_change event, that is next.
-	(e_minicard_realize): use style colors.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h
-	as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
-	address-conduit.h
-
-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if
-	ENABLE_PILOT_CONDUITS is set.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (SUBDIRS): add conduit subdir.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
-	special oaf initialization hack so conduit can find wombat, and
-	accept all cookies so that we can actually talk to oaf.
-
-2000-08-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the
-	wrong field to be searched.
-
-	* gui/component/select-names/e-select-names.c: Made the select
-	names dialog only display entries with email addresses.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Fixed a typo in the name of
-	the first phone entry.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/Makefile.am,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: A few small interface
-	fixes.
-
-	* gui/component/Makefile.am: Link in the addressbook search
-	dialog.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added the search directory.
-
-	* backend/ebook/e-book.c: Fixed a potential crash.
-
-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
-
-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
-
-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Ettore fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk
-	object.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-view.c: Ref our book view listener.
-
-	* gui/component/addressbook.c: Updated to use new minicard view
-	widget.
-
-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and
-	e-minicard-view-widget.h.
-
-	* gui/minicard/e-minicard-view-widget.c,
-	gui/minicard/e-minicard-view-widget.h: New class that's just a
-	minicard view in an ECanvas.
-
-	* gui/search/e-addressbook-search-dialog.c: New file for
-	implementing a search dialog.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (transmit): implement code to encode
-	the first email address and send to the pilot.
-	(get_phone_label_by_flag): rename find_phone_label_for_flags to
-	this, and implement by calling get_phone_label_by_name.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): add code
-	for handling email addresses from pilot (which stores it as a
-	phone number entry.  go figure.)
-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).
-	(update_record): un #if 0 the code to handle the case where the
-	pilot info has changed for a local record.
-	(merge_ecard_with_remote_record): implement function, but for now
-	just return the existing (desktop) record - we still don't allow
-	merge from the pilot.
-
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/addresstypes.xml: Changed a couple of input field
-	names.
-
-2000-08-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove prototype for
-	`setup_ldap_storage()', which shouldn't be here anyway.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/, gui/search/addresstypes.xml: New search dialog for
-	addressbook.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Update for
-	changed prototype, pass evolution_homedir arg to
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes
-	an evolution_homedir arg, uses that to generate the path to the
-	ldapservers.xml file, and stores the result in a static variable.
-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that
-	static variable rather than hardcoding the path to the file.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on
-	missing phone numbers or email addresses.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added a button to save to
-	your addressbook.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/component/addressbook.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added some military prefixes.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Add the stock
-	print icon to the print item.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the print
-	item in the right placeholder so that it gets the right position
-	in the "File" menu.
-	(control_deactivate): Updated accordingly.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed
-	e_popup_menu_run call to match the new arguments.
-
-	* gui/component/addressbook.oafinfo: Fixed this file to work
-	properly.
-
-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID
-	here.  Also cleaned up the code a bit with the help of Michael
-	Meeks.
-
-2000-08-08  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):
-	use x-evolution-any-field.
-
-	* gui/component/addressbook.c (search_entry_activated): use
-	x-evolution-any-field.
-	(change_view_type): same.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query
-	to x-evolution-any-field.
-
-	* backend/pas/pas-backend-ldap.c (func_contains): support
-	x-evolution-any-field for matching any evolution supported field.
-
-	* backend/pas/pas-backend-file.c (compare_email): switch to using
-	ECardSimple calls.
-	(compare_phone): same.
-	(compare_address): same.
-	(entry_compare): switch to using ECardSimple calls, and support a
-	'x-evolution-any-field' wildcard field.
-	(vcard_matches_search): use an ECardSimple.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Removed the next and prev
-	toolbar buttons since they don't do anything.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c: Fixed the tab order to not
-	repeat the web page address field.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed the tab order for this
-	dialog.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed a warning.
-
-	* backend/ebook/e-card.c: Cast to (char *) in
-	e_card_load_cards_from_file since libversit isn't const correct.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): unref.
-
-	* demo/addressbook.c (control_activate): unref.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Emit "model_pre_change"
-	signal as appropriate.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Adapted this to supply the
-	new append_row API of ETableModel.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Changed the default set of columns.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook
-	compilation.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_load_cards_from_file helper function to load multiple cards
-	from a single file.
-
-	* backend/ebook/load-gnomecard-addressbook.c: New file to load
-	vcard files.  I think this is the format that gnomecard uses so if
-	you copy your gnomecard file to gnomecard.vcf and then run this
-	program in the same directory, it'll copy all your gnome contacts
-	into evolution.  It needs to be changed to take a filename as a
-	parameter.  Some fields (phone and address information, for
-	example) aren't displayed properly, but are saved.  This is new
-	code, so some other than phone and address may be lost.
-
-2000-07-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and
-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even
-	if the OpenLDAP support is not enabled.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load
-	to.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the
-	view until we've taken care of freeing its internals.  also, close
-	the ldap connection here.
-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,
-	since it's always called when we create a view.
-	(pas_backend_ldap_build_all_cards_list): open an ldap connection
-	in this function and close it at the end.
-	(poll_ldap): make sure to call ldap_unbind to close the view's
-	connection here.
-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -
-	ldap_unbind will either be called from poll_ldap or from
-	view_destroy.
-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an
-	LDAP*.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): same.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: lowercasify the
-	supported_mime_types
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.
-
-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.
-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.
-	(set_status): implement.
-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous
-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.
-	(local_record_from_ecard): get the current status from the ecard.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.
-	(parse_pilot_status): new function.
-	(e_card_class_init): add pilot status object arg.
-	(e_card_set_arg): add pilot status support.
-	(e_card_get_arg): same.
-	(e_card_init): initialize pilot_status to 0.
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c: add comment headers to signals that
-	didn't have any.
-	
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (start_address_server): use the user's
-	Contact db.  not toshok's.
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
-	opened ok.
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
-	version of the library for address conduit to use
-
-	* backend/ebook/Makefile.am: build a static version of the library
-	to link into the conduit
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Added a #define for
-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's
-	in properly from VCards.  Rearranged some field orders.  Added a
-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.
-
-2000-07-24  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card.h: add pilot_id.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add support for
-	X-EVOLUTION-PILOTD vcard field.
-	(e_card_class_init): add pilot_id arg.
-	(e_card_set_arg): handle pilot_id arg.
-
-2000-07-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c: Remove the idle handler
-	when we're destroyed.
-
-	* printing/e-contact-print.c: Fixed the spacing on the card
-	header.
-
-2000-07-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Fixed the oaf info.
-
-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,
-	gui/minicard/e-minicard-widget-test.c: Added a test for the
-	minicard widget.
-
-	* gui/minicard/e-minicard-control.c: Fixed the mime type.
-
-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent
-	isn't a minicard view.
-
-	* gui/minicard/e-minicard-control.oafinfo: Removed.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Update for
-	the new `evolution_shell_component_new()'.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduit/address-conduit-control-applet.desktop:
-		Added the Turkish desktop entry.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the
-	list of mime types we support.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/Makefile.am: Added
-	gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c, and
-	gui/minicard/e-minicard-widget.h.
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: Got these to compile.
-
-	* gui/minicard/e-minicard-control.gnorba,
-	gui/minicard/e-minicard-control.oafinfo: Copied directly from
-	bonobo-clock-control.  These aren't done yet.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: New files for using a minicard
-	as a widget or a bonobo control.
-
-2000-07-14  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.
-	don't save the port in the host slot either.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-confirm-delete.glade,
-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added
-	these.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the order of compilation of printing and
-	contact-editor.
-
-	* contact-editor/Makefile.am: Added printing libraries and a
-	confirm delete dialog glade file.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Enabled the delete and print
-	functions as well as providing a confirm delete dialog to the
-	outside world.
-
-	* gui/component/addressbook.c: Made the delete button on new cards
-	active.
-
-	* gui/minicard/Makefile.am: Added printing libraries to a number
-	of test programs.
-
-	* gui/minicard/e-minicard.c: Added print and delete to the right
-	click menu.  Made the delete button on the card editor active.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a
-	function to print a single card.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix
-	typo that was saving the port in the rootdn spot.
-	(save_ldap_data): make this a bit safer - writing to a new file
-	and renaming it.
-	(load_ldap_data): make this a bit smarter - if parsing the
-	ldapservers.xml file fails and there's a .new file there,
-	rename it.
-	
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Do case insensitive compares.
-
-	* addressbook/gui/component/addressbook.c: Make quick search
-	search both name and company name.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added installation of arrow.png.
-
-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed an unused function
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl
-	file to EXTRA_DIST
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Remove the
-	SelectNames test.
-
-2000-07-10  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)
-	Make multiple addresses be concatenated correctly.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Switched from ETable
-	to ETableScrolled.
-
-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or
-	"name or org" fields.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a field that gives the name if it exists and the company
-	name otherwise.
-
-	* gui/component/e-addressbook-model.c: Formatting changes.
-
-	* gui/component/select-names/e-select-names-table-model.c: Added
-	stripping of names and display of company name if name doesn't
-	exist.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the
-	display so that we display both name and email address.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: Fixed a small
-	off by one error that was causing an extra character to get
-	deleted sometimes.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(main): Put the contacts list in an EScrolledFrame instead of using a
-	separate GtkScrollbar.
-
-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and
-	don't allow drags on dividers that aren't visible.
-
-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of
-	using a separate GtkScrollbar.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed unused do_nothing_cb
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: Made the OK
-	and Cancel buttons in the ESelectNames dialog we create work
-	properly.
-	
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added
-	e_select_names_model_duplicate.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made the
-	text be set correctly if there's already data in the source when
-	the text model is created.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Removed handling of
-	the buttons (the user of this dialog will have to handle them.)
-	Added e_select_names_get_source.  Fixed some typos.
-
-2000-07-09  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook.c: Link the toolbar print button to
-	the print callback.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_clicked): Hitting OK or Cancel at least closes the
-	dialog now.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Set the returned entry to
-	use the ellipsis.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-factory.c: Include
-	e-select-names-factory.h.
-
-	* gui/component/select-names/e-select-names-model.c: Handle a NULL
-	iterator properly in the replace function.
-
-	* gui/component/select-names/e-select-names-table-model.c: Fill in
-	info properly in the value_at function.
-
-	* gui/component/select-names/e-select-names-text-model.c: Don't
-	strlen a NULL text object.
-
-	* gui/component/select-names/e-select-names.c: Close if the person
-	hits ok or cancel (doesn't yet actually undo changes if Cancel is
-	hit.)  Handle removing addresses when they're double clicked on.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Hid some unused
-	fields and changed the text at the top of the dialog.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/component/select-names/.cvsignore: Ignore dynamically 
-	created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): New function to set the properties.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Start up the factory
-	for `Evolution::Addressbook::SelectNames'.
-
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	New.
-
-	* gui/component/select-names/e-select-names-factory.c: New.
-	* gui/component/select-names/e-select-names-factory.h: New.
-
-	* gui/component/select-names/e-select-names-bonobo.c: New.
-	* gui/component/select-names/e-select-names-bonobo.h: New.
-
-	* gui/component/addressbook-factory.c (main): Call
-	`e_select_names_factory_init()'.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_add_section): Made const-aware.
-	(e_select_names_manager_create_entry): Made const-aware.
-	(e_select_names_manager_activate_dialog): Made const-aware.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	New.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added an "editable" argument.
-
-	* gui/component/select-names/e-select-names.c: Set our
-	EAddressModel to not be editable.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: Changed to line
-	mode.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c: Implemented the
-	get_cards function.
-
-	* gui/component/select-names/e-select-names.c: Implemented adding
-	cards through the interface.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c: Make the
-	entry widgets we create editable.
-
-	* gui/component/select-names/e-select-names-model.c: Use
-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.
-
-	* gui/component/select-names/e-select-names-table-model.c: When
-	the model changes, send a model changed signal.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made
-	changing this work correctly if it's empty.  Made change signals
-	propagate properly.  Is a bit better about freeing iterators when
-	done.
-
-	* gui/component/select-names/e-select-names.c: Made the finished
-	lists be in order instead of being sorted.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): Since
-	ELDAPServer->port is a char *, allocate a string with the number
-	389 contained.
-
-	* gui/component/addressbook.c: Make the select names test test the
-	new code instead of the old way of getting to an ESelectNames
-	dialog.
-
-	* gui/component/select-names/e-select-names-manager.c: Coded
-	storing the model for each section, creating an entry and
-	returning it, and for activating the dialog.  Wrote a bit of the
-	get_cards code, but not all of it.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Coded all of
-	the code needed to make ESelectNamesTextModel work (it doesn't
-	yet, but all the code should be there.)  Removed
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-text-model.c: Changed
-	these to compensate for removal of
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h: Fixed some
-	silly typos.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added a parameter to
-	add_section that lets you specify the source ESelectNamesModel.
-	
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and
-	make port a string.
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a
-	uri, load all the bits and pieces and build up the uri when
-	creating the folder, according to the openldap url format.
-	(ldap_server_foreach): store out each of the individual uri
-	pieces.
-	(e_ldap_storage_remove_server): free the new fields.
-	(get_string_value): if the text is empty, return the empty string
-	instead of NULL.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.
-	(fill_in_server_info): port is a string now.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and
-	Close" to "Save and Close".  Removed some toolbar items that will
-	never be used.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added functions
-	to allow you to modify the model (not implemented yet.)
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h: Finished
-	this.  Doesn't support changing the model at all.
-
-	* gui/component/select-names/e-select-names-text-model.c: Finished
-	this.  Changing the model by typing is done, but doesn't work
-	since none of the functions in the base model are implemented.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): call
-	e_ldap_storage_add_server call.
-
-	* gui/component/ldap-server-dialog.glade: add name row.
-
-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add
-	support for the name-entry.
-
-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.
-
-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add
-	prototypes for e_ldap_storage_add_server and
-	e_ldap_storage_remove_server.
-
-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new
-	function, add it to our hash table, add a shell folder, and save
-	out the metadata.
-	(ldap_server_foreach): add the ldap server info under a
-	"contactserver" node.
-	(setup_ldap_storage): create our hashtable.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): remove hack to read
-	"uri" file from local directory.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	e-ldap-storage.{c,h}
-
-	* gui/component/addressbook-component.c (owner_set_cb): call
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
-	the LDAP storage and load the .xml file.
-	(load_ldap_data): function to load our xml file.
-	(save_ldap_data): function to save our xml file.
-
-	* gui/component/e-ldap-storage.h: new file.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names.c: Fixed more compile
-	errors.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Fixed compile error.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
-	e-card-list.c, e-card-list.h.
-
-	* backend/ebook/e-card-iterator.c,
-	backend/ebook/e-card-iterator.h,
-	backend/ebook/e-card-list-iterator.c,
-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
-	backend/ebook/e-card-list.h: Removed in favor or versions without
-	the -card in the e-util directory since these classes are not
-	specific to cards at all.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card.c, backend/ebook/e-card.h,
-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
-	backend/pas/pas-backend-file.c: Changed the references to
-	e-card-list.c and friends to e-list.c and friends.
-
-	* contact-editor/e-contact-editor.c: Added #include
-	<e-contact-save-as.h> to fix a warning.
-
-	* gui/component/Makefile.am: Moved a number of classes associated
-	with the select-names object to the new select-names directory.
-
-	* gui/component/addressbook.c: Changed the reference to
-	e-select-names.h.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h,
-	gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Moved these files into
-	select-names/.
-
-	* gui/component/select-names/.cvsignore,
-	gui/component/select-names/Makefile.am,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/recipient.glade,
-	gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: New files for
-	select names dialog (e-select-names.c, e-select-names.h,
-	select-names.glade, select-names.glade.h and recipient.glade moved
-	from gui/component/.)
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: New select
-	names manager interface (Not complete.)
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	addressbook/gui/component/e-cardlist-model.c: Added
-	value_to_string handlers.
-
-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and
-	"y" arguments.
-
-	* addressbook/gui/component/addressbook.c: Activated Click To Add
-	and set the click to add message.
-
-	* addressbook/gui/component/e-addressbook-model.c: Added
-	value_to_string and append_row handlers.
-
-	* addressbook/gui/component/e-select-names.c: Added a column.
-
-2000-06-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.
-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer
-	we know to be NULL.
-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.
-	easier to type.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/test-minicard-label.c,
-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove
-	usage of "x" and "y" arguments.
-
-2000-06-18    <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
-	the default GNOME prefix.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c,
-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made
-	the left column of minicards not get any wider than the widest
-	possible name.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_addressbook_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Removed the
-	ETableModel thaw handler.
-	* gui/component/e-cardlist-model.c: Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-select-names.c: Fixed the widget reparenting.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added glade files.
-
-	* gui/component/addressbook.c: Added a test of the Select Names
-	functionality.
-
-	* gui/component/e-addressbook-model.c: Made this class_init
-	function a bit cleaner.
-
-	* gui/component/e-select-names.c: Tested this and fixed some
-	obvious errors.
-
-	* gui/component/select-names.glade: The main window shouldn't be
-	visible by default.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link
-	with libemiscwidgets.a.
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions
-	for better readability.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h:
-	This should be a working dialog now.
-
-	* gui/component/select-names.glade: Changed the name & creation
-	function of the ETable here.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Glade files for Select Names
-	dialog.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and
-	extract_info more often.
-
-	* gui/component/addressbook.c: Added table printing code.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL
-	for the new args @create_folder_fn and @remove_folder_fn.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (create_view): Updated for
-	the new `EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not
-	"contacts".
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Bind Save As to save the
-	current view of the contact as a vcard.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the
-	card simple and extract the card info.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.h (EContactEditor): Now this
-	derives from GtkObject.  It follows the same strategy as the
-	EventEditor in the calendar.
-	(EContactEditor): Added an is_new_card field so that we can know
-	whether to add() or commit() the card.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):
-	Derive from GtkObject.
-	(e_contact_editor_class_init): Likewise.
-	(e_contact_editor_class_init): Added an "is_new_card" argument.
-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.
-	(e_contact_editor_get_arg): Likewise.
-	(e_contact_editor_new): Take in an is_new_arg argument and set it
-	on the object.
-	(e_contact_editor_init): Load the app widget into the app field of
-	the EContactEditor structure.  Create its UIHandler as well.
-	(e_contact_editor_class_init): New "add_card", "commit_card", and
-	"editor_closed" signals.
-
-	* contact-editor/test-editor.c (main): Modified for the new API.
-	(editor_closed_cb): Tweaked for the new API.
-	Since this test program does not use Bonobo, it doesn't work,
-	though.
-
-	* gui/component/addressbook.c (new_contact_cb): Use the new
-	contact editor API.
-	(table_double_click): Ditto.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the
-	new contact editor API.
-
-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new
-	contact editor API.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove
-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of
-	course] the library is built in the build directory, not in the
-	source directory.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with
-	`libeminicard.a'.
-	(minicard_label_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Bind right click on the ETable to
-	"Save to VCard."
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made phone/email/address
-	labels change correctly again.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c: Made
-	evolution-addressbook shut down when the shell is done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made
-	double click only work on the first button.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: return TRUE if opening a contact
-	editor so that we don't get a "new dialog" contact editor.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Use the stock
-	cancel button for the dialog.
-	(table_double_click): Likewise.
-	(find_contact_cb): Likewise.
-
-2000-05-31  Miguel de Icaza  <miguel@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Added accelerators for
-	the remaining items.
-
-	Add spacing, beautify the dialogs.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/e-cardlist-model.h: New files for card list.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a memory leak.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Made the alphabet buttons not
-	focusable.
-
-	* gui/minicard/e-minicard-view.c: Made the "123" button work.
-
-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last
-	letter available work.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Added a bit of space around the
-	alphabet bar.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added alphabet.glade and
-	alphabet.glade.h.
-
-	* gui/component/addressbook.c, gui/component/alphabet.glade,
-	gui/component/alphabet.glade.h: Added an alphabet bar.
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,
-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:
-	Added the ability to just to a particular spot in the reflow.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c: Made double clicking create a
-	new card.  Set the empty message.
-
-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.
-
-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a
-	message for when the reflow is empty.
-
-	* printing/e-contact-print.c, printing/medbook.ecps: Made the
-	default printout be full page.  Made sorting case insensitive.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,
-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,
-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.
-
-	* printing/e-contact-print.c: Made printing wait for
-	"sequence_complete" signal and made it sort.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added double click to open
-	contact editor.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed some columns.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	New function.
-	(addressbook_factory): Use it.
-
-	* Makefile.am (evolution_addressbook_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* gui/component/addressbook-component.c: New.
-	* gui/component/addressbook-component.h: New.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched printing and gui.
-
-	* backend/ebook/e-book-view-listener.h,
-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
-	#defines to work elsewhere in evolution.
-
-	* gui/component/Makefile.am: Added linking to libecontactprint.
-
-	* gui/component/addressbook.c: Added a menu item to print the
-	current query.
-
-	* printing/Makefile.am: Add linking to libebook and requirements.
-	Add installation of ecps files.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
-	this to use real data from an EBook.
-
-	* printing/test-print.c: Made this pass NULL, NULL to
-	e_contact_print_dialog_new so that it will compile.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and
-	e-contact-editor-save-as.h.
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h: New files that display a save
-	as dialog and then save the given card to that file.
-
-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right
-	click menu.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Added initialize_value and
-	value_is_empty callbacks.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a bug that broke
-	address field support.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added support for arbitrary
-	fields in the contact editor.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed e_card_name_copy and
-	e_card_arbitrary_copy to deal correctly with a passed NULL.
-
-	* contact-editor/Makefile.am: Removed imagesdir stuff.
-
-	* contact-editor/arrow.png: Made this transparent.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Renamed some widgets
-	and added custom widgets for all of the images.
-
-	* contact-editor/e-contact-editor.c: Worked on making this work
-	decently well with messed up glade files.  Cleaned up a lot of code.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed the code to write out and read in
-	arbitrary fields.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
-	arbitrary field support.
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.
-	(poll_ldap): same.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-book.h: add typedefs for the can_write
-	functions, and add parameters to pas_book_new.
-
-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.
-	(pas_book_new): same.
-	(impl_Evolution_Book_can_write): new function.
-	(impl_Evolution_Book_can_write_card): same.
-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.
-	(pas_backend_ldap_can_write_card): same.
-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.
-	(pas_backend_file_can_write): same.
-	(can_write): return TRUE if we can write to the addressbook file.
-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/idl/addressbook.idl (Evolution): add can_write and
-	can_write_card permission requests.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor.c, ename/e-name-western.c,
-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed
-	some memory leaks.
-
-	* backend/ebook/e-card.c: Rearranged some code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a reference
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a compile
-	error.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Got rid of a
-	memory leak.  Rearranged a couple functions.
-	
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:
-	Added some code to stop watching the EBook when the canvas is
-	destroyed (apparently the canvas is destroyed before our widget is
-	destroyed.)
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Use the correct
-	policy for resize.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added libeutil for e-card's support
-	for categories.
-
-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added
-	a function to get the length.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories
-	support (accessible either as "categories" or "category_list".)
-
-	* contact-editor/Makefile.am: Added e-table and all of the
-	categories files.
-
-	* contact-editor/categories.glade,
-	contact-editor/categories-strings.h,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h:
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.
-
-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.
-	Added opening of categories dialog.
-
-	* gui/component/Makefile.am: Rearranged libraries so that
-	libetable would be available for the contact editor categories
-	dialog.
-
-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make
-	contact editor dialog resizable.
-
-	* gui/minicard/Makefile.am: Added libetable contact editor
-	categories dialog.
-
-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.
-
-2000-05-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* contact-editor/fulname.glade: Use accelerators here.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* gui/component/ldap-server-dialog.glade: save translatable strings
-	* gui/component/ldap-server-dialog.glade.h: file with strings
-	* printing/e-contact-print.glade: save translatable strings
-	* printing/e-contact-print.glade.h: file with strings
-		
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Now that we
-	depend on recent gnome-libs we can make the toolbar detachable
-	again.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the table view be sorted by
-	name initially.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Send a proper response when you
-	can't find the ldap URI.
-
-	* gui/component/addressbook.c: Cleaned up the open error dialog a
-	bit.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Added a dialog for when you can't
-	open an addressbook.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,
-	e-card-types.h.
-
-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.
-
-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.
-	Removed some old defines.
-
-	* ename/Makefile.am: Added e-name-western-tables.h.
-
-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added
-	a proper EXTRA_DIST section.
-
-	* gui/minicard/e-reflow.c: Added a missed cast.
-
-	* printing/Makefile.am: Added a proper EXTRA_DIST section.
-	
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Make sure that the canvas
-	doesn't intercept keyboard focus.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use new art.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Replaced the Address
-	button with a label and rearranged the address area a bit.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Reenable editting.
-
-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Destroy the view object when
-	leaving the minicard view.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call
-	reflow_request when sorting on an item changes.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Make File As change if name or
-	company are changed pretty much anywhere.
-
-	* gui/minicard/e-minicard.c: Turned off having minicard editing
-	effect anything since it's so crashy.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Added a default card to all new
-	file backends.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Rearranged order of things
-	getting destroyed.
-
-	* gui/minicard/e-minicard-view.c: Rearranged order of things
-	getting destroyed.  Don't set attributes of non-null or destroyed
-	items.  Destroy parent object when destroyed.  Maintain ref_count
-	of items in list.
-
-	* gui/minicard/e-minicard.c: Don't set attributes of non-null
-	items.
-
-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in
-	list.
-
-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.
-	Destroy parent object when destroyed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed some indentation.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Changed Email to
-	Primary Email.
-
-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate
-	if data exists in the pull down menus for the phone, address, and
-	email fields.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed the string duplication
-	problem.  Fixed the business/home address string mix up.
-
-	* gui/component/addressbook.c: Made the minicard view the default
-	view.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing
-	should work better now.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,
-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,
-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be
-	destroyed and recreated when updating a field.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* gui/minicard/e-minicard.c (remodel): make sure to free the
-	return value of e_card_simple_get.
-
-	* gui/component/addressbook.c (teardown_table_view): destroy the
-	ECardSimple here, plug memory leak.
-	(create_table_view): use view->simple so we can destroy the
-	ECardSimple later on.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): comment
-	function, and fix an ABR.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_cleanup_string): comment
-	function, and fix an ABR.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Added saving in minicard view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): don't create a new
-	ebook.  instead, unload the current uri (if there is one) and load
-	the new one.
-	(addressbook_factory): create the ebook once.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Replaced some model_changed
-	calls with row_inserted calls.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Removed some code that was notifying too many clients at the wrong
-	times.
-
-	* gui/component/addressbook.c: Set view->book.  Unreffed
-	view->book.  Unreffed the model instead of destroying it.  Removed
-	the /tmp/test.db stuff.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the addressbook create the
-	correct file uri.  Added a default query.  Initialize view->model
-	and view->view to NULL.
-
-	* gui/component/e-addressbook-model.c,
-	gui/minicard/e-minicard-view.c: Only call get_book_view if both
-	book and query and non-null.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	separator and toggle view items as well.
-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu
-	item.
-	(get_query): getter for the query string that takes into account
-	the two view types.
-	(set_query): setter for the query string that takes into account
-	the two view types.
-	(set_book): setter for the EBook type - not really a setter, since
-	the book is kept in the AddressbookView, but this method actually
-	sets the "book" property on the current view.
-	(find_contact_cb): make use of get/set_query
-	(search_entry_activated): make use of set_query.
-	(control_activate): add a menu separator and an item to toggle
-	between view types.
-	(book_open_cb): make use of set_book.
-	(ebook_create): no longer needs to return the EBook, since we set
-	the book field in our view.
-	(teardown_minicard_view): destructor function for the minicard
-	specific ui.
-	(create_minicard_view): constructor function for the minicard
-	specific ui.
-	(teardown_table_view): destructor function for the e-table
-	specific ui.
-	(create_table_view): constructor function for the e-table specific
-	ui.
-	(change_view_type): destroy the old and create the new view ui,
-	change the label of the Toggle View menu item, and reset the book
-	and query on the new view type.
-	(addressbook_factory): create an all-encompassing vbox that the
-	view uses to create the bonobo control, which contains 1 widget
-	per ui specific view (the e-table in the table case, and another
-	vbox in the minicard case.)  use change_view_type to create the
-	initial view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c: Made a NULL callback just mean to not
-	call back.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Reordered fields.  Added a get_const function to get a constant
-	string that persists until the simple is destroyed.
-
-	* gui/component/Makefile.am: Added e-addressbook-model.c and
-	e-addressbook-model.h and all of the libraries and includes that
-	they are dependent on.
-
-	* gui/component/addressbook-factory.c: Initialize e cursors.
-
-	* gui/component/addressbook.c: Added inactive code to display an
-	ETable view of the addressbook.
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: New files to implement an
-	ETable model with a EBook back end.
-	
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Mostly finished ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Changed this to match with
-	some of the changes to ECardSimple.
-
-	* gui/component/addressbook.c: Changed this to look for
-	"addressbook.db" in the given directory if it doesn't find the
-	file "uri".
-
-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
-	this to use ECardSimple.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* gui/component/.cvsignore: ignore evolution-addressbook.pure
-
-	* gui/component/Makefile.am: add support for generating 
-	evolution-addressbook.pure.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a
-	port isn't specified in the uri default to 389.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Made this take a uri through its
-	property bag.
-
-2000-05-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-card-simple.c and
-	e-card-simple.h.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	New card wrapper class to simplify things.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use
-	ECardSimple a bit.
-
-2000-05-03  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): #ifdef
-	HAVE_LDAP the ldap specific stuff.
-	(null_cb): same.
-	(control_activate): same.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/ename'.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* demo/Makefile.am: set G_LOG_DOMAIN.
-	* printing/Makefile.am: same.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Add back in the
-	CORBA_Object_release.
-
-	* backend/pas/pas-book.c: Properly duplicate and release the
-	listener passed to us.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Made uri slightly better managed.
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): Remove this
-	CORBA_Object_release that causes things not to work.  This is just
-	a temporary fix until we figure out what's actually wrong.
-
-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
-	
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the subdirs order since backend depends on
-	ename.
-
-2000-05-01  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):
-	fix a typo in the for loop.
-
-2000-05-01  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: include gtk.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* backend/ebook/e-book-types.h (EBookStatus): Added new status
-	values for the IDL stuff.
-
-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New
-	"last_book_gone" signal.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_launch_backend): Better error handling.
-	(pas_book_factory_process_queue): Let
-	pas_book_factory_process_request() free the request.
-	(pas_book_factory_process_request): Free the request here.
-	Perform better error handling.
-	(free_active_server_map_entry): Free an active server map entry;
-	free the URI key and unref the backend value.  This function was
-	renamed; the old one was trying to CORBA_Object_unref() a GTK+
-	object!
-	(remove_backends_entry): Free a backend table entry; free the URI
-	key.
-	(backend_last_client_gone_cb): Remove the backend from the active
-	server map and emit the "last_book_gone" signal if appropriate.
-	(pas_book_factory_get_n_backends): New function to query the
-	number of running backends in an addressbook factory.
-
-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a
-	ProtocolNotSupported code.  This is for when the addressbook
-	factory cannot find a provider for the requested URI.
-
-	* backend/pas/pas-backend.h (PASBackendClass): New
-	"last_client_gone" signal.
-	(PASBackendClass): New get_uri virtual method.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a
-	gboolean success code.
-	(pas_backend_add_client): Return a gboolean success code.
-	(pas_backend_last_client_gone): New function used by backend
-	implementations to notify upwards when the backend's last client
-	is destroyed.
-	(pas_backend_get_uri): New function to get the URI of a backend.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  We cannot call pas_book_get_backend() in the callback
-	since the book's private data has already been destroyed when the
-	callback is invoked.  Alternatively, we could move the private
-	data destruction step to the book's ::finalize() method.
-	(pas_backend_file_book_destroy_cb): Get the backend from the
-	callback's data, not from the book.
-	(pas_backend_file_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(PASBackendFilePrivate): Added an uri field.
-	(pas_backend_file_get_uri): Implement the get_uri method.
-	(pas_backend_file_load_uri): Return a gboolean success code.
-	Also, store the URI in the private structure.
-	(pas_backend_file_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(pas_backend_file_destroy): Free the bf->priv->uri.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  See above for rationale.
-	(pas_backend_ldap_book_destroy_cb): Get the backend from the
-	callback's data.
-	(pas_backend_ldap_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(pas_backend_ldap_load_uri): Return a gboolean success code.
-	(pas_backend_ldap_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(PASBackendLDAPPrivate): New uri field.
-	(pas_backend_ldap_get_uri): Implement the get_uri method.
-	(pas_backend_ldap_load_uri): Store the uri in the private
-	structure.
-	(pas_backend_ldap_destroy): Free the bl->priv->uri.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added
-	e-ldap-server-dialog.c
-	(glade_DATA): added ldap-server-dialog.glade
-
-	* gui/component/ldap-server-dialog.glade: new file.
-
-	* gui/component/e-ldap-server-dialog.h: new file.
-
-	* gui/component/e-ldap-server-dialog.c: new file, contains logic
-	associated with ldap server dialog.
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	directory server menu item.
-	(null_cb): do nothing callback for e_book_load_uri call.  should
-	change to (at the very least) pop up a dialog if there was an
-	error.
-	(new_server_cb): new function - really just switches to a
-	particular ldap server, since the information isn't saved
-	anywhere.
-	(control_activate): add directory server menu item.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): create the book
-	listener here, since it's destroyed in unload_uri.
-	(e_book_construct): remove the book listener construction here.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-pine-addressbook.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
-	some fields invisible that were visible before.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make file as not have the : after it if
-	it's empty.  If there's no name, or file_as, fill in these fields
-	with defaults based on full_name or name respectively.
-
-	* backend/ebook/load-pine-addressbook.c: New file to do import of
-	pine .addressbook files.
-
-	* backend/pas/pas-backend-file.c: Made empty fields act as the
-	empty string for searches.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the File As field update
-	properly as you edit the name and company fields.  Added the pull
-	down list of File As choices.  Made sure that all fields will
-	be set to NULL if they are deleted to the empty string.
-
-	* gui/minicard/e-minicard.c: Use the File As field instead of the
-	Full Name field for the header.  Make identical compares on the
-	File As field do a compare on the uid.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/fullname.glade: Fixed a string mismatch.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added ename includes and libs.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_name_from_string.  Added header for
-	e_card_delivery_address_from_string, even though it's not
-	implemented yet.
-
-	* contact-editor/Makefile.am: Removed the ename includes since we
-	no longer use ename directly here.
-
-	* contact-editor/e-contact-editor.c: Fixed this to properly save
-	the address labels displayed.  Updated this to use the function
-	e_card_name_from_string instead of doing it by hand.
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Deleted an unused field.  Changed
-	the set of prefixes and suffixes.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): add support for a rootdn in
-	the uri.
-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in
-	the call to ldap_search_s.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.
-
-2000-04-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_phone_new e_card_delivery_address_new,
-	e_card_delivery_address_to_string, e_card_name_copy,
-	e_card_name_new, e_card_name_to_string, and made e_card_name_free
-	public.  Removed some unused code.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]
-	and fullname.glade.  Added e-name libs and includes.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h,
-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:
-	New dialog for editing the fields of a name separately.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Create an
-	EContactEditorFullname when you click on the Full Name button.
-	Maintain a parsed name at all times.
-
-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added
-	e-name libs.
-
-2000-04-28  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-book-factory.c (register_factory): fix the
-	`USING_OAF' changes so that they work for when we are not using
-	oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ename/Makefile.am
-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.
-	(INCLUDES): Add `-I$(srcdir)/..'.
-
-	* backend/pas/pas-book-factory.c
-	(register_factory): New function to register the factory.
-	Implementation different according to `USING_OAF'.
-	(pas_book_factory_activate): Use `register_factory()'.
-
-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',
-	varying depending on whether we are `USING_OAF'.
-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* backend/ebook/test-client.c (init_corba): New function,
-	implemented differently according to the `USING_OAF' #define.
-
-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.
-	(e_book_construct): Work with OAF #if `USING_OAF'.
-
-	* backend/ebook/Makefile.am (gnome_libs): Removed.
-	(corbadir): Removed.
-	(ebook_libs): Removed.
-	(test_client_LDADD): Just add `libebook.la'.
-	(test_card_LDADD): Likewise.
-	(test_client_list_LDADD): Likewise.
-
-	* gui/component/addressbook-factory.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Call `init_corba()'.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,
-	office, manager, assistant, spouse, and anniversary fields.  These
-	all use "X-EVOLUTION-" fields in the VCards.
-
-	* backend/pas/pas-backend-file.c: Added all the new fields (except
-	anniversary) to the list of fields.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed
-	fields and fixed the placement of the comments field.
-
-	* contact-editor/e-contact-editor.c: Made the newly added fields
-	display properly.
-
-	* Makefile.am: Added ename.
-
-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,
-	ename/test-ename-western.c: Fixed up some #includes.
-
-	* ename/.cvsignore: Added .cvsignore.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Added an address label field.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Got rid of some unused
-	fields.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added the address label field.
-	Load only.  Editing these fields seems to mess things up.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Added proper handling of the
-	email field.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Edited the glade file.
-	Removed all the fields that we don't use.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the phone fields work
-	properly.  The address and email fields are temporarily turned off
-	until they can be made to work as the phone fields do.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
-	pick up IDL files in the installation prefix as well.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
-	to get the IDLs from the installation prefix as well.
-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of
-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,
-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.
-	(test_client_list_LDADD): Likewise.
-	(test_card_LDADD): Likewise.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
-	domain.
-
-	* gui/component/Makefile.am (INCLUDES): Use
-	"evolution-addressbook" as the log domain.
-
-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
-	Do not install any header files.
-	(INCLUDES): Remove spurious include paths.
-
-	* backend/pas/*.[ch]: Fix includes.
-
-	* backend/ebook/Makefile.am: Do not install the test programs.
-	Fixed some include weirdness.
-
-	* backend/ebook/*.[ch]: Fix includes.
-
-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
-	"contact-editor".
-	(INCLUDES): Fix.
-
-	* contact-editor/*.[ch]: Fix includes.
-
-	* gui/minicard/*.[ch]: Fix includes.
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/E-CARD-NEEDED-FIELDS b/addressbook/E-CARD-NEEDED-FIELDS
deleted file mode 100644
index e227d1b130..0000000000
--- a/addressbook/E-CARD-NEEDED-FIELDS
+++ /dev/null
@@ -1,9 +0,0 @@
-I will add these fields as I get a chance to.
-
-Thanks,
-    Chris Lahey
-
-X-EVOLUTION-LIST			boolean if this is a mailing list.
-X-EVOLUTION-LIST-SHOW-ADDRESSES		boolean whether to list all email addresses in the To: line or to treat the list kind of like a BCC.
-X-EVOLUTION-RELATED-CONTACTS		EDestionationList of related contacts.
-REV					last changed date.
\ No newline at end of file
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index d472f0033b..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	util printing gui $(CONDUIT_SUBDIR)
-
-EXTRA_DIST =	\
-	ChangeLog.pre-1-4
-
-# XXX tools
\ No newline at end of file
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 3c6b0f2314..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-
-# Address Conduit
-privconduit_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/camel/libcamel.la	 			\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-
-e-address-$(BASE_VERSION).conduit: e-address.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-address-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-address.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 5d6530fd85..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1713 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Address Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#define G_LOG_DOMAIN "eaddrconduit"
-
-#include <bonobo.h>
-#include <libxml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-address.h>
-#include <libebook/e-book.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-dialog-widgets.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.2"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-enum {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_OTHER,
-	LABEL_EMAIL,
-	LABEL_MAIN,
-	LABEL_PAGER,
-	LABEL_MOBILE
-};
-
-static EContactField priority [] = {
-	E_CONTACT_PHONE_BUSINESS,
-	E_CONTACT_PHONE_HOME,
-	E_CONTACT_PHONE_BUSINESS_FAX,
-	E_CONTACT_EMAIL,
-	E_CONTACT_PHONE_PAGER,
-	E_CONTACT_PHONE_MOBILE,
-	E_CONTACT_PHONE_BUSINESS_2,
-	E_CONTACT_PHONE_HOME_2,
-	E_CONTACT_PHONE_HOME_FAX,
-	E_CONTACT_EMAIL_2,
-	E_CONTACT_PHONE_OTHER,
-	E_CONTACT_PHONE_PRIMARY,
-	E_CONTACT_PHONE_OTHER_FAX,
-	E_CONTACT_EMAIL_3,
-	E_CONTACT_FIELD_LAST
-};
-
-static int priority_label [] = {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_PAGER,
-	LABEL_MOBILE,
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_OTHER,
-	LABEL_MAIN,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	-1
-};
-
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-typedef struct _EAddrConduitGui EAddrConduitGui;
-typedef struct _EAddrConduitContext EAddrConduitContext;
-
-/* Local Record */
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	EContact *contact;
-
-        /* pilot-link address structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-
-static void
-addrconduit_destroy_record (EAddrLocalRecord *local) 
-{
-	g_object_unref (local->contact);
-	free_Address (local->addr);
-	g_free (local->addr);
-	g_free (local);
-}
-
-/* Configuration */
-struct _EAddrConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	EContactField default_address;
-
-	gchar *last_uri;
-};
-
-static EAddrConduitCfg *
-addrconduit_load_configuration (guint32 pilot_id) 
-{
-	EAddrConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar *address, prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EAddrConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	address = gnome_config_get_string ("default_address=business");
-	if (!strcmp (address, "business"))
-		c->default_address = E_CONTACT_ADDRESS_WORK;
-	else if (!strcmp (address, "home"))
-		c->default_address = E_CONTACT_ADDRESS_HOME;
-	else if (!strcmp (address, "other"))
-		c->default_address = E_CONTACT_ADDRESS_OTHER;
-	g_free (address);
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("secret", c->secret);
-	switch (c->default_address) {
-	case E_CONTACT_ADDRESS_WORK:
-		gnome_config_set_string ("default_address", "business");
-		break;
-	case E_CONTACT_ADDRESS_HOME:
-		gnome_config_set_string ("default_address", "home");
-		break;
-	case E_CONTACT_ADDRESS_OTHER:
-		gnome_config_set_string ("default_address", "other");
-		break;
-	default:
-		g_warning ("Unknown default_address value");
-	}
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	retval->secret = c->secret;
-	retval->default_address = c->default_address;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EAddrConduitGui {
-	GtkWidget *default_address;
-};
-
-static EAddrConduitGui *
-e_addr_gui_new (EPilotSettings *ps) 
-{
-	EAddrConduitGui *gui;
-	GtkWidget *lbl, *menu;
-	gint rows, i;
-	static const char *items[] = {"Business", "Home", "Other", NULL};
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, 
-			  E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EAddrConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Sync Address:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	gui->default_address = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	for (i = 0; items[i] != NULL; i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (items[i]);
-		gtk_widget_show (item);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-	gtk_widget_show (menu);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (gui->default_address), menu);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->default_address, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->default_address);
-	
-	return gui;
-}
-
-static const int default_address_map[] = {
-	E_CONTACT_ADDRESS_WORK,
-	E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_ADDRESS_OTHER,
-	-1
-};
-
-static void
-e_addr_gui_fill_widgets (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	e_dialog_option_menu_set (gui->default_address, 
-				  cfg->default_address, 
-				  default_address_map);
-}
-
-static void
-e_addr_gui_fill_config (EAddrConduitGui *gui, EAddrConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->default_address = e_dialog_option_menu_get (gui->default_address, 
-							 default_address_map);
-}
-
-static void
-e_addr_gui_destroy (EAddrConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EAddrConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EAddrConduitCfg *cfg;
-	EAddrConduitCfg *new_cfg;
-	EAddrConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-
-	EPilotMap *map;
-};
-
-static EAddrConduitContext *
-e_addr_context_new (guint32 pilot_id) 
-{
-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);
-
-	ctxt->cfg = addrconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->ebook = NULL;
-	ctxt->cards = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_addr_gui_destroy (ctxt->gui);
-	
-	if (ctxt->ebook != NULL)
-		g_object_unref (ctxt->ebook);
-
-	if (ctxt->cards != NULL) {
-		for (l = ctxt->cards; l != NULL; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->cards);
-	}
-	
-	if (ctxt->changed_hash != NULL)
-		g_hash_table_destroy (ctxt->changed_hash);
-	
-	if (ctxt->changed != NULL)
-		e_book_free_change_list (ctxt->changed);
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			addrconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EAddrLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->addr) {
-		g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-			    local->addr->entry[entryLastname] ?
-			    local->addr->entry[entryLastname] : "",
-			    local->addr->entry[entryFirstname] ?
-			    local->addr->entry[entryFirstname] : "",
-			    local->addr->entry[entryCompany] ?
-			    local->addr->entry[entryCompany] : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Address addr;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&addr, 0, sizeof (struct Address));
-	unpack_Address (&addr, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-		    addr.entry[entryLastname] ?
-		    addr.entry[entryLastname] : "",
-		    addr.entry[entryFirstname] ?
-		    addr.entry[entryFirstname] : "",
-		    addr.entry[entryCompany] ?
-		    addr.entry[entryCompany] : "");
-
-	free_Address (&addr);
-
-	return buff;
-}
-
-/* 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) 
-{
-	EBookChange *ebc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		ebc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, e_contact_get_const (ebc->contact, E_CONTACT_UID)))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static EContactField
-get_next_mail (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_EMAIL;
-	
-	switch (*field) {
-	case E_CONTACT_EMAIL:
-		return E_CONTACT_EMAIL_2;
-	case E_CONTACT_EMAIL_2:
-		return E_CONTACT_EMAIL_3;
-	default:
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_home (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_HOME;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_HOME:
-		return E_CONTACT_PHONE_HOME_2;
-	default:
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_work (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS:
-		return E_CONTACT_PHONE_BUSINESS_2;
-	default:
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_fax (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS_FAX;
-	
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS_FAX:
-		return E_CONTACT_PHONE_HOME_FAX;
-	case E_CONTACT_PHONE_HOME_FAX:
-		return E_CONTACT_PHONE_OTHER_FAX;
-	default:
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_other (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_OTHER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_main (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PRIMARY;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_pager (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PAGER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_mobile (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_MOBILE;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static void
-get_next_init (EContactField *next_mail,
-	       EContactField *next_home,
-	       EContactField *next_work,
-	       EContactField *next_fax,
-	       EContactField *next_other,
-	       EContactField *next_main,
-	       EContactField *next_pager,
-	       EContactField *next_mobile)
-{	
-	*next_mail = get_next_mail (NULL);
-	*next_home = get_next_home (NULL);
-	*next_work = get_next_work (NULL);
-	*next_fax = get_next_fax (NULL);
-	*next_other = get_next_other (NULL);
-	*next_main = get_next_main (NULL);
-	*next_pager = get_next_pager (NULL);
-	*next_mobile = get_next_mobile (NULL);
-}
-
-static gboolean
-is_next_done (EContactField field)
-{
-	if (field == E_CONTACT_FIELD_LAST)
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) 
-{	
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	gboolean syncable = TRUE;
-	int i, l = 0;
-
-	/* See if there are fields we can't sync or not in priority order */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-	
-	for (i = entryPhone1; i <= entryPhone5 && syncable; i++) {
-		int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-		const char *phone_str = local->addr->entry[i];
-		gboolean empty = !(phone_str && *phone_str);
-		
-		if (empty)
-			continue;
-		
-		for ( ; priority_label[l] != -1; l++)
-			if (phonelabel == priority_label[l])
-				break;
-
-		if (priority_label[l] == -1) {
-			syncable = FALSE;
-			continue;
-		}
-		
-		if (phonelabel == LABEL_EMAIL) {
-			if (is_next_done (next_mail) || next_mail != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME) {
-			if (is_next_done (next_home) || next_home != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK) {
-			if (is_next_done (next_work) || next_work != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX) {
-			if (is_next_done (next_fax) || next_fax != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER) {
-			if (is_next_done (next_other) || next_other != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN) {
-			if (is_next_done (next_main) || next_main != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER) {
-			if (is_next_done (next_pager) || next_pager != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE) {
-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-	}
-
-	return syncable;
-}
-
-static void
-set_contact_text (EContact *contact, EContactField field, struct Address address, int entry)
-{
-	char *text = NULL;
-	
-	if (address.entry[entry])
-		text = e_pilot_utf8_from_pchar (address.entry[entry]);
-
-	e_contact_set (contact, field, text);
-	
-	g_free (text);
-}
-
-static char *
-get_entry_text (struct Address address, int entry)
-{
-	if (address.entry[entry])
-		return e_pilot_utf8_from_pchar (address.entry[entry]);
-
-	return NULL;	
-}
-
-static void
-clear_entry_text (struct Address address, int field) 
-{
-	if (address.entry[field]) {
-		free (address.entry[field]);
-		address.entry[field] = NULL;
-	}
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	EBookChange *ebc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ebc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ebc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ebc->change_type) {
-	case E_BOOK_CHANGE_CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case E_BOOK_CHANGE_CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_BOOK_CHANGE_CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-	
-	g_assert (local->addr != NULL );
-	
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrConduitContext *ctxt)
-{
-	const EContactAddress *address;
-	EContactField mailing_address;
-	int phone = entryPhone1;
-
-	gboolean syncable;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (contact != NULL);
-
-	local->contact = g_object_ref (contact);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, e_contact_get_const (contact, E_CONTACT_UID), TRUE);
-
-	compute_status (ctxt, local, e_contact_get_const (contact, E_CONTACT_UID));
-
-	local->addr = g_new0 (struct Address, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Address addr;
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&addr, 0, sizeof (struct Address));
-			unpack_Address (&addr, record, 0xffff);
-			for (i = 0; i < 5; i++) {
-				if (addr.entry[entryPhone1 + i])
-					local->addr->entry[entryPhone1 + i] = 
-						strdup (addr.entry[entryPhone1 + i]);
-				local->addr->phoneLabel[i] = addr.phoneLabel[i];
-			}
-			local->addr->showPhone = addr.showPhone;
-			for (i = 0; i < 4; i++) {
-				if (addr.entry[entryCustom1 + i])
-					local->addr->entry[entryCustom1 + i] = 
-						strdup (addr.entry[entryCustom1 + i]);
-			}
-			free_Address (&addr);
-		}
-	}
-
-	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-	local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME));
-	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG));
-	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE));
-	
-	/* See if the default has something in it */
-	mailing_address = -1;
-	if (e_contact_get_const (contact, ctxt->cfg->default_address))
-		mailing_address = ctxt->cfg->default_address;
-	
-	/* If it doesn't, look for any address */
-	if (mailing_address == -1) {
-		for (i = E_CONTACT_FIRST_LABEL_ID; i < E_CONTACT_LAST_LABEL_ID; i++) {
-			if (e_contact_get_const (contact, i)) {
-				mailing_address = i;				
-				break;
-			}
-		}
-	}
-	
-	/* If all else fails, use the default */
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-
-	address = e_contact_get_const (contact, mailing_address);
-	if (address) {
-		char *add;
-		
-		/* If the address has 2 lines, make sure both get added */
-		if (address->ext != NULL)
-			add = g_strconcat (address->street, "\n", address->ext, NULL);
-		else
-			add = g_strdup (address->street);
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add);
-		g_free (add);
-		
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country);
-	}
-
-	/* Phone numbers */
-
-	/* See if everything is syncable */
-	syncable = is_syncable (ctxt, local);
-	
-	if (syncable) {
-		INFO ("Syncable");
-
-		/* Sync by priority */
-		for (i = 0, phone = entryPhone1; 
-		     priority[i] != E_CONTACT_FIELD_LAST && phone <= entryPhone5; i++) {
-			const char *phone_str;
-			
-			phone_str = e_contact_get_const (contact, priority[i]);
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, phone);
-				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
-				phone++;
-			}
-		}
-		for ( ; phone <= entryPhone5; phone++)
-			      local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-		local->addr->showPhone = 0;
-	} else {
-		EContactField next_mail, next_home, next_work, next_fax;
-		EContactField next_other, next_main, next_pager, next_mobile;
-
-		INFO ("Not Syncable");
-		get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-			       &next_other, &next_main, &next_pager, &next_mobile);
-
-		/* Not completely syncable, so do the best we can */
-		for (i = entryPhone1; i <= entryPhone5; i++) {
-			int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-			const char *phone_str = NULL;
-			
-			if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-				phone_str = e_contact_get_const (contact, next_mail);
-				next_mail = get_next_mail (&next_mail);
-			} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-  				phone_str = e_contact_get_const (contact, next_home);
-				next_home = get_next_home (&next_home);
-			} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-				phone_str = e_contact_get_const (contact, next_work);
-				next_work = get_next_work (&next_work);
-			} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-				phone_str = e_contact_get_const (contact, next_fax);
-				next_fax = get_next_fax (&next_fax);
-			} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-				phone_str = e_contact_get_const (contact, next_other);
-				next_other = get_next_other (&next_other);
-			} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-				phone_str = e_contact_get_const (contact, next_main);
-				next_main = get_next_main (&next_main);
-			} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-				phone_str = e_contact_get_const (contact, next_pager);
-				next_pager = get_next_pager (&next_pager);
-			} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-				phone_str = e_contact_get_const (contact, next_mobile);
-				next_mobile = get_next_mobile (&next_mobile);
-			}
-			
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, i);
-				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
-			}
-		}
-	}
-	
-	/* Note */
-	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       const char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	EContact *contact = NULL;
-	GList *l;
-	
-	g_assert (local != NULL);
-
-	for (l = ctxt->cards; l != NULL; l = l->next) {
-		contact = l->data;
-		
-		/* FIXME Do we need to check for the empty string? */
-		if (e_contact_get_const (contact, E_CONTACT_UID));
-			break;
-
-		contact = NULL;
-	}
-
-	if (contact != NULL) {
-		local_record_from_ecard (local, contact, ctxt);
-	} else {
-		contact = e_contact_new ();
-		e_contact_set (contact, E_CONTACT_UID, (gpointer) uid);
-		local_record_from_ecard (local, contact, ctxt);
-		g_object_unref (contact);
-	}
-}
-
-static EContact *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 EContact *in_contact)
-{
-	struct Address address;
-	EContact *contact;
-	EContactName *name;
-	EContactAddress *eaddress;
-	EContactField mailing_address;
-	char *txt, *find;
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	int i;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	if (in_contact == NULL)
-		contact = e_contact_new ();
-	else
-		contact = e_contact_duplicate (in_contact);
-
-	/* Name */
-	name = e_contact_name_new ();
-	name->given = get_entry_text (address, entryFirstname);
-	name->family = get_entry_text (address, entryLastname);
-
-	e_contact_set (contact, E_CONTACT_NAME, name);
-	e_contact_name_free (name);
-	
-	/* File as */
-	if (!e_contact_get_const (contact, E_CONTACT_FULL_NAME))
-		set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany);
-
-	/* Title and Company */
-	set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle);
-	set_contact_text (contact, E_CONTACT_ORG, address, entryCompany);
-
-	/* Address */
-	mailing_address = -1;
-	if (e_contact_get_const (contact, ctxt->cfg->default_address))
-		mailing_address = ctxt->cfg->default_address;
-
-	if (mailing_address == -1) {
-		for (i = E_CONTACT_FIRST_LABEL_ID; i < E_CONTACT_LAST_LABEL_ID; i++) {
-			if (e_contact_get_const (contact, i)) {
-				mailing_address = i;				
-				break;
-			}
-		}
-	}
-	
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-
-	eaddress = g_new0 (EContactAddress, 1);
-
-	txt = get_entry_text (address, entryAddress);
-	if ((find = strchr (txt, '\n')) != NULL) {
-		*find = '\0';
-		find++;
-	}	
-	eaddress->street = txt;
-	eaddress->ext = find != NULL ? g_strdup (find) : g_strdup ("");
-	eaddress->locality = get_entry_text (address, entryCity);
-	eaddress->region = get_entry_text (address, entryState);
-	eaddress->country = get_entry_text (address, entryCountry);
-	eaddress->code = get_entry_text (address, entryZip);
-	
-	e_contact_set (contact, mailing_address, eaddress);
-	e_contact_address_free (eaddress);
-	
-	/* Phone numbers */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		int phonelabel = address.phoneLabel[i - entryPhone1];
-		char *phonenum = get_entry_text (address, i);
-		
-		if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-			e_contact_set (contact, next_mail, phonenum);
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-			e_contact_set (contact, next_home, phonenum);
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-			e_contact_set (contact, next_work, phonenum);
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-			e_contact_set (contact, next_fax, phonenum);
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-			e_contact_set (contact, next_other, phonenum);
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-			e_contact_set (contact, next_main, phonenum);
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-			e_contact_set (contact, next_pager, phonenum);
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-			e_contact_set (contact, next_mobile, phonenum);
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-		
-		g_free (phonenum);
-	}
-
-	/* Note */
-	set_contact_text (contact, E_CONTACT_NOTE, address, entryNote);
-
-	free_Address(&address);
-
-	return contact;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	map_count = g_hash_table_size (ctxt->map->pid_map);	
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_book_get_uri (ctxt->ebook);
-	LOG (g_message ("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>"));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	EBookQuery *query;
-    	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	char *change_id;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION ));
-	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */
-
-	ctxt->dbi = dbi;	
-	
-	/* FIXME Need to allow our own concept of "local" */
-	ctxt->ebook = e_book_new ();
-	if (!e_book_load_local_addressbook (ctxt->ebook, NULL)) {
-		WARN(_("Could not load addressbook"));
-		gnome_pilot_conduit_error (conduit, _("Could not load addressbook"));
-
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get a list of all contacts */
-	query = e_book_query_from_string ("#t");
-	if (!e_book_get_contacts (ctxt->ebook, query, &ctxt->cards, NULL)) {
-		g_object_unref (query);
-
-		return -1;
-	}
-	g_object_unref (query);
-	
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (!e_book_get_changes (ctxt->ebook, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);	
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		EBookChange *ebc = l->data;
-		const char *uid;
-		
-		uid = e_contact_get_const (ebc->contact, E_CONTACT_UID);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ebc);
-
-			switch (ebc->change_type) {
-			case E_BOOK_CHANGE_CARD_ADDED:
-				add_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_MODIFIED:
-				mod_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-	
-	/* Set the count information */
-  	num_records = g_list_length (ctxt->cards);
-  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-  	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG (g_message ( "post_sync: Address Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_book_get_uri (ctxt->ebook));
-	addrconduit_save_configuration (ctxt->cfg);
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */	
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (e_book_get_changes (ctxt->ebook, change_id, &changed, NULL))
-		e_book_free_change_list (changed);
-	g_free (change_id);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_pilot_map_insert (ctxt->map, ID, e_contact_get_const (local->contact, E_CONTACT_UID), FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	g_hash_table_remove (ctxt->changed_hash, e_contact_get_const (local->contact, E_CONTACT_UID));
-	
-        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 (g_message ( "beginning for_each" ));
-
-		cards = ctxt->cards;
-		count = 0;
-		
-		if (cards != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (cards) ));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-  			local_record_from_ecard (*local, cards->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			iterator = cards;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "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 (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			EBookChange *ebc = iterator->data;
-			
-			LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash)));
-			 
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			EBookChange *ebc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-    			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG (g_message ("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 (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	EContact *contact;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	contact = ecard_from_remote_record (ctxt, remote, NULL);
-	
-	/* add the ecard to the server */
-	if (!e_book_add_contact (ctxt->ebook, contact, NULL)) {
-		WARN ("add_record: failed to add card to ebook\n");
-		g_object_unref (contact);
-		
-		return -1;
-	}
-
-	e_pilot_map_insert (ctxt->map, remote->ID, e_contact_get (contact, E_CONTACT_UID), FALSE);
-
-	g_object_unref (contact);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	EContact *new_contact;
-	EBookChange *ebc;
-	char *old_id;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote)));
-
-	old_id = e_contact_get (local->contact, E_CONTACT_UID);
-	ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-	
-	new_contact = ecard_from_remote_record (ctxt, remote, local->contact);
-	g_object_unref (local->contact);
-	local->contact = new_contact;
-
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		if (!e_book_add_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to add card\n");
-
-			return -1;
-		}
-		
-	} else {
-		if (!e_book_commit_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to commit card\n");
-
-			return -1;
-		}		
-	}
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		const char *uid = e_contact_get_const (local->contact, E_CONTACT_UID);
-		gboolean arch;
-		
-		arch = e_pilot_map_uid_is_archived (ctxt->map, uid);
-		e_pilot_map_insert (ctxt->map, remote->ID, uid, arch);
-
-		ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (ebc) {
-			g_hash_table_remove (ctxt->changed_hash, old_id);
-			g_object_unref (ebc->contact);
-			g_object_ref (local->contact);
-			ebc->contact = local->contact;
-			/* FIXME We should possibly be duplicating the uid */
-			g_hash_table_insert (ctxt->changed_hash, (gpointer) uid, ebc);
-		}
-	}
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->contact != NULL, -1);
-
-	LOG (g_message ( "delete_record: delete %s\n", print_local (local) ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, e_contact_get_const (local->contact, E_CONTACT_UID));
-	if (!e_book_remove_contact (ctxt->ebook, e_contact_get_const (local->contact, E_CONTACT_UID), NULL)) {
-		WARN ("delete_record: failed to delete card in ebook\n");
-
-		retval = -1;
-	}
-	
-	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 (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, e_contact_get_const (local->contact, E_CONTACT_UID), archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-  	const char *uid;
-	
-	LOG (g_message ("match: looking for local copy of %s\n",
-	     print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  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 (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	addrconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-	
-	*remote = local_record_to_pilot_record (local, ctxt);
-	
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EAddrConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_addr_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-
-	ctxt->ps = e_pilot_settings_new ();
-	ctxt->gui = e_addr_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "save_settings" ));
-
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_addr_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	addrconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	addrconduit_save_configuration (ctxt->cfg);
-	addrconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	ctxt = e_addr_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 669a506001..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="@privconduitdir@/libeaddress_conduit.so"/>
-	<name value="EAddress"/>
-	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
deleted file mode 100644
index 6b0850da5d..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = contact-editor contact-list-editor merging widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index 5639d4fc22..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
-GNOME_Evolution_Addressbook*.server
-GNOME_Evolution_Addressbook*.server.in
-addressbook-marshal.c
-addressbook-marshal.h
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
deleted file mode 100644
index fb55b0df58..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ /dev/null
@@ -1,143 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR@/libevolution-addressbook.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<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 card viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook folder viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-	               _value="Evolution Addressbook component"/>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="contacts"/>
-
-        <oaf_attribute name="evolution:button_label" type="string" _value="Contacts"/>
-        <oaf_attribute name="evolution:button_sort_order" type="string" value="-9"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="evolution-contacts.png"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook address viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook address pop-up"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-                                                                                          
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-        </oaf_attribute>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:title" type="string"
-                       _value="Certificates"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:description" type="string"
-                       _value="Manager your S/Mime certificates here"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:icon_name" type="string"
-                       value="pgp-signature-ok.png"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:priority" type="string" value="-6"/>
-                                                                                          
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution S/Mime Certificate Management Control"/>
-                                                                                          
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		_value="Autocompletion"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		_value="Configure autocomple here"/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		value="folder-settings.png"/>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-9"/>
-
-	<oaf_attribute name="name" type="string"
-		_value="Evolution folder settings configuration control"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index 09dcb8e537..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =									\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/gui/contact-editor		\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
-	-I$(top_srcdir)/addressbook/gui/widgets			\
-	-I$(top_srcdir)/addressbook/backend			\
-	-I$(top_builddir)/addressbook/backend			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
-	-DPREFIX=\""$(prefix)"\"				\
-	$(LDAP_CFLAGS)						\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-component_LTLIBRARIES = libevolution-addressbook.la
-
-libevolution_addressbook_la_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-config.c		\
-	addressbook-config.h		\
-	autocompletion-config.c		\
-	autocompletion-config.h		\
-	addressbook.c			\
-	addressbook.h			\
-	component-factory.c
-
-#	$(top_builddir)/addressbook/printing/libecontactprint.la
-
-if ENABLE_SMIME
-SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
-endif
-
-libevolution_addressbook_la_LIBADD =							\
-	$(SMIME_LIB)									\
-	$(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-	$(top_builddir)/shell/libeshell.la						\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la			\
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la			\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la			\
-	$(top_builddir)/filter/libfilter.la						\
-	$(top_builddir)/addressbook/util/libeabutil.la					\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
-	$(top_builddir)/widgets/menus/libmenus.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
-
-
-
-libevolution_addressbook_la_LDFLAGS = -module -avoid-version
-
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_addressbook.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
-		done \
-	fi
-
-server_in_files = GNOME_Evolution_Addressbook.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-glade_DATA =			\
-	ldap-config.glade
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES    = $(BUILT_SOURCES)
-
-EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(schema_DATA)		\
-	$(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-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 803ed82d55..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2003  Ettore Perazzoli
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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>
- */
-
-/* EPFIXME: Add autocompletion setting.  */
-
-
-#include <config.h>
-
-#include "addressbook-component.h"
-
-#include "addressbook.h"
-#include "addressbook-config.h"
-
-#include "widgets/misc/e-source-selector.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-
-#include "e-task-bar.h"
-
-#include <string.h>
-#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtklabel.h>	/* FIXME */
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-#include <gconf/gconf-client.h>
-#include <gal/util/e-util.h>
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _AddressbookComponentPrivate {
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-	GtkWidget *source_selector;
-
-	EActivityHandler *activity_handler;
-};
-
-
-/* Utility functions.  */
-
-static void
-load_uri_for_selection (ESourceSelector *selector,
-			BonoboControl *view_control)
-{
-	ESource *selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector));
-
-	if (selected_source != NULL) {
-		bonobo_control_set_property (view_control, NULL, "source_uid", TC_CORBA_string,
-					     e_source_peek_uid (selected_source), NULL);
-	}
-}
-
-static void
-add_popup_menu_item (GtkMenu *menu, const char *label, const char *pixmap,
-		     GCallback callback, gpointer user_data)
-{
-	GtkWidget *item, *image;
-
-	if (pixmap) {
-		item = gtk_image_menu_item_new_with_label (label);
-
-		/* load the image */
-		image = gtk_image_new_from_file (pixmap);
-		if (!image)
-			image = gtk_image_new_from_stock (pixmap, GTK_ICON_SIZE_MENU);
-
-		if (image)
-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	} else {
-		item = gtk_menu_item_new_with_label (label);
-	}
-
-	if (callback)
-		g_signal_connect (G_OBJECT (item), "activate", callback, user_data);
-
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	gtk_widget_show (item);
-}
-
-/* Folder popup menu callbacks */
-
-static void
-new_addressbook_cb (GtkWidget *widget, AddressbookComponent *comp)
-{
-	addressbook_config_create_new_source (gtk_widget_get_toplevel (widget));
-}
-
-static void
-edit_addressbook_cb (GtkWidget *widget, AddressbookComponent *comp)
-{
-	AddressbookComponentPrivate *priv;
-	ESource *selected_source;
-
-	priv = comp->priv;
-
-	selected_source =
-		e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!selected_source)
-		return;
-
-	addressbook_config_edit_source (gtk_widget_get_toplevel (widget), selected_source);
-}
-
-static void
-delete_addressbook_cb (GtkWidget *widget, AddressbookComponent *comp)
-{
-}
-
-/* Callbacks.  */
-
-static void
-primary_source_selection_changed_callback (ESourceSelector *selector,
-					   BonoboControl *view_control)
-{
-	load_uri_for_selection (selector, view_control);
-}
-
-static void
-fill_popup_menu_callback (ESourceSelector *selector, GtkMenu *menu, AddressbookComponent *comp)
-{
-	add_popup_menu_item (menu, _("New Addressbook"), NULL, G_CALLBACK (new_addressbook_cb), comp);
-	add_popup_menu_item (menu, _("Properties..."), NULL, G_CALLBACK (edit_addressbook_cb), comp);
-	add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_addressbook_cb), comp);
-	add_popup_menu_item (menu, _("Rename"), NULL, NULL, NULL);
-}
-
-/* Evolution::Component CORBA methods.  */
-
-static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
-	GtkWidget *selector;
-	GtkWidget *selector_scrolled_window;
-	GtkWidget *statusbar_widget;
-	BonoboControl *sidebar_control;
-	BonoboControl *view_control;
-	BonoboControl *statusbar_control;
-
-	selector = e_source_selector_new (addressbook_component->priv->source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	gtk_widget_show (selector);
-
-	addressbook_component->priv->source_selector = selector;
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), selector);
-	gtk_widget_show (selector_scrolled_window);
-
-	sidebar_control = bonobo_control_new (selector_scrolled_window);
-
-	view_control = addressbook_new_control ();
-	g_signal_connect_object (selector, "primary_selection_changed",
-				 G_CALLBACK (primary_source_selection_changed_callback),
-				 G_OBJECT (view_control), 0);
-	g_signal_connect_object (selector, "fill_popup_menu",
-				 G_CALLBACK (fill_popup_menu_callback),
-				 G_OBJECT (addressbook_component), 0);
-	load_uri_for_selection (E_SOURCE_SELECTOR (selector), view_control);
-
-	statusbar_widget = e_task_bar_new ();
-	gtk_widget_show (statusbar_widget);
-	statusbar_control = bonobo_control_new (statusbar_widget);
-
-	e_activity_handler_attach_task_bar (addressbook_component->priv->activity_handler,
-					    E_TASK_BAR (statusbar_widget));
-
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
-}
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 2;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = "contact";
-	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = _("_Contact");
-	list->_buffer[0].tooltip = _("Create a new contact");
-	list->_buffer[0].menuShortcut = 'c';
-	list->_buffer[0].iconName = "evolution-contacts-mini.png";
-
-	list->_buffer[1].id = "contact_list";
-	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = _("Contact _List");
-	list->_buffer[1].tooltip = _("Create a new contact list");
-	list->_buffer[1].menuShortcut = 'l';
-	list->_buffer[1].iconName = "contact-list-16.png";
-
-	return list;
-}
-
-static void
-impl_requestCreateItem (PortableServer_Servant servant,
-			const CORBA_char *item_type_name,
-			CORBA_Environment *ev)
-{
-	AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
-	AddressbookComponentPrivate *priv;
-	EBook *book;
-	EContact *contact = e_contact_new ();
-	ESource *selected_source;
-	gchar *uri;
-
-	priv = addressbook_component->priv;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!selected_source) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_Failed, NULL);
-		return;
-	}
-
-	uri = e_source_get_uri (selected_source);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_Failed, NULL);
-		return;
-	}
-
-	book = e_book_new ();
-	if (!e_book_load_uri (book, uri, TRUE, NULL)) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_Failed, NULL);
-		g_object_unref (book);
-		g_free (uri);
-		return;
-	}
-
-	contact = e_contact_new ();
-
-	if (!item_type_name) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UnknownType, NULL);
-	} else if (!strcmp (item_type_name, "contact")) {
-		eab_show_contact_editor (book, contact, TRUE, TRUE);
-	} else if (!strcmp (item_type_name, "contact_list")) {
-		eab_show_contact_list_editor (book, contact, TRUE, TRUE);
-	} else {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UnknownType, NULL);
-	}
-
-	g_object_unref (book);
-	g_object_unref (contact);
-	g_free (uri);
-}
-
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	AddressbookComponentPrivate *priv = ADDRESSBOOK_COMPONENT (object)->priv;
-
-	if (priv->source_selector != NULL) {
-		g_object_unref (priv->source_selector);
-		priv->source_selector = NULL;
-	}
-
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	AddressbookComponentPrivate *priv = ADDRESSBOOK_COMPONENT (object)->priv;
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-/* Initialization.  */
-
-static void
-addressbook_component_class_init (AddressbookComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	epv->createControls          = impl_createControls;
-	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-	epv->requestCreateItem       = impl_requestCreateItem;
-
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-
-	parent_class = g_type_class_peek_parent (class);
-}
-
-static void
-addressbook_component_init (AddressbookComponent *component)
-{
-	AddressbookComponentPrivate *priv;
-	GSList *groups;
-
-	priv = g_new0 (AddressbookComponentPrivate, 1);
-
-	/* EPFIXME: Should use a custom one instead?  Also we should add
-	   addressbook_component_peek_gconf_client().  */
-	priv->gconf_client = gconf_client_get_default ();
-
-	priv->source_list = e_source_list_new_for_gconf (priv->gconf_client,
-							 "/apps/evolution/addressbook/sources");
-
-	priv->activity_handler = e_activity_handler_new ();
-
-	/* Create default addressbooks if there are no groups */
-	groups = e_source_list_peek_groups (priv->source_list);
-	if (!groups) {
-		ESourceGroup *group;
-		ESource *source;
-		char *base_uri, *base_uri_proto, *new_dir;
-
-		/* create the local source group */
-		base_uri = g_build_filename (g_get_home_dir (),
-					     "/.evolution/addressbook/local/OnThisComputer/",
-					     NULL);
-
-		base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (priv->source_list, group, -1);
-
-		g_free (base_uri_proto);
-
-		/* FIXME: Migrate addressbooks from older setup? */
-
-		/* Create default addressbooks */
-		new_dir = g_build_filename (base_uri, "Personal/", NULL);
-		if (!e_mkdir_hier (new_dir, 0700)) {
-			source = e_source_new (_("Personal"), "Personal");
-			e_source_group_add_source (group, source, -1);
-		}
-		g_free (new_dir);
-
-		new_dir = g_build_filename (base_uri, "Work/", NULL);
-		if (!e_mkdir_hier (new_dir, 0700)) {
-			source = e_source_new (_("Work"), "Work");
-			e_source_group_add_source (group, source, -1);
-		}
-		g_free (new_dir);
-
-		g_free (base_uri);
-
-		/* Create the LDAP source group */
-		group = e_source_group_new (_("On LDAP Servers"), "ldap://");
-		e_source_list_add_group (priv->source_list, group, -1);
-	}
-
-	component->priv = priv;
-}
-
-
-/* Public API.  */
-
-AddressbookComponent *
-addressbook_component_peek (void)
-{
-	static AddressbookComponent *component = NULL;
-
-	if (component == NULL)
-		component = g_object_new (addressbook_component_get_type (), NULL);
-
-	return component;
-}
-
-
-EActivityHandler *
-addressbook_component_peek_activity_handler (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->activity_handler;
-}
-
-
-BONOBO_TYPE_FUNC_FULL (AddressbookComponent, GNOME_Evolution_Component, PARENT_TYPE, addressbook_component)
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index f08f54aaaf..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H_
-#define _ADDRESSBOOK_COMPONENT_H_
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution.h"
-#include "e-activity-handler.h"
-
-#define ADDRESSBOOK_TYPE_COMPONENT			(addressbook_component_get_type ())
-#define ADDRESSBOOK_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), ADDRESSBOOK_TYPE_COMPONENT, AddressbookComponent))
-#define ADDRESSBOOK_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), ADDRESSBOOK_TYPE_COMPONENT, AddressbookComponentClass))
-#define ADDRESSBOOK_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
-#define ADDRESSBOOK_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
-
-
-typedef struct _AddressbookComponent        AddressbookComponent;
-typedef struct _AddressbookComponentPrivate AddressbookComponentPrivate;
-typedef struct _AddressbookComponentClass   AddressbookComponentClass;
-
-struct _AddressbookComponent {
-	BonoboObject parent;
-
-	AddressbookComponentPrivate *priv;
-};
-
-struct _AddressbookComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-
-GType addressbook_component_get_type (void);
-
-AddressbookComponent *addressbook_component_peek (void);
-
-EActivityHandler *addressbook_component_peek_activity_handler  (AddressbookComponent *component);
-
-
-#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 371539562a..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,1439 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
-
-/*#define STANDALONE*/
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-druid.h>
-#include <libgnomeui/gnome-druid-page.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include <glade/glade.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook-config.h"
-
-#include "evolution-config-control.h"
-
-#include <gal/e-table/e-table-memory-store.h>
-#include <gal/e-table/e-table-scrolled.h>
-
-
-#ifdef HAVE_LDAP
-#include "ldap.h"
-#include "ldap_schema.h"
-#endif
-
-#define LDAP_PORT_STRING "389"
-#define LDAPS_PORT_STRING "636"
-
-#define GLADE_FILE_NAME "ldap-config.glade"
-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory:" BASE_VERSION
-#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION
-
-GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2,
-					 int num1, int num2);
-
-/* default objectclasses */
-#define TOP                  "top"
-#define PERSON               "person"
-#define ORGANIZATIONALPERSON "organizationalPerson"
-#define INETORGPERSON        "inetOrgPerson"
-#define EVOLUTIONPERSON      "evolutionPerson"
-#define CALENTRY             "calEntry"
-
-
-typedef struct {
-	GtkWidget *notebook;
-	int page_num;
-} FocusHelpClosure;
-
-static void
-focus_help (GtkWidget *w, GdkEventFocus *event, FocusHelpClosure *closure)
-{
-	gtk_notebook_set_current_page (GTK_NOTEBOOK(closure->notebook), closure->page_num);
-}
-
-static void
-add_focus_handler (GtkWidget *widget, GtkWidget *notebook, int page_num)
-{
-	FocusHelpClosure *focus_closure = g_new0 (FocusHelpClosure, 1);
-	focus_closure->notebook = notebook;
-	focus_closure->page_num = page_num;
-
-	g_signal_connect_data (G_OBJECT (widget),
-			       "focus_in_event" /* XXX */,
-			       G_CALLBACK (focus_help),
-			       focus_closure,
-			       (GClosureNotify) g_free,
-			       (GConnectFlags)0);
-}
-
-typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
-typedef void (*ModifyFunc)(GtkWidget *item, AddressbookSourceDialog *dialog);
-
-struct _AddressbookSourceDialog {
-	GladeXML  *gui;
-
-	GtkWidget *window;
-	GtkWidget *druid; /* only used (obviously) in the druid */
-
-	/* Source selection (druid only) */
-	ESourceList *source_list;
-	GtkWidget *group_optionmenu;
-
-	/* ESource we're currently editing (editor only) */
-	ESource *source;
-
-	/* Source group we're creating/editing a source in */
-	ESourceGroup *source_group;
-
-	/* info page fields */
-	ModifyFunc general_modify_func;
-	GtkWidget *host;
-	GtkWidget *auth_optionmenu;
-	AddressbookLDAPAuthType auth; 
-	GtkWidget *auth_label_notebook;
-	GtkWidget *auth_entry_notebook;
-	GtkWidget *email;
-	GtkWidget *binddn;
-
-	/* connecting page fields */
-	ModifyFunc connecting_modify_func;
-	GtkWidget *port_combo;
-	GtkWidget *ssl_optionmenu;
-	AddressbookLDAPSSLType ssl;
-
-	/* searching page fields */
-	ModifyFunc searching_modify_func;
-	GtkWidget *rootdn;
-	AddressbookLDAPScopeType scope;
-	GtkWidget *scope_optionmenu;
-	GtkWidget *timeout_scale;
-	GtkWidget *limit_spinbutton;
-
-	/* display name page fields */
-	GtkWidget *display_name;
-	gboolean display_name_changed; /* only used in the druid */
-
-	gboolean schema_query_successful;
-
-	/* stuff for the account editor window */
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-	GtkWidget *advanced_button_notebook;
-	GtkWidget *notebook; /* the toplevel notebook */
-
-	gboolean advanced;
-};
-
-
-
-#ifdef HAVE_LDAP
-
-static char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:
-		return "ldap/simple-email";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
-		return "ldap/simple-binddn";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "ldap/simple-email") || !strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL;
-	else if (!strcmp (auth, "ldap/simple-binddn"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN;
-	else
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-}
-
-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 char *
-ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
-{
-	switch (ssl_type) {
-	case ADDRESSBOOK_LDAP_SSL_NEVER:
-		return "never";
-	case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE:
-		return "whenever_possible";
-	case ADDRESSBOOK_LDAP_SSL_ALWAYS:
-		return "always";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-static AddressbookLDAPSSLType
-ldap_parse_ssl (const char *ssl)
-{
-	if (!ssl)
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; /* XXX good default? */
-
-	if (!strcmp (ssl, "always"))
-		return ADDRESSBOOK_LDAP_SSL_ALWAYS;
-	else if (!strcmp (ssl, "never"))
-		return ADDRESSBOOK_LDAP_SSL_NEVER;
-	else
-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-}
-
-#endif
-
-
-
-static gboolean
-create_source_dir (AddressbookSourceDialog *dialog, ESource *source)
-{
-	gchar *new_dir;
-	gint   result;
-
-	new_dir = g_build_filename (e_source_group_peek_base_uri (dialog->source_group),
-				    e_source_peek_name (source), NULL);
-	g_print ("Making %s\n", new_dir);
-	result = e_mkdir_hier (new_dir + sizeof ("file://") - 1, 0700);
-	g_free (new_dir);
-
-	if (result) {
-		e_notice (NULL /* FIXME: parent */, GTK_MESSAGE_ERROR,
-			  _("Could not create a directory for the new addressbook."));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-dialog_to_source (AddressbookSourceDialog *dialog, ESource *source, gboolean temporary)
-{
-	gchar *str;
-
-	g_assert (source);
-
-	e_source_set_name (source, gtk_entry_get_text (GTK_ENTRY (dialog->display_name)));
-
-	if (!strcmp ("ldap://", e_source_group_peek_base_uri (dialog->source_group))) {
-#ifdef HAVE_LDAP
-		e_source_set_property (source, "email_addr", gtk_entry_get_text (GTK_ENTRY (dialog->email)));
-		e_source_set_property (source, "binddn", gtk_entry_get_text (GTK_ENTRY (dialog->binddn)));
-		e_source_set_property (source, "limit", gtk_entry_get_text (GTK_ENTRY (dialog->limit_spinbutton)));
-		e_source_set_property (source, "ssl", ldap_unparse_ssl (dialog->ssl));
-		e_source_set_property (source, "auth", ldap_unparse_auth (dialog->auth));
-
-		str = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s",
-				       gtk_entry_get_text (GTK_ENTRY (dialog->host)),
-				       gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (dialog->port_combo)->entry)),
-				       gtk_entry_get_text (GTK_ENTRY (dialog->rootdn)),
-				       ldap_unparse_scope (dialog->scope));
-		e_source_set_relative_uri (source, str);
-		g_free (str);
-#endif
-	} else {
-		const gchar *relative_uri;
-
-		relative_uri = e_source_peek_relative_uri (source);
-		if (!relative_uri || !strlen (relative_uri)) {
-			e_source_set_relative_uri (source, e_source_peek_name (source));
-
-			if (!temporary && !create_source_dir (dialog, source))
-				return;
-		}
-	}
-
-	if (!temporary && !e_source_peek_group (source))
-		e_source_group_add_source (dialog->source_group, source, -1);
-}
-
-static ESource *
-dialog_to_temp_source (AddressbookSourceDialog *dialog)
-{
-	ESource *source;
-
-	source = e_source_new ("", "");
-	dialog_to_source (dialog, source, TRUE);
-
-	return source;
-}
-
-#ifdef HAVE_LDAP
-static gboolean
-source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn,
-		     AddressbookLDAPScopeType *scope, gint *port)
-{
-	gchar       *uri;
-	LDAPURLDesc *lud;
-	gint         ldap_error;
-
-	g_assert (source);
-
-	uri = e_source_get_uri (source);
-	ldap_error = ldap_url_parse ((gchar *) uri, &lud);
-	g_free (uri);
-
-	if (ldap_error != LDAP_SUCCESS)
-		return FALSE;
-
-	if (host)
-		*host = g_strdup (lud->lud_host ? lud->lud_host : "");
-	if (rootdn)
-		*rootdn = g_strdup (lud->lud_dn ? lud->lud_dn : "");
-	if (port)
-		*port = lud->lud_port ? lud->lud_port : LDAP_PORT;
-	if (scope)
-		*scope = lud->lud_scope == LDAP_SCOPE_BASE     ? ADDRESSBOOK_LDAP_SCOPE_BASE :
-			 lud->lud_scope == LDAP_SCOPE_ONELEVEL ? ADDRESSBOOK_LDAP_SCOPE_ONELEVEL :
-			 lud->lud_scope == LDAP_SCOPE_SUBTREE  ? ADDRESSBOOK_LDAP_SCOPE_SUBTREE :
-			 ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-
-	ldap_free_urldesc (lud);
-	return TRUE;
-}
-#endif
-
-#define SOURCE_PROP_STRING(source, prop) \
-        (source && e_source_get_property (source, prop) ? e_source_get_property (source, prop) : "")
-
-static void
-source_to_dialog (AddressbookSourceDialog *dialog)
-{
-	ESource *source = dialog->source;
-
-	gtk_entry_set_text (GTK_ENTRY (dialog->display_name), source ? e_source_peek_name (source) : "");
-
-#ifdef HAVE_LDAP
-	gtk_entry_set_text (GTK_ENTRY (dialog->email), SOURCE_PROP_STRING (source, "email_addr"));
-	gtk_entry_set_text (GTK_ENTRY (dialog->binddn), SOURCE_PROP_STRING (source, "binddn"));
-	gtk_entry_set_text (GTK_ENTRY (dialog->limit_spinbutton),
-			    source && e_source_get_property (source, "limit") ?
-			    e_source_get_property (source, "limit") : "100");
-
-	dialog->auth = source && e_source_get_property (source, "auth") ?
-		ldap_parse_auth (e_source_get_property (source, "auth")) : ADDRESSBOOK_LDAP_AUTH_NONE;
-	dialog->ssl = source && e_source_get_property (source, "ssl") ?
-		ldap_parse_ssl (e_source_get_property (source, "ssl")) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
-
-	if (source && !strcmp ("ldap://", e_source_group_peek_base_uri (dialog->source_group))) {
-		gchar                    *host;
-		gchar                    *rootdn;
-		AddressbookLDAPScopeType  scope;
-		gint                      port;
-
-		if (source_to_uri_parts (source, &host, &rootdn, &scope, &port)) {
-			gchar *port_str;
-
-			gtk_entry_set_text (GTK_ENTRY (dialog->host), host);
-			gtk_entry_set_text (GTK_ENTRY (dialog->rootdn), rootdn);
-
-			dialog->scope = scope;
-
-			port_str = g_strdup_printf ("%d", port);
-			gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (dialog->port_combo)->entry), port_str);
-			g_free (port_str);
-
-			g_free (host);
-			g_free (rootdn);
-		}
-	}
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->auth_optionmenu), dialog->auth);
-	if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1);
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1);
-	}
-	gtk_widget_set_sensitive (dialog->auth_label_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE);
-	gtk_widget_set_sensitive (dialog->auth_entry_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->scope_optionmenu), dialog->scope);
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->ssl_optionmenu), dialog->ssl);
-#endif
-}
-
-#ifdef HAVE_LDAP
-
-/* ldap api foo */
-static LDAP *
-addressbook_ldap_init (GtkWidget *window, ESource *source)
-{
-	LDAP  *ldap;
-	gchar *host;
-	gint   port;
-
-	if (!source_to_uri_parts (source, &host, NULL, NULL, &port))
-		return NULL;
-
-	ldap = ldap_init (host, port);
-	if (!ldap) {
-		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (GTK_WINDOW(window), 
-						 GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("Failed to connect to LDAP server"));
-		g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-		gtk_widget_show (dialog);
-	}
-
-	/* XXX do TLS if it's configured in */
-
-	g_free (host);
-	return ldap;
-}
-
-static gint
-addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
-{
-	gint ldap_error;
-
-	/* XXX use auth info from source */
-	ldap_error = ldap_simple_bind_s (ldap, NULL, NULL);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-						 GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("Failed to authenticate with LDAP server"));
-		g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-		gtk_widget_show (dialog);
-	}
-
-	return ldap_error;
-}
-
-static int
-addressbook_root_dse_query (GtkWindow *window, LDAP *ldap, char **attrs, LDAPMessage **resp)
-{
-	int ldap_error;
-	struct timeval timeout;
-
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
-	timeout.tv_usec = 0;
-
-	ldap_error = ldap_search_ext_s (ldap,
-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
-					"(objectclass=*)",
-					attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (window,
-						 GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("Could not perform query on Root DSE"));
-		g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-		gtk_widget_show (dialog);
-	}
-
-	return ldap_error;
-}
-
-#endif
-
-static void
-addressbook_source_dialog_destroy (gpointer data, GObject *where_object_was)
-{
-	AddressbookSourceDialog *dialog = data;
-
-	g_object_unref (dialog->gui);
-	g_free (dialog);
-}
-
-static void
-addressbook_add_server_druid_cancel (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-	gtk_widget_destroy (dialog->window);
-}
-
-static void
-addressbook_add_server_druid_finish (GnomeDruidPage *druid_page, GtkWidget *gnome_druid, AddressbookSourceDialog *sdialog)
-{
-	sdialog->source = e_source_new ("", "");
-	dialog_to_source (sdialog, sdialog->source, FALSE);
-
-	/* tear down the widgets */
-	gtk_widget_destroy (sdialog->window);
-}
-
-static void
-reparent_to_vbox (AddressbookSourceDialog *dialog, char *vbox_name, char *widget_name)
-{
-	GtkWidget *vbox, *widget;
-
-	vbox = glade_xml_get_widget (dialog->gui, vbox_name);
-	widget = glade_xml_get_widget (dialog->gui, widget_name);
-
-	gtk_widget_reparent (widget, vbox);
-	gtk_box_set_child_packing (GTK_BOX (vbox), widget, TRUE, TRUE, 0, GTK_PACK_START);
-}
-
-static void
-auth_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->auth = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)),
-				     item);
-
-	dialog->general_modify_func (item, dialog);
-
-	if (dialog->auth == 0) {
-		gtk_widget_set_sensitive (dialog->auth_label_notebook, FALSE);
-		gtk_widget_set_sensitive (dialog->auth_entry_notebook, FALSE);
-	}
-	else {
-		gtk_widget_set_sensitive (dialog->auth_label_notebook, TRUE);
-		gtk_widget_set_sensitive (dialog->auth_entry_notebook, TRUE);
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1);
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1);
-	}
-}
-
-static void
-add_auth_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (auth_optionmenu_activated), dialog);
-}
-
-static void
-setup_general_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func)
-{
-	GtkWidget *general_tab_help;
-	GtkWidget *menu;
-
-	general_tab_help = glade_xml_get_widget (dialog->gui, "general-tab-help");
-
-	dialog->general_modify_func = modify_func;
-	dialog->host = glade_xml_get_widget (dialog->gui, "server-name-entry");
-	g_signal_connect (dialog->host, "changed",
-			  G_CALLBACK (modify_func), dialog);
-	add_focus_handler (dialog->host, general_tab_help, 0);
-
-	dialog->auth_label_notebook = glade_xml_get_widget (dialog->gui, "auth-label-notebook");
-	dialog->auth_entry_notebook = glade_xml_get_widget (dialog->gui, "auth-entry-notebook");
-	dialog->email = glade_xml_get_widget (dialog->gui, "email-entry");
-	g_signal_connect (dialog->email, "changed",
-			  G_CALLBACK (modify_func), dialog);
-	add_focus_handler (dialog->email, general_tab_help, 1);
-	dialog->binddn = glade_xml_get_widget (dialog->gui, "dn-entry");
-	g_signal_connect (dialog->binddn, "changed",
-			  G_CALLBACK (modify_func), dialog);
-	add_focus_handler (dialog->binddn, general_tab_help, 2);
-
-	dialog->auth_optionmenu = glade_xml_get_widget (dialog->gui, "auth-optionmenu");
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->auth_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_auth_activate_cb, dialog);
-	add_focus_handler (dialog->auth_optionmenu, general_tab_help, 3);
-}
-
-static gboolean
-general_tab_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	const char *string;
-
-	if (strcmp ("ldap://", e_source_group_peek_base_uri (dialog->source_group)))
-		return TRUE;
-
-	string = gtk_entry_get_text (GTK_ENTRY (dialog->host));
-	if (!string || !string[0])
-		valid = FALSE;
-
-	if (valid) {
-		if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
-			if (dialog->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)
-				string = gtk_entry_get_text (GTK_ENTRY (dialog->binddn));
-			else
-				string = gtk_entry_get_text (GTK_ENTRY (dialog->email));
-
-			if (!string || !string[0])
-				valid = FALSE;
-		}
-	}
-
-	return valid;
-}
-
-static void
-druid_info_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   general_tab_check (dialog), /* next */
-					   TRUE, /* cancel */
-					   FALSE /* help */);
-}
-
-static void
-druid_info_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	druid_info_page_modify_cb (NULL, dialog);
-	/* stick the focus in the hostname field */
-	gtk_widget_grab_focus (dialog->host);
-}
-
-
-/* connecting page */
-static void
-ssl_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->ssl = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)),
-				    item);
-
-	dialog->connecting_modify_func (item, dialog);
-}
-
-static void
-ssl_optionmenu_selected (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	GtkWidget *connecting_tab_help;
-	int ssl_type = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)),
-				     item);
-
-	connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help");
-
-	gtk_notebook_set_current_page (GTK_NOTEBOOK(connecting_tab_help), ssl_type + 1);
-}
-
-static void
-add_ssl_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (ssl_optionmenu_activated), dialog);
-	g_signal_connect (item, "select",
-			  G_CALLBACK (ssl_optionmenu_selected), dialog);
-}
-
-static void
-port_changed_func (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	/* if the port value is ldaps, set the SSL/TLS option menu to
-	   Always and desensitize it */
-	const char *string = gtk_entry_get_text (GTK_ENTRY (item));
-
-	dialog->connecting_modify_func (item, dialog);
-
-	if (!strcmp (string, LDAPS_PORT_STRING)) {
-		dialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
-		gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->ssl_optionmenu),
-					     dialog->ssl);
-
-		gtk_widget_set_sensitive (dialog->ssl_optionmenu, FALSE);
-	}
-	else {
-		gtk_widget_set_sensitive (dialog->ssl_optionmenu, TRUE);
-	}
-
-}
-
-static void
-setup_connecting_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func)
-{
-	GtkWidget *menu;
-	GtkWidget *connecting_tab_help;
-
-	dialog->connecting_modify_func = modify_func;
-
-	connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help");
-
-	dialog->port_combo = glade_xml_get_widget (dialog->gui, "port-combo");
-	add_focus_handler (dialog->port_combo, connecting_tab_help, 0);
-	add_focus_handler (GTK_COMBO(dialog->port_combo)->entry, connecting_tab_help, 0);
-	g_signal_connect (GTK_COMBO(dialog->port_combo)->entry, "changed",
-			  G_CALLBACK (modify_func), dialog);
-	g_signal_connect (GTK_COMBO(dialog->port_combo)->entry, "changed",
-			  G_CALLBACK (port_changed_func), dialog);
-	dialog->ssl_optionmenu = glade_xml_get_widget (dialog->gui, "ssl-optionmenu");
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->ssl_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_ssl_activate_cb, dialog);
-}
-
-static gboolean
-connecting_tab_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	const char *string;
-
-	string = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry));
-	if (!string || !string[0])
-		valid = FALSE;
-
-	return valid;
-}
-
-static void
-druid_connecting_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   connecting_tab_check (dialog), /* next */
-					   TRUE, /* cancel */
-					   FALSE /* help */);
-}
-
-static void
-druid_connecting_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	druid_connecting_page_modify_cb (NULL, dialog);
-	/* stick the focus in the port combo */
-	gtk_widget_grab_focus (GTK_COMBO(dialog->port_combo)->entry);
-}
-
-
-
-#ifdef HAVE_LDAP
-
-/* searching page */
-static ETableMemoryStoreColumnInfo bases_table_columns[] = {
-	E_TABLE_MEMORY_STORE_STRING,
-	E_TABLE_MEMORY_STORE_TERMINATOR
-};
-
-#define BASES_TABLE_SPEC \
-"<ETableSpecification cursor-mode=\"line\" no-headers=\"true\"> \
-  <ETableColumn model_col= \"0\" _title=\"Base\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState> \
-    <column source=\"0\"/> \
-    <grouping></grouping> \
-  </ETableState> \
-</ETableSpecification>"
-
-GtkWidget*
-supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-
-	model = e_table_memory_store_new (bases_table_columns);
-
-	table = e_table_scrolled_new (model, NULL, BASES_TABLE_SPEC, NULL);
-
-	g_object_set_data (G_OBJECT (table), "model", model);
-
-	return table;
-}
-
-static gboolean
-do_ldap_root_dse_query (GtkWidget *dialog, ETableModel *model, ESource *source, char ***rvalues)
-{
-	LDAP *ldap;
-	char *attrs[2];
-	int ldap_error;
-	char **values;
-	LDAPMessage *resp;
-	int i;
-
-	ldap = addressbook_ldap_init (dialog, source);
-	if (!ldap)
-		return FALSE;
-
-	if (LDAP_SUCCESS != addressbook_ldap_auth (dialog, ldap))
-		goto fail;
-
-	attrs[0] = "namingContexts";
-	attrs[1] = NULL;
-
-	ldap_error = addressbook_root_dse_query (GTK_WINDOW (dialog), ldap, attrs, &resp);
-
-	if (ldap_error != LDAP_SUCCESS)
-		goto fail;
-
-	values = ldap_get_values (ldap, resp, "namingContexts");
-	if (!values || values[0] == NULL) {
-		GtkWidget *error_dialog;
-		error_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-						       GTK_DIALOG_MODAL,
-						       GTK_MESSAGE_ERROR,
-						       GTK_BUTTONS_OK,
-						       _("The server responded with no supported search bases"));
-		g_signal_connect (error_dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-		gtk_widget_show (error_dialog);
-		goto fail;
-	}
-
-	for (i = 0; values[i]; i++)
-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (model),
-					     -1, GINT_TO_POINTER(i), values[i]);
-
-	*rvalues = values;
-
-	ldap_unbind_s (ldap);
-	return TRUE;
-
- fail:
-	ldap_unbind_s (ldap);
-	return FALSE;
-}
-
-static void
-search_base_selection_model_changed (ESelectionModel *selection_model, GtkWidget *dialog)
-{
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-					   GTK_RESPONSE_OK,
-					   e_selection_model_selected_count (selection_model) == 1);
-}
-
-static void
-query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
-{
-	ESelectionModel *selection_model;
-	ESource *source;
-	GtkWidget *dialog;
-	GtkWidget *supported_bases_table;
-	ETableModel *model;
-	int id;
-	char **values;
-
-	source = dialog_to_temp_source (sdialog);
-
-	dialog = glade_xml_get_widget (sdialog->gui, "supported-bases-dialog");
-
-	supported_bases_table = glade_xml_get_widget (sdialog->gui, "supported-bases-table");
-	gtk_widget_show (supported_bases_table);
-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(supported_bases_table)));
-	model = g_object_get_data (G_OBJECT (supported_bases_table), "model");
-
-	g_signal_connect (selection_model, "selection_changed",
-			  G_CALLBACK (search_base_selection_model_changed), dialog);
-
-	search_base_selection_model_changed (selection_model, dialog);
-
-	if (do_ldap_root_dse_query (dialog, model, source, &values)) {
-		id = gtk_dialog_run (GTK_DIALOG (dialog));
-
-		gtk_widget_hide (dialog);
-
-		if (id == GTK_RESPONSE_OK) {
-			int i;
-			/* OK was clicked */
-
-			/* ugh. */
-			for (i = 0; values[i]; i ++) {
-				if (e_selection_model_is_row_selected (selection_model, i)) {
-					gtk_entry_set_text (GTK_ENTRY (sdialog->rootdn), values[i]);
-					break; /* single selection, so we can quit when we've found it. */
-				}
-			}
-		}
-
-		ldap_value_free (values);
-
-		e_table_memory_store_clear (E_TABLE_MEMORY_STORE (model));
-	}
-
-	g_object_unref (source);
-}
-
-static void
-scope_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->scope = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)),
-				      item);
-
-	if (dialog->searching_modify_func)
-		dialog->searching_modify_func (item, dialog);
-}
-
-static void
-add_scope_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (scope_optionmenu_activated), dialog);
-}
-
-static void
-setup_searching_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func)
-{
-	GtkWidget *menu;
-	GtkWidget *rootdn_button;
-	GtkWidget *searching_tab_help;
-
-	dialog->searching_modify_func = modify_func;
-
-	searching_tab_help = glade_xml_get_widget (dialog->gui, "searching-tab-help");
-
-	dialog->rootdn = glade_xml_get_widget (dialog->gui, "rootdn-entry");
-	add_focus_handler (dialog->rootdn, searching_tab_help, 0);
-	if (modify_func)
-		g_signal_connect (dialog->rootdn, "changed",
-				  G_CALLBACK (modify_func), dialog);
-
-	dialog->scope_optionmenu = glade_xml_get_widget (dialog->gui, "scope-optionmenu");
-	add_focus_handler (dialog->scope_optionmenu, searching_tab_help, 1);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->scope_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_scope_activate_cb, dialog);
-
-	dialog->timeout_scale = glade_xml_get_widget (dialog->gui, "timeout-scale");
-	add_focus_handler (dialog->timeout_scale, searching_tab_help, 2);
-	if (modify_func)
-		g_signal_connect (GTK_RANGE(dialog->timeout_scale)->adjustment,
-				  "value_changed",
-				  G_CALLBACK (modify_func), dialog);
-
-	dialog->limit_spinbutton = glade_xml_get_widget (dialog->gui, "download-limit-spinbutton");
-	if (modify_func)
-		g_signal_connect (dialog->limit_spinbutton, "changed",
-				  G_CALLBACK (modify_func), dialog);
-
-	/* special handling for the "Show Supported Bases button" */
-	rootdn_button = glade_xml_get_widget (dialog->gui, "rootdn-button");
-	g_signal_connect (rootdn_button, "clicked",
-			  G_CALLBACK(query_for_supported_bases), dialog);
-}
-
-static void
-druid_searching_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
-{
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   TRUE, /* next */
-					   TRUE, /* cancel */
-					   FALSE /* help */);
-}
-
-#endif
-
-
-/* display name page */
-static gboolean
-display_name_check (AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-	const char *string;
-
-	string = gtk_entry_get_text (GTK_ENTRY (dialog->display_name));
-	if (!string || !string[0])
-		valid = FALSE;
-
-	return valid;
-}
-
-static void
-folder_page_prepare (GtkWidget *page, GtkWidget *gnome_druid, AddressbookSourceDialog *dialog)
-{
-	if (!dialog->display_name_changed) {
-		const char *server_name = gtk_entry_get_text (GTK_ENTRY (dialog->host));
-		gtk_entry_set_text (GTK_ENTRY (dialog->display_name), server_name);
-	}
-
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid),
-					   TRUE, /* back */
-					   display_name_check (dialog), /* next */
-					   TRUE, /* cancel */
-					   FALSE /* help */);
-}
-
-static void
-druid_folder_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	dialog->display_name_changed = TRUE;
-	folder_page_prepare (NULL, NULL, dialog);
-}
-
-
-
-static void
-source_group_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog)
-{
-	sdialog->source_group = g_slist_nth (e_source_list_peek_groups (sdialog->source_list),
-		gtk_option_menu_get_history (GTK_OPTION_MENU (sdialog->group_optionmenu)))->data;
-}
-
-static void
-source_group_menu_add_groups (GtkMenuShell *menu_shell, ESourceList *source_list)
-{
-	GSList *groups, *sl;
-
-	groups = e_source_list_peek_groups (source_list);
-	for (sl = groups; sl; sl = g_slist_next (sl)) {
-		GtkWidget *menu_item;
-		ESourceGroup *group = sl->data;
-
-#ifndef HAVE_LDAP
-		/* If LDAP isn't configured, skip LDAP groups */
-		if (!strcmp ("ldap://", e_source_group_peek_base_uri (group)))
-			continue;
-#endif
-
-		menu_item = gtk_menu_item_new_with_label (e_source_group_peek_name (group));
-		gtk_widget_show (menu_item);
-		gtk_menu_shell_append (menu_shell, menu_item);
-	}
-}
-
-static gboolean
-folder_page_forward (GtkWidget *page, GtkWidget *widget, AddressbookSourceDialog *sdialog)
-{
-	GtkWidget *finish_page = glade_xml_get_widget (sdialog->gui, "add-server-druid-finish-page");
-	
-	if (strcmp ("ldap://", e_source_group_peek_base_uri (sdialog->source_group))) {
-		gnome_druid_set_page (GNOME_DRUID (sdialog->druid), GNOME_DRUID_PAGE (finish_page));
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-finish_page_back (GtkWidget *page, GtkWidget *widget, AddressbookSourceDialog *sdialog)
-{
-	GtkWidget *folder_page = glade_xml_get_widget (sdialog->gui, "add-server-druid-folder-page");
-	
-	if (strcmp ("ldap://", e_source_group_peek_base_uri (sdialog->source_group))) {
-		gnome_druid_set_page (GNOME_DRUID (sdialog->druid), GNOME_DRUID_PAGE (folder_page));
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static AddressbookSourceDialog *
-addressbook_add_server_druid (void)
-{
-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *page;
-	GConfClient *gconf_client;
-
-	sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
-
-	sdialog->window = glade_xml_get_widget (sdialog->gui, "account-druid-window");
-	sdialog->druid = glade_xml_get_widget (sdialog->gui, "account-druid");
-
-	/* general page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-folder-page");
-	sdialog->display_name = glade_xml_get_widget (sdialog->gui, "druid-display-name-entry");
-	g_signal_connect (sdialog->display_name, "changed",
-			  G_CALLBACK (druid_folder_page_modify_cb), sdialog);
-	g_signal_connect_after (page, "prepare",
-				G_CALLBACK (folder_page_prepare), sdialog);
-	g_signal_connect_after (page, "next",
-				G_CALLBACK (folder_page_forward), sdialog);
-
-	gconf_client = gconf_client_get_default ();
-	sdialog->source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
-	sdialog->group_optionmenu = glade_xml_get_widget (sdialog->gui, "druid-group-option-menu");
-	if (!GTK_IS_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (sdialog->group_optionmenu)))) {
-		GtkWidget *menu = gtk_menu_new ();
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (sdialog->group_optionmenu), menu);
-		gtk_widget_show (menu);
-	}
-
-	/* NOTE: This assumes that we have sources. If they don't exist, they're set up
-	 * on startup of the Addressbook component. */
-	source_group_menu_add_groups (GTK_MENU_SHELL (gtk_option_menu_get_menu (
-		GTK_OPTION_MENU (sdialog->group_optionmenu))), sdialog->source_list);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (sdialog->group_optionmenu), 0);
-	sdialog->source_group = e_source_list_peek_groups (sdialog->source_list)->data;
-	g_signal_connect (sdialog->group_optionmenu, "changed",
-			  G_CALLBACK (source_group_changed_cb), sdialog);
-
-#ifdef HAVE_LDAP
-
-	/* info page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-info-page");
-	reparent_to_vbox (sdialog, "account-druid-general-vbox", "general-tab");
-	setup_general_tab (sdialog, druid_info_page_modify_cb);
-	g_signal_connect_after (page, "prepare",
-				G_CALLBACK(druid_info_page_prepare), sdialog);
-
-	/* connecting page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-connecting-page");
-	reparent_to_vbox (sdialog, "account-druid-connecting-vbox", "connecting-tab");
-	setup_connecting_tab (sdialog, druid_connecting_page_modify_cb);
-	g_signal_connect_after (page, "prepare",
-				G_CALLBACK(druid_connecting_page_prepare), sdialog);
-
-	/* searching page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-searching-page");
-	reparent_to_vbox (sdialog, "account-druid-searching-vbox", "searching-tab");
-	setup_searching_tab (sdialog, NULL);
-	g_signal_connect_after (page, "prepare",
-				G_CALLBACK(druid_searching_page_prepare), sdialog);
-
-#endif
-
-	/* finish page */
-	page = glade_xml_get_widget (sdialog->gui, "add-server-druid-finish-page");
-	g_signal_connect (page, "finish",
-			  G_CALLBACK(addressbook_add_server_druid_finish), sdialog);
-	g_signal_connect_after (page, "back",
-				G_CALLBACK (finish_page_back), sdialog);
-	g_signal_connect (sdialog->druid, "cancel",
-			  G_CALLBACK(addressbook_add_server_druid_cancel), sdialog);
-	g_object_weak_ref (G_OBJECT (sdialog->window),
-			   addressbook_source_dialog_destroy, sdialog);
-
-	/* make sure we fill in the default values */
-	source_to_dialog (sdialog);
-
-	gtk_window_set_type_hint (GTK_WINDOW (sdialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
-
-	gtk_widget_show_all (sdialog->window);
-
-	return sdialog;
-}
-
-static void
-editor_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gboolean valid = TRUE;
-
-	valid = display_name_check (dialog);
-#ifdef HAVE_LDAP
-	if (valid)
-		valid = general_tab_check (dialog);
-	if (valid)
-		valid = connecting_tab_check (dialog);
-#if 0
-	if (valid)
-		valid = searching_tab_check (dialog);
-#endif
-#endif
-
-	gtk_widget_set_sensitive (dialog->ok_button, valid);
-}
-
-static void
-set_advanced_button_state (AddressbookSourceDialog *dialog)
-{
-	if (dialog->advanced) {
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->advanced_button_notebook), 0);
-#ifdef NEW_ADVANCED_UI
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->objectclasses_tab, dialog->objectclasses_label);
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->mappings_tab, dialog->mappings_label);
-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog->notebook), dialog->dn_customization_tab, dialog->dn_customization_label);
-#endif
-	}
-	else {
-#ifdef NEW_ADVANCED_UI
-		gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->advanced_button_notebook), 1);
-		
-		/* hide the advanced tabs of the main notebook */
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 5);
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 4);
-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 3);
-#endif
-	}
-}
-
-#ifdef NEW_ADVANCED_UI
-static void
-advanced_button_clicked (GtkWidget *button, AddressbookSourceDialog *dialog)
-{
-	dialog->advanced = !dialog->advanced;
-	set_advanced_button_state (dialog);
-}
-
-static gboolean
-do_schema_query (AddressbookSourceDialog *sdialog)
-{
-	LDAP *ldap;
-	int ldap_error;
-	char *schema_dn;
-	char *attrs[3];
-	char **values;
-	int i;
-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);
-	LDAPMessage *resp;
-	struct timeval timeout;
-
-	ldap = addressbook_ldap_init (sdialog->window, source);
-	if (!ldap)
-		goto fail;
-
-	if (LDAP_SUCCESS != addressbook_ldap_auth (sdialog->window, source, ldap))
-		goto fail;
-
-	attrs[0] = "subschemaSubentry";
-	attrs[1] = NULL;
-
-	ldap_error = addressbook_root_dse_query (sdialog->window, source, ldap, attrs, &resp);
-
-	if (ldap_error != LDAP_SUCCESS)
-		goto fail;
-
-	values = ldap_get_values (ldap, resp, "subschemaSubentry");
-	if (!values || values[0] == NULL) {
-		GtkWidget *dialog;
-		dialog = gnome_ok_dialog_parented (_("This server does not support LDAPv3 schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	schema_dn = g_strdup (values[0]);
-
-	ldap_value_free (values);
-	ldap_msgfree (resp);
-
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
-	timeout.tv_usec = 0;
-
-	ldap_error = ldap_search_ext_s (ldap, schema_dn, LDAP_SCOPE_BASE,
-					"(objectClass=subschema)", attrs, 0,
-					NULL, NULL, &timeout, LDAP_NO_LIMIT, &resp);
-	if (LDAP_SUCCESS != ldap_error) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Error retrieving schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	values = ldap_get_values (ldap, resp, "objectClasses");
-	if (!values) {
-		GtkWidget *dialog;
-		dialog = gnome_error_dialog_parented (_("Server did not respond with valid schema information"), GTK_WINDOW (sdialog->window));
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-		goto fail;
-	}
-
-	for (i = 0; values[i]; i ++) { 
-		int j;
-		int code;
-		const char *err;
-		LDAPObjectClass *oc = ldap_str2objectclass (values[i], &code, &err, 0);
-
-		if (!oc)
-			continue;
-
-		/* we fill in the default list of classes here */
-		for (j = 0; oc->oc_names[j]; j ++) {
-			if (!g_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], INETORGPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], PERSON) ||
-			    !g_strcasecmp (oc->oc_names[j], CALENTRY) ||
-			    !g_strcasecmp (oc->oc_names[j], TOP))
-				g_ptr_array_add (sdialog->default_objectclasses, oc);
-		}
-
-		g_ptr_array_add (sdialog->server_objectclasses, oc);
-	}
-
-	addressbook_source_free (source);
-	ldap_unbind_s (ldap);
-	return TRUE;
-
- fail:
-	addressbook_source_free (source);
-	if (ldap)
-		ldap_unbind_s (ldap);
-	return FALSE;
-}
-
-static void
-edit_dialog_switch_page (GtkNotebook *notebook,
-			 GtkNotebookPage *page, guint page_num,
-			 AddressbookSourceDialog *sdialog)
-{
-	if (page_num >= 3 && !sdialog->schema_query_successful) {
-		int i;
-
-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), FALSE);
-
-		sdialog->schema_query_successful = do_schema_query (sdialog);
-
-		if (sdialog->schema_query_successful) {
-			/* fill in the objectclasses model */
-			for (i = 0; i < sdialog->server_objectclasses->len; i ++) {
-				LDAPObjectClass *oc = g_ptr_array_index (sdialog->server_objectclasses, i);
-				e_table_memory_store_insert (E_TABLE_MEMORY_STORE (sdialog->objectclasses_server_model),
-							     -1, oc, oc->oc_names[0]);
-			}
-			gtk_widget_set_sensitive (page->child, TRUE);
-		}
-		else {
-			gtk_widget_set_sensitive (page->child, FALSE);
-		}
-
-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), TRUE);
-	}
-}
-#endif
-
-static gboolean
-edit_dialog_store_change (AddressbookSourceDialog *sdialog)
-{
-	dialog_to_source (sdialog, sdialog->source, FALSE);
-
-	/* check the display name for uniqueness */
-	if (FALSE /* XXX */) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-edit_dialog_cancel_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
-	gtk_widget_destroy (sdialog->window);
-}
-
-static void
-edit_dialog_ok_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
-	if (edit_dialog_store_change (sdialog)) {
-		gtk_widget_destroy (sdialog->window);
-	}
-}
-
-void
-addressbook_config_edit_source (GtkWidget *parent, ESource *source)
-{
-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *general_tab_help;
-
-	sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
-	sdialog->window = glade_xml_get_widget (sdialog->gui, "account-editor-window");
-
-	sdialog->source = source;
-	sdialog->source_group = e_source_peek_group (source);
-
-	sdialog->display_name = glade_xml_get_widget (sdialog->gui, "account-editor-display-name-entry");
-	g_signal_connect (sdialog->display_name, "changed",
-			  G_CALLBACK (editor_modify_cb), sdialog);
-
-#ifdef HAVE_LDAP
-
-	/* general tab */
-	general_tab_help = glade_xml_get_widget (sdialog->gui, "general-tab-help");
-	reparent_to_vbox (sdialog, "account-editor-general-ldap-vbox", "general-tab");
-	setup_general_tab (sdialog, editor_modify_cb);
-
-	/* connecting tab */
-	reparent_to_vbox (sdialog, "account-editor-connecting-vbox", "connecting-tab");
-	setup_connecting_tab (sdialog, editor_modify_cb);
-
-	/* searching tab */
-	reparent_to_vbox (sdialog, "account-editor-searching-vbox", "searching-tab");
-	setup_searching_tab (sdialog, editor_modify_cb);
-
-#endif
-
-	sdialog->notebook = glade_xml_get_widget (sdialog->gui, "account-editor-notebook");
-
-	sdialog->ok_button = glade_xml_get_widget (sdialog->gui, "account-editor-ok-button");
-	sdialog->cancel_button = glade_xml_get_widget (sdialog->gui, "account-editor-cancel-button");
-
-#ifdef HAVE_LDAP
-	if (strcmp ("ldap://", e_source_group_peek_base_uri (sdialog->source_group))) {
-		gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-general-ldap-vbox"));
-		gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox"));
-		gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox"));
-	} else {
-		add_focus_handler (sdialog->display_name, general_tab_help, 4);
-	}
-#else
-	gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-general-ldap-vbox"));
-	gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox"));
-	gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox"));
-#endif
-
-	source_to_dialog (sdialog);
-
-	set_advanced_button_state (sdialog);
-
-	g_signal_connect (sdialog->ok_button,
-			  "clicked", G_CALLBACK(edit_dialog_ok_clicked), sdialog);
-	g_signal_connect (sdialog->cancel_button,
-			  "clicked", G_CALLBACK(edit_dialog_cancel_clicked), sdialog);
-	g_object_weak_ref (G_OBJECT (sdialog->window),
-			   addressbook_source_dialog_destroy, sdialog);
-
-	gtk_widget_set_sensitive (sdialog->ok_button, FALSE);
-
-	gtk_window_set_type_hint (GTK_WINDOW (sdialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
-
-	gtk_widget_show (sdialog->window);
-}
-
-void
-addressbook_config_create_new_source (GtkWidget *parent)
-{
-	AddressbookSourceDialog *dialog;
-
-	dialog = addressbook_add_server_druid ();
-}
-
-#if 0
-#ifdef STANDALONE
-int
-main(int argc, char **argv)
-{
-	AddressbookDialog *dialog;
-
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    argc, argv, oaf_popt_options, 0, NULL);
-
-	glade_init ();
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	dialog = ldap_dialog_new (NULL);
-
-	gtk_widget_show (glade_xml_get_widget (dialog->gui, "addressbook-sources-window"));
-
-	gtk_main();
-
-	return 0;
-}
-#endif
-
-#endif
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index b5800bc123..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- **/
-
-#ifndef __ADDRESSBOOK_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "evolution-config-control.h"
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SSL_ALWAYS,
-	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,
-	ADDRESSBOOK_LDAP_SSL_NEVER
-} AddressbookLDAPSSLType;
-
-void  addressbook_config_edit_source        (GtkWidget *parent, ESource *source);
-void  addressbook_config_create_new_source  (GtkWidget  *parent);
-
-#endif /* __ADDRESSBOOK_CONFIG_H__ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index f415c903e9..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,1087 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook.c
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Lahey (clahey@ximian.com)
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-href.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <gal/util/e-util.h>
-
-#include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-sexp.h"
-#include "e-util/e-passwords.h"
-
-#include "evolution-shell-component-utils.h"
-#include "e-activity-handler.h"
-#include "e-contact-editor.h"
-#include "addressbook-config.h"
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/util/eab-book-util.h"
-
-#include <libebook/e-book-async.h>
-#include <widgets/misc/e-search-bar.h>
-#include <widgets/misc/e-filter-bar.h>
-
-/* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "evolution-contacts-mini.png"
-static GdkPixbuf *progress_icon = NULL;
-
-#define d(x)
-
-#define PROPERTY_SOURCE_UID          "source_uid"
-
-#define PROPERTY_SOURCE_UID_IDX      1
-
-typedef struct {
-	gint refs;
-	EABView *view;
-	ESearchBar *search;
-	gint        ecml_changed_id;
-	GtkWidget *vbox;
-	EBook *book;
-	guint activity_id;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-	ESource *source;
-	char *passwd;
-	gboolean ignore_search_changes;
-	gboolean failed_to_load;
-} AddressbookView;
-
-static void addressbook_view_ref (AddressbookView *);
-static void addressbook_view_unref (AddressbookView *);
-
-static void addressbook_authenticate (EBook *book, gboolean previous_failure,
-				      ESource *source, EBookCallback cb, gpointer closure);
-
-static void book_open_cb (EBook *book, EBookStatus status, gpointer closure);
-
-static void
-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_save_as(view->view);
-}
-
-static void
-view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_view(view->view);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view)
-		gtk_widget_show(eab_search_dialog_new(view->view));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view) {
-		eab_view_delete_selection(view->view);
-	}
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_print(view->view);
-}
-
-static void
-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_print_preview(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_stop(view->view);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_cut(view->view);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_copy(view->view);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_paste(view->view);
-}
-
-static void
-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_select_all (view->view);
-}
-
-static void
-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_send (view->view);
-}
-
-static void
-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_send_to (view->view);
-}
-
-static void
-copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_copy_to_folder (view->view);
-}
-
-static void
-move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		eab_view_move_to_folder (view->view);
-}
-
-static void
-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	e_passwords_forget_passwords();
-}
-
-static void
-update_command_state (EABView *eav, AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	if (view->view == NULL)
-		return;
-
-	addressbook_view_ref (view);
-
-	uic = bonobo_control_get_ui_component (view->control);
-
-	if (bonobo_ui_component_get_container (uic) != CORBA_OBJECT_NIL) {
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSaveAsVCard",
-					      "sensitive",
-					      eab_view_can_save_as (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsView",
-					      "sensitive",
-					      eab_view_can_view (view->view) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrint",
-					      "sensitive",
-					      eab_view_can_print (view->view) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrintPreview",
-					      "sensitive",
-					      eab_view_can_print (view->view) ? "1" : "0", NULL);
-
-		/* Delete Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactDelete",
-					      "sensitive",
-					      eab_view_can_delete (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCut",
-					      "sensitive",
-					      eab_view_can_cut (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopy",
-					      "sensitive",
-					      eab_view_can_copy (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPaste",
-					      "sensitive",
-					      eab_view_can_paste (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSelectAll",
-					      "sensitive",
-					      eab_view_can_select_all (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendContactToOther",
-					      "sensitive",
-					      eab_view_can_send (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendMessageToContact",
-					      "sensitive",
-					      eab_view_can_send_to (view->view) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsMoveToFolder",
-					      "sensitive",
-					      eab_view_can_move_to_folder (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopyToFolder",
-					      "sensitive",
-					      eab_view_can_copy_to_folder (view->view) ? "1" : "0", NULL);
-
-		/* Stop */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactStop",
-					      "sensitive",
-					      eab_view_can_stop (view->view) ? "1" : "0", NULL);
-	}
-
-	addressbook_view_unref (view);
-}
-
-static void
-change_view_type (AddressbookView *view, EABViewType view_type)
-{
-	g_object_set (view->view, "type", view_type, NULL);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrintPreview", print_preview_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSaveAsVCard", save_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsView", view_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsCut", cut_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopy", copy_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPaste", paste_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSelectAll", select_all_contacts_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendContactToOther", send_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendMessageToContact", send_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsMoveToFolder", move_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopyToFolder", copy_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsForgetPasswords", forget_passwords_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "save-as-16.png"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"),
-
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "evolution-trash-mini.png"),
-
-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/ToolSearch", "search-16.png"),
-
-	E_PIXMAP ("/Toolbar/ContactsPrint", "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/ContactDelete", "buttons/delete-message.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	Bonobo_UIContainer remote_ui_container;
-
-	remote_ui_container = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_ui_container, NULL);
-	bonobo_object_release_unref (remote_ui_container, NULL);
-
-	e_search_bar_set_ui_component (view->search, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, view);
-	
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-addressbook.xml",
-			       "evolution-addressbook", NULL);
-
-	eab_view_setup_menus (view->view, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	update_command_state (view->view, view);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (activate) {
-		control_activate (control, uic, view);
-		if (activate && view->view && view->view->model)
-			eab_model_force_folder_bar_message (view->view->model);
-
-		/* if the book failed to load, we kick off another
-		   load here */
-
-		if (view->failed_to_load && view->source) {
-			EBook *book;
-
-			book = e_book_new ();
-
-			addressbook_load_source (book, view->source, book_open_cb, view);
-		}
-	} else {
-		bonobo_ui_component_unset_container (uic, NULL);
-		eab_view_discard_menus (view->view);
-	}
-}
-
-static ECategoriesMasterList *
-get_master_list (void)
-{
-	static ECategoriesMasterList *category_list = NULL;
-
-	if (category_list == NULL)
-		category_list = e_categories_master_list_wombat_new ();
-	return category_list;
-}
-
-static void
-addressbook_view_clear (AddressbookView *view)
-{
-	if (view->book) {
-		g_object_unref (view->book);
-		view->book = NULL;
-	}
-	
-	if (view->properties) {
-		bonobo_object_unref (BONOBO_OBJECT(view->properties));
-		view->properties = NULL;
-	}
-		
-	g_free(view->passwd);
-	view->passwd = NULL;
-
-	if (view->source_list) {
-		g_object_unref (view->source_list);
-		view->source_list = NULL;
-	}
-
-	if (view->ecml_changed_id != 0) {
-		g_signal_handler_disconnect (get_master_list(),
-					     view->ecml_changed_id);
-		view->ecml_changed_id = 0;
-	}
-}
-
-static void
-addressbook_view_ref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	++view->refs;
-}
-
-static void
-addressbook_view_unref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	--view->refs;
-	if (view->refs == 0) {
-		addressbook_view_clear (view);
-		g_free (view);
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookView *view = closure;
-
-	if (status == E_BOOK_ERROR_OK) {
-		view->failed_to_load = FALSE;
-		g_object_set(view->view,
-			     "book", book,
-			     NULL);
-		view->book = book;
-	}
-	else {
-		char *label_string;
-		GtkWidget *warning_dialog;
-		GtkWidget *href = NULL;
-		gchar *uri;
-
-		view->failed_to_load = TRUE;
-
-		uri = e_source_get_uri (view->source);
-
-		if (!strncmp (uri, "file:", 5)) {
-			label_string = 
-				_("We were unable to open this addressbook.  Please check that the\n"
-				  "path exists and that you have permission to access it.");
-		}
-		else if (!strncmp (uri, "ldap:", 5)) {
-			/* special case for ldap: contact folders so we can tell the user about openldap */
-#if HAVE_LDAP
-			label_string = 
-				_("We were unable to open this addressbook.  This either\n"
-				  "means you have entered an incorrect URI, or the LDAP server\n"
-				  "is unreachable.");
-#else
-			label_string =
-				_("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");
-			href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");
-#endif
-		} else {
-			/* other network folders */
-			label_string =
-				_("We were unable to open this addressbook.  This either\n"
-				  "means you have entered an incorrect URI, or the server\n"
-				  "is unreachable.");
-		}
-
-        	warning_dialog = gtk_message_dialog_new (
-			 NULL /* XXX */,
-			 0,
-			 GTK_MESSAGE_WARNING,
-			 GTK_BUTTONS_CLOSE, 
-			 label_string,
-			 NULL);
-
-		g_signal_connect (warning_dialog, 
-				  "response", 
-				  G_CALLBACK (gtk_widget_destroy),
-				  warning_dialog);
-
-		gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Unable to open addressbook"));
-
-		if (href)
-			gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), 
-					    href, FALSE, FALSE, 0);
-
-		gtk_widget_show_all (warning_dialog);
-
-		g_free (uri);
-	}
-}
-
-static void
-destroy_callback(gpointer data, GObject *where_object_was)
-{
-	AddressbookView *view = data;
-	addressbook_view_unref (view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	switch (arg_id) {
-
-	case PROPERTY_SOURCE_UID_IDX:
-		if (view && view->source)
-			BONOBO_ARG_SET_STRING (arg, e_source_peek_uid (view->source));
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-typedef struct {
-	EBookCallback cb;
-	ESource *source;
-	gpointer closure;
-} LoadSourceData;
-
-static void
-load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *data = closure;
-
-	if (status != E_BOOK_ERROR_OK) {
-		if (status == E_BOOK_ERROR_CANCELLED) {
-			/* the user clicked cancel in the password dialog */
-			GtkWidget *dialog;
-			dialog = gtk_message_dialog_new (NULL,
-							 0,
-							 GTK_MESSAGE_WARNING,
-							 GTK_BUTTONS_OK,
-							 _("Accessing LDAP Server anonymously"));
-			g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-			gtk_widget_show (dialog);
-			data->cb (book, E_BOOK_ERROR_OK, data->closure);
-			g_free (data);
-			return;
-		}
-		else {
-			gchar *uri = e_source_get_uri (data->source);
-
-			e_passwords_forget_password ("Addressbook", uri);
-			addressbook_authenticate (book, TRUE, data->source, load_source_auth_cb, closure);
-
-			g_free (uri);
-			return;
-		}
-	}
-
-	data->cb (book, status, data->closure);
-
-	g_object_unref (data->source);
-	g_free (data);
-}
-
-static gboolean
-get_remember_password (ESource *source)
-{
-	const gchar *value;
-
-	value = e_source_get_property (source, "remember_password");
-	if (value && !strcasecmp (value, "true"))
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-set_remember_password (ESource *source, gboolean value)
-{
-	e_source_set_property (source, "remember_password",
-			       value ? "true" : "false");
-}
-
-static void
-addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source,
-			  EBookCallback cb, gpointer closure)
-{
-	const char *password = NULL;
-	char *pass_dup = NULL;
-	const gchar *auth;
-	const gchar *user;
-	gchar *uri = e_source_get_uri (source);
-
-	password = e_passwords_get_password ("Addressbook", uri);
-
-	auth = e_source_get_property (source, "auth");
-
-	if (auth && !strcmp ("ldap/simple-binddn", auth))
-		user = e_source_get_property (source, "binddn");
-	else
-		user = e_source_get_property (source, "email_addr");
-	if (!user)
-		user = "";
-
-	if (!password) {
-		char *prompt;
-		gboolean remember;
-		char *failed_auth;
-
-		if (previous_failure) {
-			failed_auth = _("Failed to authenticate.\n");
-		}
-		else {
-			failed_auth = "";
-		}
-
-		prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
-					  failed_auth, e_source_peek_name (source), user);
-
-		remember = get_remember_password (source);
-		pass_dup = e_passwords_ask_password (prompt, "Addressbook", uri, prompt, TRUE,
-						     E_PASSWORDS_REMEMBER_FOREVER, &remember,
-						     NULL);
-		if (remember != get_remember_password (source))
-			set_remember_password (source, remember);
-
-		g_free (prompt);
-	}
-
-	if (password || pass_dup) {
-		e_book_async_authenticate_user (book, user, password ? password : pass_dup,
-						e_source_get_property (source, "auth"),
-						cb, closure);
-		g_free (pass_dup);
-	}
-	else {
-		/* they hit cancel */
-		cb (book, E_BOOK_ERROR_CANCELLED, closure);
-	}
-
-	g_free (uri);
-}
-
-static void
-load_source_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *load_source_data = closure;
-
-	if (status == E_BOOK_ERROR_OK && book != NULL) {
-		const gchar *auth;
-
-		auth = e_source_get_property (load_source_data->source, "auth");
-
-		/* check if the addressbook needs authentication */
-
-		if (auth && strcmp (auth, "none")) {
-			addressbook_authenticate (book, FALSE, load_source_data->source,
-						  load_source_auth_cb, closure);
-
-			return;
-		}
-	}
-	
-	load_source_data->cb (book, status, load_source_data->closure);
-	g_object_unref (load_source_data->source);
-	g_free (load_source_data);
-}
-
-void
-addressbook_load_source (EBook *book, ESource *source,
-			 EBookCallback cb, gpointer closure)
-{
-	LoadSourceData *load_source_data = g_new0 (LoadSourceData, 1);
-
-	load_source_data->cb = cb;
-	load_source_data->closure = closure;
-	load_source_data->source = g_object_ref (source);
-
-	e_book_async_load_source (book, source, load_source_cb, load_source_data);
-}
-
-void
-addressbook_load_default_book (EBookCallback cb, gpointer closure)
-{
-	LoadSourceData *load_source_data = g_new (LoadSourceData, 1);
-
-	/* FIXME: We need to get the source for the default book */
-
-	load_source_data->cb = cb;
-	load_source_data->closure = closure;
-
-	e_book_async_get_default_addressbook (load_source_cb, load_source_data);
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-	const gchar *uid;
-
-	switch (arg_id) {
-
-	case PROPERTY_SOURCE_UID_IDX:
-		if (view->book) {
-			/* we've already had a uri set on this view, so unload it */
-			e_book_async_unload_uri (view->book); 
-			view->source = NULL;
-		} else {
-			view->book = e_book_new ();
-		}
-
-		view->failed_to_load = FALSE;
-
-		uid = BONOBO_ARG_GET_STRING (arg);
-		view->source = e_source_list_peek_source_by_uid (view->source_list, uid);
-
-		if (view->source)
-			addressbook_load_source (view->book, view->source, book_open_cb, view);
-		else
-			g_warning ("Could not find source by UID '%s'!", uid);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-enum {
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-	ESB_CATEGORY,
-	ESB_ANY,
-	ESB_ADVANCED
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Name begins with"), ESB_FULL_NAME, NULL },
-	{ N_("Email begins with"), ESB_EMAIL, NULL },
-	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */
-	{ N_("Any field contains"), ESB_ANY, NULL },
-	{ N_("Advanced..."), ESB_ADVANCED, NULL },
-	{ NULL, -1, NULL }
-};
-
-static void
-addressbook_search_activated (ESearchBar *esb, AddressbookView *view)
-{
-	ECategoriesMasterList *master_list;
-	char *search_word, *search_query;
-	const char *category_name;
-	int search_type, subid;
-
-	if (view->ignore_search_changes) {
-		return;
-	}
-
-	g_object_get(esb,
-		     "text", &search_word,
-		     "item_id", &search_type,
-		     NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(eab_search_dialog_new(view->view));
-	}
-	else {
-		if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) {
-			GString *s = g_string_new ("");
-			e_sexp_encode_string (s, search_word);
-			switch (search_type) {
-			case ESB_ANY:
-				search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" %s)",
-								s->str);
-				break;
-			case ESB_FULL_NAME:
-				search_query = g_strdup_printf ("(beginswith \"full_name\" %s)",
-								s->str);
-				break;
-			case ESB_EMAIL:
-				search_query = g_strdup_printf ("(beginswith \"email\" %s)",
-								s->str);
-				break;
-			case ESB_CATEGORY:
-				subid = e_search_bar_get_subitem_id (esb);
-
-				if (subid < 0 || subid == G_MAXINT) {
-					/* match everything */
-					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				} else {
-					master_list = get_master_list ();
-					category_name = e_categories_master_list_nth (master_list, subid);
-					search_query = g_strdup_printf ("(is \"category\" \"%s\")", category_name);
-				}
-				break;
-			default:
-				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				break;
-			}
-			g_string_free (s, TRUE);
-		} else
-			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-
-		if (search_query)
-			g_object_set (view->view,
-				      "query", search_query,
-				      NULL);
-
-		g_free (search_query);
-	}
-
-	g_free (search_word);
-}
-
-static void
-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
-{
-	int search_type;
-
-	g_object_get(esb,
-		     "item_id", &search_type,
-		     NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(eab_search_dialog_new(view->view));
-	}
-}
-
-static void
-set_status_message (EABView *eav, const char *message, AddressbookView *view)
-{
-	EActivityHandler *activity_handler = addressbook_component_peek_activity_handler (addressbook_component_peek ());
-
-	if (!message || !*message) {
-		if (view->activity_id != 0) {
-			e_activity_handler_operation_finished (activity_handler, view->activity_id);
-			view->activity_id = 0;
-		}
-	} else if (view->activity_id == 0) {
-		char *clientid = g_strdup_printf ("%p", view);
-
-		if (progress_icon == NULL)
-			progress_icon = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CONTACTS_PROGRESS_IMAGE, NULL);
-
-		view->activity_id = e_activity_handler_operation_started (activity_handler, clientid,
-									  progress_icon, message, TRUE);
-
-		g_free (clientid);
-	} else {
-		e_activity_handler_operation_progressing (activity_handler, view->activity_id, message, -1.0);
-	}
-
-}
-
-static void
-search_result (EABView *eav, EBookViewStatus status, AddressbookView *view)
-{
-	char *str = NULL;
-
-	switch (status) {
-	case E_BOOK_VIEW_STATUS_OK:
-		return;
-	case E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED:
-		str = _("More cards matched this query than either the server is \n"
-			"configured to return or Evolution is configured to display.\n"
-			"Please make your search more specific or raise the result limit in\n"
-			"the directory server preferences for this addressbook.");
-		break;
-	case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED:
-		str = _("The time to execute this query exceeded the server limit or the limit\n"
-			"you have configured for this addressbook.  Please make your search\n"
-			"more specific or raise the time limit in the directory server\n"
-			"preferences for this addressbook.");
-		break;
-	case E_BOOK_VIEW_ERROR_INVALID_QUERY:
-		str = _("The backend for this addressbook was unable to parse this query.");
-		break;
-	case E_BOOK_VIEW_ERROR_QUERY_REFUSED:
-		str = _("The backend for this addressbook refused to perform this query.");
-		break;
-	case E_BOOK_VIEW_ERROR_OTHER_ERROR:
-		str = _("This query did not complete successfully.");
-		break;
-	}
-
-	if (str) {
-		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (NULL,
-						 0,
-						 GTK_MESSAGE_WARNING,
-						 GTK_BUTTONS_OK,
-						 str);
-		g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
-		gtk_widget_show (dialog);
-	}
-}
-
-static int
-compare_subitems (const void *a, const void *b)
-{
-	const ESearchBarSubitem *subitem_a = a;
-	const ESearchBarSubitem *subitem_b = b;
-
-	return strcoll (subitem_a->text, subitem_b->text);
-}
-
-static void
-make_suboptions (AddressbookView *view)
-{
-	ESearchBarSubitem *subitems, *s;
-	ECategoriesMasterList *master_list;
-	gint i, N;
-
-	master_list = get_master_list ();
-	N = e_categories_master_list_count (master_list);
-	subitems = g_new (ESearchBarSubitem, N+2);
-
-	subitems[0].id = G_MAXINT;
-	subitems[0].text = g_strdup (_("Any Category"));
-	subitems[0].translate = FALSE;
-
-	for (i=0; i<N; ++i) {
-		const char *category = e_categories_master_list_nth (master_list, i);
-
-		subitems[i+1].id = i;
-		subitems[i+1].text = g_strdup (category);
-		subitems[i+1].translate = FALSE;
-	}
-	subitems[N+1].id = -1;
-	subitems[N+1].text = NULL;
-
-	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);
-
-	e_search_bar_set_suboption (view->search, ESB_CATEGORY, subitems);
-
-	for (s = subitems; s->id != -1; s++) {
-		if (s->text)
-			g_free (s->text);
-	}
-	g_free (subitems);
-}
-
-static void
-ecml_changed (ECategoriesMasterList *ecml, AddressbookView *view)
-{
-	make_suboptions (view);
-}
-
-static void
-connect_master_list_changed (AddressbookView *view)
-{
-	view->ecml_changed_id =
-		g_signal_connect (get_master_list(), "changed",
-				  G_CALLBACK (ecml_changed), view);
-}
-
-BonoboControl *
-addressbook_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 1);
-	view->refs = 1;
-	view->ignore_search_changes = FALSE;
-
-	view->vbox = gtk_vbox_new (FALSE, 0);
-
-	g_object_weak_ref (G_OBJECT (view->vbox), destroy_callback, view);
-
-	/* Create the control. */
-	view->control = bonobo_control_new (view->vbox);
-
-	view->search = E_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));
-	make_suboptions (view);
-	connect_master_list_changed (view);
-
-	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
-			    FALSE, FALSE, 0);
-	g_signal_connect (view->search, "query_changed",
-			  G_CALLBACK (addressbook_query_changed), view);
-	g_signal_connect (view->search, "search_activated",
-			  G_CALLBACK (addressbook_search_activated), view);
-
-	view->view = EAB_VIEW(eab_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, EAB_VIEW_TABLE);
-
-	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_SOURCE_UID, PROPERTY_SOURCE_UID_IDX,
-				 BONOBO_ARG_STRING, NULL,
-				 _("UID of the contacts source that the view will display"), 0);
-
-	bonobo_control_set_properties (view->control,
-				       bonobo_object_corba_objref (BONOBO_OBJECT (view->properties)),
-				       NULL);
-
-	g_signal_connect (view->view, "status_message",
-			  G_CALLBACK(set_status_message), view);
-
-	g_signal_connect (view->view, "search_result",
-			  G_CALLBACK(search_result), view);
-
-	g_signal_connect (view->view, "command_state_change",
-			  G_CALLBACK(update_command_state), view);
-
-	view->gconf_client = gconf_client_get_default ();
-	view->source_list = e_source_list_new_for_gconf (view->gconf_client,
-							 "/apps/evolution/addressbook/sources");
-	view->source = NULL;
-
-	g_signal_connect (view->control, "activate",
-			  G_CALLBACK (control_activate_cb), view);
-
-	return view->control;
-}
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
deleted file mode 100644
index fb05287133..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-#include <e-util/e-config-listener.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libebook/e-book-async.h>
-
-/* use this instead of e_book_load_uri everywhere where you want the
-   authentication to be handled for you. */
-#if 0
-void       addressbook_load_uri             (EBook *book, const char *uri, EBookCallback cb, gpointer closure);
-#endif
-void       addressbook_load_source          (EBook *book, ESource *source, EBookCallback cb, gpointer closure);
-void       addressbook_load_default_book    (EBookCallback open_response, gpointer closure);
-
-BonoboControl *addressbook_new_control  (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
deleted file mode 100644
index 82af9d0843..0000000000
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
+++ /dev/null
@@ -1,42 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Completion uris -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/uris</key>
-      <applyto>/apps/evolution/addressbook/completion/uris</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>EFolderList xml for the list of completion uris</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/minimum_query_length</key>
-      <applyto>/apps/evolution/addressbook/completion/minimum_query_length</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>3</default>
-      <locale name="C">
-        <short>The number of characters that must be typed before evolution will attempt to autocomplete</short>
-      </locale>
-    </schema>
-
-    <!-- Select names last used uri -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/select_names/last_used_uri</key>
-      <applyto>/apps/evolution/addressbook/select_names/last_used_uri</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>URI for the folder last used in the select names dialog</short>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
\ No newline at end of file
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
deleted file mode 100644
index 05898f6688..0000000000
--- a/addressbook/gui/component/autocompletion-config.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Chris Toshok <toshok@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "autocompletion-config.h"
-
-#include "Evolution.h"
-
-#include <bonobo/bonobo-exception.h>
-
-#include "e-source-selector.h"
-#include <libedataserver/e-source-list.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
-
-
-typedef struct {
-	EvolutionConfigControl *config_control;
-
-	GtkWidget *control_widget;
-
-	ESourceList *source_list;
-} AutocompletionConfig;
-
-static void
-source_selection_changed (ESourceSelector *selector,
-			  AutocompletionConfig *ac)
-{
-	evolution_config_control_changed (ac->config_control);
-}
-
-static void
-config_control_destroy_notify (void *data,
-			       GObject *where_the_config_control_was)
-{
-	AutocompletionConfig *ac = (AutocompletionConfig *) data;
-
-	g_object_unref (ac->source_list);
-
-	g_free (ac);
-}
-
-
-static void
-config_control_apply_callback (EvolutionConfigControl *config_control,
-			       AutocompletionConfig *ac)
-{
-	GSList *selection;
-	GSList *l;
-	GSList *groups;
-
-	/* first we clear all the completion flags from all sources */
-	for (groups = e_source_list_peek_groups (ac->source_list); groups; groups = groups->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		GSList *sources;
-		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
-			ESource *source = E_SOURCE (sources->data);
-
-			e_source_set_property (source, "completion", NULL);
-		}
-	}
-
-	/* then we loop over the selector's selection, setting the
-	   property on those sources */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (ac->control_widget));
-	for (l = selection; l; l = l->next) {
-		e_source_set_property (E_SOURCE (l->data), "completion", "true");
-	}
-	e_source_selector_free_selection (selection);
-
-	e_source_list_sync (ac->source_list, NULL); /* XXX we should pop up a dialog if this fails */
-}
-
-static void
-initialize_selection (AutocompletionConfig *ac)
-{
-	GSList *groups;
-
-	for (groups = e_source_list_peek_groups (ac->source_list); groups; groups = groups->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		GSList *sources;
-		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
-			ESource *source = E_SOURCE (sources->data);
-			const char *completion = e_source_get_property (source, "completion");
-			if (completion && !g_ascii_strcasecmp (completion, "true"))
-				e_source_selector_select_source (E_SOURCE_SELECTOR (ac->control_widget),
-								 source);
-		}
-	}
-}
-
-EvolutionConfigControl*
-autocompletion_config_control_new (void)
-{
-	AutocompletionConfig *ac;
-	CORBA_Environment ev;
-
-	ac = g_new0 (AutocompletionConfig, 1);
-
-	CORBA_exception_init (&ev);
-
-	ac->source_list =  e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	/* XXX should we watch for the source list to change and
-	   update it in the control?  what about our local changes? */
-	/*	g_signal_connect (ac->source_list, "changed", G_CALLBACK (source_list_changed), ac); */
-
-	ac->control_widget = e_source_selector_new (ac->source_list);
-
-	initialize_selection (ac);
-
-	gtk_widget_show (ac->control_widget);
-
-	ac->config_control = evolution_config_control_new (ac->control_widget);
-
-	g_signal_connect (ac->control_widget, "selection_changed",
-			  G_CALLBACK (source_selection_changed), ac);
-	g_signal_connect (ac->config_control, "apply",
-			  G_CALLBACK (config_control_apply_callback), ac);
-
-	g_object_weak_ref (G_OBJECT (ac->config_control), config_control_destroy_notify, ac);
-
-	CORBA_exception_free (&ev);
-
-	return ac->config_control;
-}
-
diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h
deleted file mode 100644
index 86f056477e..0000000000
--- a/addressbook/gui/component/autocompletion-config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion.
- *
- * Copyright (C) 2003 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Chris Toshok <toshok@ximian.com>
- */
-
-#ifndef _AUTOCOMPLETION_CONFIG_H
-#define _AUTOCOMPLETION_CONFIG_H
-
-#include "evolution-config-control.h"
-
-EvolutionConfigControl* autocompletion_config_control_new (void);
-
-#endif /* _AUTOCOMPLETION_CONFIG_H */
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
deleted file mode 100644
index 08bf146691..0000000000
--- a/addressbook/gui/component/component-factory.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c - Factory for Evolution's Addressbook component.
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook-config.h"
-#include "autocompletion-config.h"
-#include "eab-popup-control.h"
-#include "eab-vcard-control.h"
-#include "select-names/e-select-names-bonobo.h"
-#if HAVE_NSS
-#include "smime/gui/certificate-manager.h"
-#endif
-#include <bonobo/bonobo-shlib-factory.h>
-
-
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION
-
-#define VCARD_CONTROL_ID               "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
-#define ADDRESSBOOK_CONTROL_ID         "OAFIID:GNOME_Evolution_Addressbook_Control:" BASE_VERSION
-#define COMPONENT_ID                   "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION
-#define ADDRESS_POPUP_ID               "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION
-#define SELECT_NAMES_ID                "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
-#define LDAP_STORAGE_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION
-#define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION
-#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:" BASE_VERSION
-
-
-static BonoboObject *
-factory (BonoboGenericFactory *factory,
-	 const char *component_id,
-	 void *closure)
-{
-	printf ("asked to activate component_id `%s'\n", component_id);
-
-	if (strcmp (component_id, VCARD_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (eab_vcard_control_new ());
-	if (strcmp (component_id, ADDRESSBOOK_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (addressbook_new_control ());
-	if (strcmp (component_id, COMPONENT_ID) == 0) {
-		BonoboObject *object = BONOBO_OBJECT (addressbook_component_peek ());
-		bonobo_object_ref (object);
-		return object;
-	}
-	if (strcmp (component_id, ADDRESS_POPUP_ID) == 0)
-		return BONOBO_OBJECT (eab_popup_control_new ());
-	if (strcmp (component_id, COMPLETION_CONFIG_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (autocompletion_config_control_new ());
-#if 0
-	/* Config control is dead */
-	if (strcmp (component_id, LDAP_STORAGE_CONFIG_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (addressbook_config_control_new ());
-#endif
-	if (strcmp (component_id, SELECT_NAMES_ID) == 0)
-		return BONOBO_OBJECT (e_select_names_bonobo_new ());
-#if HAVE_NSS
-        if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0)
-                return BONOBO_OBJECT (certificate_manager_config_control_new ());
-#endif
-
-	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
-	return NULL;
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (FACTORY_ID, "Evolution Addressbook component factory", factory, NULL)
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
deleted file mode 100644
index 0683fe1f66..0000000000
--- a/addressbook/gui/component/ldap-config.glade
+++ /dev/null
@@ -1,2722 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="account-editor-window">
-  <property name="title" translatable="yes">Edit LDAP Server</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox37">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkNotebook" id="account-editor-notebook">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="account-editor-general-vbox">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox100">
-		  <property name="border_width">3</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">4</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label431">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Display name:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment45">
-		      <property name="visible">True</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0.9</property>
-		      <property name="yscale">1</property>
-
-		      <child>
-			<widget class="GtkEntry" id="account-editor-display-name-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="account-editor-general-ldap-vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label331">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">General</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="account-editor-connecting-vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label334">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Connecting</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="account-editor-searching-vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label344">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Searching</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator10">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox120">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox20">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkButton" id="account-editor-cancel-button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-cancel</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="account-editor-ok-button">
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-ok</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="account-druid-window">
-  <property name="title" translatable="yes">New Addressbook</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GnomeDruid" id="account-druid">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="show_help">False</property>
-
-      <child>
-	<widget class="GnomeDruidPageEdge" id="druidpagestart1">
-	  <property name="visible">True</property>
-	  <property name="position">GNOME_EDGE_START</property>
-	  <property name="title" translatable="yes">Addressbook Creation Assistant</property>
-	  <property name="text" translatable="yes">This assistant will help you create a new addressbook. 
-
-Depending on the type of addressbook you create, additional
-parameters may be required. Please contact your system
-administrator if you need help finding this information.</property>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GnomeDruidPageStandard" id="add-server-druid-folder-page">
-	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Step 1: Folder Characteristics</property>
-
-	  <child internal-child="vbox">
-	    <widget class="GtkVBox" id="druid-vbox6">
-	      <property name="border_width">16</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox21">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label198">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Specifying a display name and group is the first step in setting up an addressbook.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">3</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHSeparator" id="hseparator5">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table15">
-		      <property name="border_width">3</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">3</property>
-
-		      <child>
-			<widget class="GtkEntry" id="druid-display-name-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="has_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label199">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Display name:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">druid-display-name-entry</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label555">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Group:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="druid-group-option-menu">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">-1</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkNotebook" id="notebook15">
-		      <property name="visible">True</property>
-		      <property name="show_tabs">False</property>
-		      <property name="show_border">False</property>
-		      <property name="tab_pos">GTK_POS_TOP</property>
-		      <property name="scrollable">False</property>
-		      <property name="enable_popup">False</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label207">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">This is the name that will appear in your Evolution folder list. It is for display purposes only. </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="tab_expand">False</property>
-			  <property name="tab_fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label208">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">label163</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="type">tab</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label215">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Selecting this option will let you change Evolution's default settings for LDAP
-searches, and for creating and editing contacts. </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="tab_expand">False</property>
-			  <property name="tab_fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label210">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">label164</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="type">tab</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GnomeDruidPageStandard" id="add-server-druid-info-page">
-	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Step 2: Server Information</property>
-
-	  <child internal-child="vbox">
-	    <widget class="GtkVBox" id="druid-vbox1">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">3</property>
-
-	      <child>
-		<widget class="GtkVBox" id="account-druid-general-vbox">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label158">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">You have decided to configure an LDAP server. The first step in doing this is to provide its name and your
-log in information. Please ask your system administrator if you are unsure of this information.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">3</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHSeparator" id="hseparator2">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GnomeDruidPageStandard" id="add-server-druid-connecting-page">
-	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Step 3: Connecting to Server</property>
-
-	  <child internal-child="vbox">
-	    <widget class="GtkVBox" id="druid-vbox2">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">3</property>
-
-	      <child>
-		<widget class="GtkVBox" id="account-druid-connecting-vbox">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label174">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)
-and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect
-your connection. Ask your system administrator if your LDAP server uses these protocols.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">3</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHSeparator" id="hseparator3">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GnomeDruidPageStandard" id="add-server-druid-searching-page">
-	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Step 4: Searching the Directory</property>
-
-	  <child internal-child="vbox">
-	    <widget class="GtkVBox" id="vbox23">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">3</property>
-
-	      <child>
-		<widget class="GtkVBox" id="account-druid-searching-vbox">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label254">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">The options on this page control how many entries should be included in your
-searches, and how long a search should take. Ask your system administrator if you
-need to change these options.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHSeparator" id="hseparator7">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GnomeDruidPageEdge" id="add-server-druid-finish-page">
-	  <property name="visible">True</property>
-	  <property name="position">GNOME_EDGE_FINISH</property>
-	  <property name="title" translatable="yes">Finished</property>
-	  <property name="text" translatable="yes">Congratulations, you are finished setting up this addressbook.
-
-Please click the &quot;Finish&quot; button to save the settings you have entered here.</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="addressbook-sources-window">
-  <property name="title" translatable="yes">Addressbook Sources</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">355</property>
-  <property name="default_height">285</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="addressbook-sources-vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox27">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button104">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button105">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button106">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="addressbook-sources">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="Custom" id="sourcesTable">
-	      <property name="visible">True</property>
-	      <property name="creation_function">addressbook_dialog_create_sources_table</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Thu, 11 Apr 2002 00:31:02 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox73">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label529">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">
-</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVButtonBox" id="vbuttonbox18">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_START</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="addSource">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-add</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="editSource">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment64">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox121">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="Custom" id="custom1">
-				  <property name="visible">True</property>
-				  <property name="creation_function">e_create_image_widget</property>
-				  <property name="string1">stock-edit-24.png</property>
-				  <property name="int1">0</property>
-				  <property name="int2">0</property>
-				  <property name="last_modification_time">Fri, 25 Apr 2003 20:27:48 GMT</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label554">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Edit</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="deleteSource">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-remove</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="general-tab-window">
-  <property name="title" translatable="yes">general-tab</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="general-tab">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkTable" id="table36">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label534">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Server name:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">server-name-entry</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label535">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Log in method:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="server-name-entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment63">
-	      <property name="visible">True</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="auth-optionmenu">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget28">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget29">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Anonymously</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget30">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Using email address</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget31">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Using distinguished name (DN)</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkNotebook" id="auth-label-notebook">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="show_tabs">False</property>
-	      <property name="show_border">False</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label553">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Email address:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label546">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">label546</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label536">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Distinguished _name:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label547">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">label547</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkNotebook" id="auth-entry-notebook">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="show_tabs">False</property>
-	      <property name="show_border">False</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
-
-	      <child>
-		<widget class="GtkEntry" id="email-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label549">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">label549</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="dn-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label550">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">label550</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHSeparator" id="hseparator12">
-	      <property name="visible">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="general-tab-help">
-	  <property name="visible">True</property>
-	  <property name="show_tabs">False</property>
-	  <property name="show_border">False</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label537">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the full name of your ldap server. For example, &quot;ldap.mycompany.com&quot;.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label538">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label163</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label539">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Evolution will use this email address to authenticate you with the server</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label540">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label164</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label541">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Evolution will use this DN to authenticate you with the server</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label542">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label165</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label552">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the method evolution will use to authenticate you.  Note that setting this to &quot;Email Address&quot; requires anonymous access to your ldap server.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">True</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label551">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label551</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label544">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the name for this server that will appear in your Evolution folder list.
-It is for display purposes only. </property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label545">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label452</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="connecting-tab-window">
-  <property name="title" translatable="yes">connecting-tab</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="connecting-tab">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkTable" id="table14">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">2</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label175">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Port number:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment21">
-	      <property name="visible">True</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkCombo" id="port-combo">
-		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
-
-		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="entry27">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="has_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="convertwidget32">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget33">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget34">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">389</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget35">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget36">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">636</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget37">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget38">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">3268</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget39">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget40">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label176">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">U_se SSL/TLS:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment60">
-	      <property name="visible">True</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="ssl-optionmenu">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget41">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget42">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Always</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget43">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Whenever Possible</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget44">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Never</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="connecting-tab-help">
-	  <property name="visible">True</property>
-	  <property name="show_tabs">False</property>
-	  <property name="show_border">False</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label178">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the port on the LDAP server that Evolution will try to connect to. A 
-list of standard ports has been provided. Ask your system administrator
-what port you should specify.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label179">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label163</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label395">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Selecting this option means that Evolution will only connect to your LDAP server if
-your LDAP server supports SSL or TLS.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label398">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label398</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label399">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Selecting this option means that Evolution will only try to use SSL/TLS if you are in a 
-insecure environment. For example, if you and your LDAP server are behind a firewall
-at work, then Evolution doesn't need to use SSL/TLS because your connection is already
-secure.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label396">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label396</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label400">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Selecting this option means that your server does not support either SSL or TLS.  This 
-means that your connection will be insecure, and that you will be vulnerable to security
-exploits. </property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label397">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label397</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="searching-tab-window">
-  <property name="title" translatable="yes">searching-tab</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="searching-tab">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkTable" id="table30">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label455">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Search base:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label456">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">S_earch scope: </property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment49">
-	      <property name="visible">True</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">7.45058e-09</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="scope-optionmenu">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">0</property>
-
-		  <child internal-child="menu">
-		    <widget class="GtkMenu" id="convertwidget45">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget46">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">One</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenuItem" id="convertwidget47">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Sub</property>
-			  <property name="use_underline">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox109">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">3</property>
-
-	      <child>
-		<widget class="GtkEntry" id="rootdn-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="has_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="rootdn-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">  S_how Supported Bases </property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label457">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Timeout (minutes):</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">1</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment50">
-	      <property name="visible">True</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox110">
-		  <property name="border_width">3</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label458">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">1:00</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHScale" id="timeout-scale">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="draw_value">False</property>
-		      <property name="value_pos">GTK_POS_LEFT</property>
-		      <property name="digits">0</property>
-		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		      <property name="inverted">False</property>
-		      <property name="adjustment">3 1 5 0.5 1 0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label459">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">5:00</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">3</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label460">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Selected:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label461">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">2:30</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label462">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Download limit:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment51">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox111">
-		  <property name="border_width">3</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="download-limit-spinbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">100 0 10000 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label463">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">cards</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="searching-tab-help">
-	  <property name="visible">True</property>
-	  <property name="show_tabs">False</property>
-	  <property name="show_border">False</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label464">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The search base is the distinguished name (DN)  of the entry where your searches will 
-begin. If you leave this blank, the search will begin at the root of the directory tree.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label465">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label163</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label466">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The search scope defines how deep you would like the search to extend down the 
-directory tree. A search scope of &quot;sub&quot; will include all entries below your search base.
-A search scope of &quot;one&quot; will only include the entries one level beneath your base.
-</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label467">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label164</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label468">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This option controls how long a search will be run.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label469">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label165</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label470">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the maximum number of entries to download. Setting this number to be 
-too large will slow down your addressbook.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">7.45058e-09</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label471">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label166</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="supported-bases-dialog">
-  <property name="title" translatable="yes">Supported Search Bases</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">300</property>
-  <property name="default_height">200</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox5">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area5">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button107">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button109">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="Custom" id="supported-bases-table">
-	  <property name="visible">True</property>
-	  <property name="creation_function">supported_bases_create_table</property>
-	  <property name="int1">0</property>
-	  <property name="int2">0</property>
-	  <property name="last_modification_time">Fri, 12 Apr 2002 20:06:45 GMT</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index 1520453f86..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,15 +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*.server
-GNOME_Evolution_Addressbook_SelectNames*.server.in
-e-select-names-marshal.c
-e-select-names-marshal.h
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
deleted file mode 100644
index 6feb6b54bb..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-
-	interface 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.server.in.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
deleted file mode 100644
index 0a9f975463..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
+++ /dev/null
@@ -1,31 +0,0 @@
-<oaf_info>
-
-<!--
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR@/libevolution-addressbook.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook name selection interface"/>
-
-</oaf_server>
--->
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook name selection interface"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
deleted file mode 100644
index b64cf31689..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-# CORBA stuff
-
-idl_DATA = \
-	Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED_H = 					\
-	Evolution-Addressbook-SelectNames.h
-IDL_GENERATED_C = 					\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c
-IDL_GENERATED = $(IDL_GENERATED_C) $(IDL_GENERATED_H)
-
-$(IDL_GENERATED_H): $(idl_DATA)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
-		$(srcdir)/Evolution-Addressbook-SelectNames.idl
-$(IDL_GENERATED_C): $(IDL_GENERATED_H)
-
-server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-privlib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
-	e-select-names-bonobo.c			\
-	e-select-names-bonobo.h			\
-	e-select-names-completion.c		\
-	e-select-names-completion.h		\
-	e-select-names-config.c			\
-	e-select-names-config.h			\
-	e-select-names-config-keys.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
-
-libeselectnames_la_LIBADD =					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-# We'll need these again when we split out the select names control
-# into its own shlib factory, but for now they're redundant.
-#
-#	e-select-names-factory.c
-#	e-select-names-factory.h
-
-MARSHAL_GENERATED = e-select-names-marshal.c e-select-names-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA = select-names.glade
-etspec_DATA = e-select-names.etspec e-select-names-section.etspec
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(server_in_files)	\
-	$(idl_DATA)		\
-	$(etspec_DATA)		\
-	e-select-names-marshal.list
-
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
-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 1977abe95f..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-select-names-bonobo.h"
-
-#include <bonobo-activation/bonobo-activation-activate.h>
-
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-event-source.h>
-#include <bonobo/bonobo-ui-util.h>
-
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-entry.h>
-#include <gal/util/e-text-event-processor.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names-completion.h"
-
-#include <string.h>
-
-
-#define PARENT_TYPE BONOBO_TYPE_OBJECT
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-	BonoboEventSource *event_source;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT,
-	ENTRY_PROPERTY_ID_ADDRESSES,
-	ENTRY_PROPERTY_ID_DESTINATIONS,
-	ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,
-	ENTRY_PROPERTY_ID_ENTRY_CHANGED
-};
-typedef enum _EntryPropertyID EntryPropertyID;
-
-
-/* PropertyBag implementation for the entry widgets.  */
-
-static void
-entry_get_property_fn (BonoboPropertyBag *bag,
-		       BonoboArg *arg,
-		       unsigned int arg_id,
-		       CORBA_Environment *ev,
-		       void *user_data)
-{
-	GtkWidget *w;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ETextModel *text_model;
-			text_model = E_TEXT_MODEL (g_object_get_data (G_OBJECT (w), "select_names_text_model"));
-			g_assert (text_model != NULL);
-			
-			BONOBO_ARG_SET_STRING (arg, e_text_model_get_text (text_model));
-		break;
-		}
-
-	case ENTRY_PROPERTY_ID_ADDRESSES:
-		{
-			ESelectNamesModel *model;
-			char *text;
-
-			model = E_SELECT_NAMES_MODEL (g_object_get_data (G_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			text = e_select_names_model_get_address_text (model, ", ");
-			BONOBO_ARG_SET_STRING (arg, text);
-			g_free (text);
-		}
-		break;
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			char *text;
-
-			model = E_SELECT_NAMES_MODEL (g_object_get_data (G_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			text = e_select_names_model_export_destinationv (model);
-			BONOBO_ARG_SET_STRING (arg, text);
-			g_free (text);
-		}
-		break;
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (g_object_get_data (G_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			BONOBO_ARG_SET_BOOLEAN (arg, e_select_names_completion_get_match_contact_lists (comp));
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		/* This is a read-only property. */
-		g_assert_not_reached ();
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       CORBA_Environment *ev,
-		       gpointer user_data)
-{
-	GtkWidget *w;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ENTRY_PROPERTY_ID_TEXT:
-	case ENTRY_PROPERTY_ID_ADDRESSES:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (g_object_get_data (G_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-			
-			e_entry_set_text (E_ENTRY (w), BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_load_all_contacts (model, NULL);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (g_object_get_data (G_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			e_select_names_model_import_destinationv (model, BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_load_all_contacts (model, NULL);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (g_object_get_data (G_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			e_select_names_completion_set_match_contact_lists (comp, BONOBO_ARG_GET_BOOLEAN (arg));
-			break;
-		}
-		
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		g_object_set_data (G_OBJECT (w), "entry_property_id_changed", GUINT_TO_POINTER (1));
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-impl_SelectNames_add_section (PortableServer_Servant servant,
-			      const CORBA_char *id,
-			      const CORBA_char *title,
-			      CORBA_Environment *ev)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object (servant));
-	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)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object (servant));
-	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 (g_object_get_data (G_OBJECT (widget), "entry_property_id_changed"));
-
-	if (!changed)
-		bonobo_control_set_property (control, NULL, "entry_changed", TC_CORBA_boolean, TRUE, NULL);
-}
-
-static void
-manager_changed_cb (ESelectNamesManager *manager, const gchar *section_id, gint changed_working_copy, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	BONOBO_ARG_SET_STRING (arg, section_id);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "changed",
-						   changed_working_copy ? "working_copy" : "model",
-						   arg, NULL);
-
-	bonobo_arg_release (arg);
-}
-
-static void
-manager_ok_cb (ESelectNamesManager *manager, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_NULL);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "ok",
-						   "dialog",
-						   arg,
-						   NULL);
-
-	bonobo_arg_release (arg);
-}
-
-static void
-copy_cb (BonoboUIComponent *ui, gpointer user_data, const char *command)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_text_copy_clipboard (entry->item);
-}
-
-static void
-cut_cb (BonoboUIComponent *ui, gpointer user_data, const char *command)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_text_cut_clipboard (entry->item);
-}
-
-static void
-paste_cb (BonoboUIComponent *ui, gpointer user_data, const char *command)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_text_paste_clipboard (entry->item);
-}
-
-static void
-select_all_cb (BonoboUIComponent *ui, gpointer user_data, const char *command)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_text_select_all (entry->item);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("EditCut", cut_cb),
-	BONOBO_UI_VERB ("EditCopy", copy_cb),
-	BONOBO_UI_VERB ("EditPaste", paste_cb),
-	BONOBO_UI_VERB ("EditSelectAll", select_all_cb),
-	BONOBO_UI_VERB_END
-};
-
-typedef struct {
-	GtkWidget *widget;
-	BonoboControl *control;
-	Bonobo_UIContainer remote_ui_container;
-	char *ui_xml_path;
-	char *app_name;
-	BonoboUIVerb *verbs;
-	gpointer user_data;
-} ControlUIClosure;
-
-static void
-free_closure (ControlUIClosure *closure,
-	      GtkObject *where_object_was)
-{
-	bonobo_object_release_unref (closure->remote_ui_container, NULL);
-	g_free (closure->ui_xml_path);
-	g_free (closure->app_name);
-	g_free (closure);
-}
-
-static void
-merge_menu_items (BonoboControl *control, BonoboUIComponent *uic, ControlUIClosure *closure)
-{
-	if (closure->remote_ui_container) {
-		bonobo_ui_component_set_container (uic, closure->remote_ui_container, NULL);
-
-		bonobo_ui_component_add_verb_list_with_data (uic, closure->verbs, closure->user_data);
-
-		bonobo_ui_component_freeze (uic, NULL);
-
-		bonobo_ui_util_set_ui (uic, PREFIX,
-				       closure->ui_xml_path,
-				       closure->app_name, NULL);
-
-		bonobo_ui_component_thaw (uic, NULL);
-	}
-}
-
-static void
-unmerge_menu_items (BonoboControl *control, BonoboUIComponent *uic, ControlUIClosure *closure)
-{
-	bonobo_ui_component_unset_container (uic, NULL);
-}
-
-static void
-control_set_frame_cb (BonoboControl *control,
-		      ControlUIClosure *closure)
-{
-	Bonobo_ControlFrame frame = bonobo_control_get_control_frame (control,
-								      NULL);
-	if (!frame)
-		return;
-	closure->remote_ui_container = bonobo_control_get_remote_ui_container (control, NULL);
-}
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate, 
-		     ControlUIClosure *closure)
-{
-	if (activate)
-		gtk_widget_grab_focus (closure->widget); /* the ECanvas */
-}
-
-static gboolean
-widget_focus_cb (GtkWidget *w, GdkEventFocus *focus, ControlUIClosure *closure)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (closure->control);
-
-	if (GTK_WIDGET_HAS_FOCUS (w)) {
-		merge_menu_items (closure->control, uic, closure);
-	} else {
-		unmerge_menu_items (closure->control, uic, closure);
-	}
-
-	return FALSE;
-}
-
-static void
-e_bonobo_control_automerge_ui (GtkWidget *w,
-			       BonoboControl *control,
-			       const char *ui_xml_path,
-			       const char *app_name,
-			       BonoboUIVerb *verbs,
-			       gpointer data)
-{
-	ControlUIClosure *closure;
-
-	g_return_if_fail (GTK_IS_WIDGET (w));
-	g_return_if_fail (BONOBO_IS_CONTROL (control));
-	g_return_if_fail (ui_xml_path != NULL);
-	g_return_if_fail (app_name != NULL);
-	g_return_if_fail (verbs != NULL);
-	
-	closure = g_new (ControlUIClosure, 1);
-
-	closure->widget = w;
-	closure->control = control;
-	closure->ui_xml_path = g_strdup (ui_xml_path);
-	closure->app_name = g_strdup (app_name);
-	closure->verbs = verbs;
-	closure->user_data = data;
-
-	g_signal_connect (w, "focus_in_event",
-			  G_CALLBACK (widget_focus_cb), closure);
-	g_signal_connect (w, "focus_out_event",
-			  G_CALLBACK (widget_focus_cb), closure);
-	g_signal_connect (control, "activate",
-			  G_CALLBACK (control_activate_cb), closure);
-	g_signal_connect (control, "set_frame",
-			  G_CALLBACK (control_set_frame_cb), closure);
-
-	g_object_weak_ref (G_OBJECT (control), (GWeakNotify)free_closure, closure);
-}
-
-static Bonobo_Control
-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
-					const CORBA_char *section_id,
-					CORBA_Environment *ev)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-	GtkWidget *entry_widget;
-	BonoboControl *control;
-	BonoboPropertyBag *property_bag;
-
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object (servant));
-	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, "addresses", ENTRY_PROPERTY_ID_ADDRESSES,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "destinations", ENTRY_PROPERTY_ID_DESTINATIONS,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "allow_contact_lists", ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "entry_changed", ENTRY_PROPERTY_ID_ENTRY_CHANGED,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (property_bag)), NULL);
-	bonobo_object_unref (BONOBO_OBJECT (property_bag));
-
-	g_signal_connect (entry_widget, "changed", G_CALLBACK (entry_changed), control);
-
-	e_bonobo_control_automerge_ui (GTK_WIDGET (E_ENTRY (entry_widget)->canvas),
-				       control,
-				       EVOLUTION_UIDIR "/evolution-composer-entries.xml",
-				       "evolution-addressbook",
-				       verbs, entry_widget);
-
-	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)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object (servant));
-	priv = select_names->priv;
-
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (object);
-	priv = select_names->priv;
-
-	if (priv) {
-		if (priv->manager->names) {
-			gtk_widget_destroy (GTK_WIDGET (priv->manager->names));
-			priv->manager->names = NULL;
-		}
-
-		g_object_unref (priv->manager);
-
-		g_free (priv);
-		select_names->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-
-static void
-e_select_names_bonobo_class_init (ESelectNamesBonoboClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;
-
-	object_class = G_OBJECT_CLASS (klass);
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = impl_dispose;
-
-	epv = &klass->epv;
-	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;
-}
-
-static void
-e_select_names_bonobo_init (ESelectNamesBonobo *select_names)
-{
-	ESelectNamesBonoboPrivate *priv;
-
-	priv = g_new (ESelectNamesBonoboPrivate, 1);
-
-	priv->manager = e_select_names_manager_new ();
-	priv->event_source = NULL;
-
-	g_signal_connect (priv->manager,
-			  "changed",
-			  G_CALLBACK (manager_changed_cb),
-			  select_names);
-
-	g_signal_connect (priv->manager,
-			  "ok",
-			  G_CALLBACK (manager_ok_cb),
-			  select_names);
-	
-	select_names->priv = priv;
-}
-
-
-static void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names)
-{
-	g_return_if_fail (select_names != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
-
-	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)
-{
-	ESelectNamesBonobo *select_names;
-
-	select_names = g_object_new (E_TYPE_SELECT_NAMES_BONOBO, NULL);
-
-	e_select_names_bonobo_construct (select_names);
-
-	return select_names;
-}
-
-
-BONOBO_TYPE_FUNC_FULL (
-		       ESelectNamesBonobo,
-		       GNOME_Evolution_Addressbook_SelectNames,
-		       PARENT_TYPE,
-		       e_select_names_bonobo);
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 5b04ed5b2e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(G_TYPE_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;
-
-	POA_GNOME_Evolution_Addressbook_SelectNames__epv epv;
-};
-
-
-GType               e_select_names_bonobo_get_type   (void);
-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 39b5f7a008..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,1231 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include "e-select-names-completion.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include <gtk/gtksignal.h>
-
-#include <libebook/e-contact.h>
-#include <addressbook/util/eab-book-util.h>
-#include <addressbook/util/eab-destination.h>
-#include <addressbook/gui/merging/eab-contact-compare.h>
-
-typedef struct {
-	EBook *book;
-	guint book_view_tag;
-	EBookView *book_view;
-	ESelectNamesCompletion *comp;
-	guint contacts_added_tag;
-	guint seq_complete_tag;
-	gboolean sequence_complete_received;
-
-	gchar *cached_query_text;
-	GList *cached_cards;
-	gboolean cache_complete;
-
-} ESelectNamesCompletionBookData;
-
-struct _ESelectNamesCompletionPrivate {
-
-	ESelectNamesTextModel *text_model;
-
-	GList *book_data;
-	gint books_not_ready;
-	gint pending_completion_seq;
-
-	gchar *waiting_query;
-	gint waiting_pos, waiting_limit;
-	gchar *query_text;
-
-	gboolean match_contact_lists;
-
-	gint minimum_query_length;
-};
-
-static void e_select_names_completion_class_init (ESelectNamesCompletionClass *);
-static void e_select_names_completion_init (ESelectNamesCompletion *);
-static void e_select_names_completion_dispose (GObject *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_contacts_added_cb    (EBookView *, const GList *cards, gpointer user_data);
-static void e_select_names_completion_seq_complete_cb  (EBookView *, EBookViewStatus status, gpointer user_data);
-
-static void e_select_names_completion_do_query (ESelectNamesCompletion *, const gchar *query_text, gint pos, gint limit);
-
-static void e_select_names_completion_handle_request  (ECompletion *, const gchar *txt, gint pos, gint limit);
-static void e_select_names_completion_end    (ECompletion *);
-
-static GObjectClass *parent_class;
-
-static FILE *out;
-
-/*
- *
- * Query builders
- *
- */
-
-typedef gchar *(*BookQuerySExp) (ESelectNamesCompletion *);
-typedef ECompletionMatch *(*BookQueryMatchTester) (ESelectNamesCompletion *, EABDestination *);
-
-static int
-utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len)
-{
-	gchar *s1 = g_utf8_casefold(str1, len);
-	gchar *s2 = g_utf8_casefold(str2, len);
-	int rv;
-
-	rv = g_utf8_collate (s1, s2);
-
-	g_free (s1);
-	g_free (s2);
-
-	return rv;
-}
-
-static int
-utf8_casefold_collate (const gchar *str1, const gchar *str2)
-{
-	return utf8_casefold_collate_len (str1, str2, -1);
-}
-
-static void
-our_match_destroy (ECompletionMatch *match)
-{
-	g_object_unref (match->user_data);
-}
-
-static ECompletionMatch *
-make_match (EABDestination *dest, const gchar *menu_form, double score)
-{
-	ECompletionMatch *match;
-#if notyet
-	EContact *contact = eab_destination_get_contact (dest);
-#endif
-
-	match = e_completion_match_new (eab_destination_get_name (dest), menu_form, score);
-
-	e_completion_match_set_text (match, eab_destination_get_name (dest), menu_form);
-
-	/* Reject any match that has null text fields. */
-	if (! (e_completion_match_get_match_text (match) && e_completion_match_get_menu_text (match))) {
-		g_object_unref (match);
-		return NULL;
-	}
-
-#if notyet
-	/* XXX toshok - EContact doesn't have the use_score stuff */
-	/* Since we sort low to high, we negate so that larger use scores will come first */
-	match->sort_major = contact ? -floor (e_contact_get_use_score (contact)) : 0;
-#else
-	match->sort_major = 0;
-#endif
-
-	match->sort_minor = eab_destination_get_email_num (dest);
-
-	match->user_data = dest;
-	g_object_ref (dest);
-
-	match->destroy = our_match_destroy;
-
-	return match;
-}
-
-/*
- * Nickname query
- */
-
-static gchar *
-sexp_nickname (ESelectNamesCompletion *comp)
-{
-	gchar *query = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp->priv->query_text);
-
-	return query;
-}
-
-static ECompletionMatch *
-match_nickname (ESelectNamesCompletion *comp, EABDestination *dest)
-{
-	ECompletionMatch *match = NULL;
-	gint len;
-	EContact *contact = eab_destination_get_contact (dest);
-	double score;
-	const char *nickname;
-
-	nickname = e_contact_get_const (contact, E_CONTACT_NICKNAME);
-	if (nickname == NULL)
-		return NULL;
-
-	len = g_utf8_strlen (comp->priv->query_text, -1);
-	if (nickname && !utf8_casefold_collate_len (comp->priv->query_text, nickname, len)) {
-		const gchar *name;
-		gchar *str;
-
-		score = len * 2; /* nickname gives 2 points per matching character */
-
-		if (len == g_utf8_strlen (nickname, -1)) /* boost score on an exact match */
-		    score *= 10;
-
-		name = eab_destination_get_name (dest);
-		if (name && *name)
-			str = g_strdup_printf ("'%s' %s <%s>", nickname, name, eab_destination_get_email (dest));
-		else
-			str = g_strdup_printf ("'%s' <%s>", nickname, eab_destination_get_email (dest));
-
-		match = make_match (dest, str, score);
-		g_free (str);
-	}
-
-	return match;
-}
-
-/*
- * E-Mail Query
- */
-
-static gchar *
-sexp_email (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"email\" \"%s\")", comp->priv->query_text);
-}
-
-static ECompletionMatch *
-match_email (ESelectNamesCompletion *comp, EABDestination *dest)
-{
-	ECompletionMatch *match;
-	gint len = strlen (comp->priv->query_text);
-	const gchar *name = eab_destination_get_name (dest);
-	const gchar *email = eab_destination_get_email (dest);
-	double score;
-	
-	if (email
-	    && !utf8_casefold_collate_len (comp->priv->query_text, email, len)
-	    && !eab_destination_is_evolution_list (dest)) {
-		
-		gchar *str;
-		
-		score = len * 2; /* 2 points for each matching character */
-
-		if (name && *name)
-			str = g_strdup_printf ("<%s> %s", email, name);
-		else
-			str = g_strdup (email);
-
-		match = make_match (dest, str, score);
-
-		g_free (str);
-
-		return match;
-	}
-
-	return NULL;
-}
-
-/*
- * Name Query
- */
-
-static gchar *
-name_style_query (ESelectNamesCompletion *comp, const gchar *field)
-{
-	if (comp && comp->priv->query_text && *comp->priv->query_text) {
-		gchar *cpy = g_strdup (comp->priv->query_text), *c;
-		gchar **strv;
-		gchar *query;
-		gint i, count=0;
-
-		for (c = cpy; *c; ++c) {
-			if (*c == ',')
-				*c = ' ';
-		}
-
-		strv = g_strsplit (cpy, " ", 0);
-		for (i=0; strv[i]; ++i) {
-			gchar *old;
-			++count;
-			g_strstrip (strv[i]);
-			old = strv[i];
-			strv[i] = g_strdup_printf ("(beginswith \"%s\" \"%s\")", field, old);
-			g_free (old);
-		}
-
-		if (count == 1) {
-			query = strv[0];
-			strv[0] = NULL;
-		} else {
-			gchar *joined = g_strjoinv (" ", strv);
-			query = g_strdup_printf ("(and %s)", joined);
-			g_free (joined);
-		}
-
-		g_free (cpy);
-		g_strfreev (strv);
-
-		return query;
-	}
-
-	return NULL;
-}
-
-static gchar *
-sexp_name (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "full_name");
-}
-
-static ECompletionMatch *
-match_name (ESelectNamesCompletion *comp, EABDestination *dest)
-{
-	ECompletionMatch *final_match = NULL;
-	gchar *menu_text = NULL;
-	EContact *contact;
-	const gchar *email;
-	gint match_len = 0;
-	EABContactMatchType match;
-	EABContactMatchPart first_match;
-	double score = 0;
-	gboolean have_given, have_additional, have_family;
-	EContactName *contact_name;
-
-	contact = eab_destination_get_contact (dest);
-
-	contact_name = e_contact_get (contact, E_CONTACT_NAME);
-	if (!contact_name)
-		return NULL;
-
-	email = eab_destination_get_email (dest);
-
-	match = eab_contact_compare_name_to_string_full (contact, comp->priv->query_text, TRUE /* yes, allow partial matches */,
-							 NULL, &first_match, &match_len);
-
-	if (match <= EAB_CONTACT_MATCH_NONE) {
-		e_contact_name_free (contact_name);
-		return NULL;
-	}
-
-	score = match_len * 3; /* three points per match character */
-
-	have_given       = contact_name->given && *contact_name->given;
-	have_additional  = contact_name->additional && *contact_name->additional;
-	have_family      = contact_name->family && *contact_name->family;
-
-	if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-
-		menu_text = e_contact_name_to_string (contact_name);
-
-	} else if (first_match == EAB_CONTACT_MATCH_PART_GIVEN_NAME) {
-
-		if (have_family)
-			menu_text = g_strdup_printf ("%s %s <%s>", contact_name->given, contact_name->family, email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", contact_name->given, email);
-
-	} else if (first_match == EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME) {
-
-		if (have_given) {
-
-			menu_text = g_strdup_printf ("%s%s%s, %s <%s>",
-						     contact_name->additional,
-						     have_family ? " " : "",
-						     have_family ? contact_name->family : "",
-						     contact_name->given,
-						     email);
-		} else {
-
-			menu_text = g_strdup_printf ("%s%s%s <%s>",
-						     contact_name->additional,
-						     have_family ? " " : "",
-						     have_family ? contact_name->family : "",
-						     email);
-		}
-
-	} else if (first_match == EAB_CONTACT_MATCH_PART_FAMILY_NAME) { 
-
-		if (have_given)
-			menu_text = g_strdup_printf ("%s, %s%s%s <%s>",
-						     contact_name->family,
-						     contact_name->given,
-						     have_additional ? " " : "",
-						     have_additional ? contact_name->additional : "",
-						     email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", contact_name->family, email);
-
-	} else { /* something funny happened */
-
-		menu_text = g_strdup_printf ("<%s> ???", email);
-
-	}
-
-	if (menu_text) {
-		g_strstrip (menu_text);
-		final_match = make_match (dest, menu_text, score);
-		g_free (menu_text);
-	}
-	
-	e_contact_name_free (contact_name);
-
-	return final_match;
-}
-
-/*
- * File As Query
- */
-
-static gchar *
-sexp_file_as (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "file_as");
-}
-
-static ECompletionMatch *
-match_file_as (ESelectNamesCompletion *comp, EABDestination *dest)
-{
-	const gchar *name;
-	const gchar *email;
-	gchar *cpy, **strv, *menu_text;
-	gint i, len;
-	double score = 0.00001;
-	ECompletionMatch *match;
-
-	name = eab_destination_get_name (dest);
-	email = eab_destination_get_email (dest);
-
-	if (!(name && *name))
-		return NULL;
-
-	cpy = g_strdup (comp->priv->query_text);
-	strv = g_strsplit (cpy, " ", 0);
-
-	for (i=0; strv[i] && score > 0; ++i) {
-		len = g_utf8_strlen (strv[i], -1);
-		if (!utf8_casefold_collate_len (name, strv[i], len))
-			score += len; /* one point per character of the match */
-		else
-			score = 0;
-	}
-	
-	g_free (cpy);
-	g_strfreev (strv);
-
-	if (score <= 0)
-		return NULL;
-	
-	menu_text = g_strdup_printf ("%s <%s>", name, email);
-	g_strstrip (menu_text);
-	match = make_match (dest, menu_text, score);
-	g_free (menu_text);
-
-	return match;
-}
-
-typedef struct _BookQuery BookQuery;
-struct _BookQuery {
-	BookQuerySExp builder;
-	BookQueryMatchTester tester;
-};
-
-static BookQuery book_queries[] = {
-	{ sexp_nickname, match_nickname},
-	{ sexp_email,    match_email },
-	{ sexp_name,     match_name },
-	{ sexp_file_as,  match_file_as },
-};
-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;
-	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;
-
-	queryv = g_new0 (gchar *, book_query_count+1);
-	for (i=0, j=0; i<book_query_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<book_query_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, EABDestination *dest)
-{
-	ECompletionMatch *best_match = NULL;
-	gint i;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-	
-	for (i=0; i<book_query_count; ++i) {
-
-		ECompletionMatch *this_match = NULL;
-
-		if (book_queries[i].tester && eab_destination_get_contact (dest)) {
-			this_match = book_queries[i].tester (comp, dest);
-		}
-
-		if (this_match) {
-			if (best_match == NULL || this_match->score > best_match->score) {
-				e_completion_match_unref (best_match);
-				best_match = this_match;
-			} else {
-				e_completion_match_unref (this_match);
-			}
-		}
-	}
-
-	return best_match;
-}
-
-static void
-book_query_process_card_list (ESelectNamesCompletion *comp, const GList *contacts)
-{
-	while (contacts) {
-		EContact *contact = E_CONTACT (contacts->data);
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-
-			if (comp->priv->match_contact_lists) {
-
-				EABDestination *dest = eab_destination_new ();
-				ECompletionMatch *match;
-				eab_destination_set_contact (dest, contact, 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);
-				}
-				g_object_unref (dest);
-
-			}
-
-		}
-		else {
-			GList *email = e_contact_get (contact, E_CONTACT_EMAIL);
-			if (email) {
-				GList *iter;
-				gint i;
-				for (i=0, iter = email; iter; ++i, iter = iter->next) {
-					EABDestination *dest = eab_destination_new ();
-					gchar *e;
-					ECompletionMatch *match;
-				
-					eab_destination_set_contact (dest, contact, i);
-					e = iter->data;
-
-					if (e && *e) {
-				
-						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);
-						}
-					}
-
-					g_object_unref (dest);
-				}
-			}
-			g_list_foreach (email, (GFunc)g_free, NULL);
-			g_list_free (email);
-		}
-		
-		contacts = contacts->next;
-	}
-}
-
-/*
- *
- * ESelectNamesCompletion code
- *
- */
-
-
-GType
-e_select_names_completion_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ESelectNamesCompletionClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_completion_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNamesCompletion),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_completion_init,
-		};
-
-		type = g_type_register_static (e_completion_get_type (), "ESelectNamesCompletion", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_completion_class_init (ESelectNamesCompletionClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ECompletionClass *completion_class = E_COMPLETION_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_select_names_completion_dispose;
-
-	completion_class->request_completion = e_select_names_completion_handle_request;
-	completion_class->end_completion = e_select_names_completion_end;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_COMPLETION")) {
-		out = fopen ("/tmp/evo-debug-select-names-completion", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-e_select_names_completion_init (ESelectNamesCompletion *comp)
-{
-	comp->priv = g_new0 (struct _ESelectNamesCompletionPrivate, 1);
-	comp->priv->match_contact_lists = TRUE;
-}
-
-static void
-e_select_names_completion_clear_book_data (ESelectNamesCompletion *comp)
-{
-	GList *l;
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-
-		if (book_data->contacts_added_tag) {
-			g_signal_handler_disconnect (book_data->book_view, book_data->contacts_added_tag);
-			book_data->contacts_added_tag = 0;
-		}
-
-		if (book_data->seq_complete_tag) {
-			g_signal_handler_disconnect (book_data->book_view, book_data->seq_complete_tag);
-			book_data->seq_complete_tag = 0;
-		}
-
-		g_object_unref (book_data->book);
-
-		if (book_data->book_view) {
-			e_book_view_stop (book_data->book_view);
-			g_object_unref (book_data->book_view);
-		}
-
-		g_free (book_data->cached_query_text);
-		g_list_foreach (book_data->cached_cards, (GFunc)g_object_unref, NULL);
-		g_list_free (book_data->cached_cards);
-
-		g_free (book_data);
-	}
-	g_list_free (comp->priv->book_data);
-	comp->priv->book_data = NULL;
-}
-
-static void
-e_select_names_completion_dispose (GObject *object)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);
-
-	if (comp->priv) {
-		if (comp->priv->text_model)
-			g_object_unref (comp->priv->text_model);
-
-		e_select_names_completion_clear_book_data (comp);
-
-		g_free (comp->priv->waiting_query);
-		g_free (comp->priv->query_text);
-
-		g_free (comp->priv);
-		comp->priv = NULL;
-	}
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-
-/*
- *
- *  EBook/EBookView Callbacks & Query Stuff
- *
- */
-
-static gchar *
-clean_query_text (const gchar *s)
-{
-	gchar *q = g_new (gchar, strlen(s)+1), *t;
-
-	t = q;
-	while (*s) {
-		if (*s != ',' && *s != '"') {
-			*t = *s;
-			++t;
-		}
-		++s;
-	}
-	*t = '\0';
-
-	g_strstrip (q);
-
-	return q;
-}
-
-static void
-e_select_names_completion_clear_cache (ESelectNamesCompletionBookData *book_data)
-{
-	if (out)
-		fprintf (out, "** clearing cache on book %s\n", e_book_get_uri (book_data->book));
-
-	g_free (book_data->cached_query_text);
-	g_list_foreach (book_data->cached_cards, (GFunc)g_object_unref, NULL);
-	g_list_free (book_data->cached_cards);
-
-	book_data->cached_query_text = NULL;
-	book_data->cached_cards = NULL;
-}
-
-static void
-e_select_names_completion_done (ESelectNamesCompletion *comp)
-{
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	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_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data)
-{
-	ESelectNamesCompletion *comp;
-	ESelectNamesCompletionBookData *book_data;
-
-	book_data = (ESelectNamesCompletionBookData*)user_data;
-	comp = book_data->comp;
-
-	if (status != E_BOOK_ERROR_OK) {
-		comp->priv->pending_completion_seq--;
-		if (!comp->priv->pending_completion_seq)
-			e_select_names_completion_done (comp);
-		return;
-	}
-
-	book_data->book_view_tag = 0;
-
-	if (book_data->contacts_added_tag) {
-		g_signal_handler_disconnect (book_data->book_view, book_data->contacts_added_tag);
-		book_data->contacts_added_tag = 0;
-	}
-	if (book_data->seq_complete_tag) {
-		g_signal_handler_disconnect (book_data->book_view, book_data->seq_complete_tag);
-		book_data->seq_complete_tag = 0;
-	}
-
-	g_object_ref (view);
-	if (book_data->book_view) {
-		e_book_view_stop (book_data->book_view);
-		g_object_unref (book_data->book_view);
-	}
-	book_data->book_view = view;
-
-	book_data->contacts_added_tag = 
-		g_signal_connect (view,
-				  "contacts_added",
-				  G_CALLBACK (e_select_names_completion_contacts_added_cb),
-				  book_data);
-
-	book_data->seq_complete_tag =
-		g_signal_connect (view,
-				  "sequence_complete",
-				  G_CALLBACK (e_select_names_completion_seq_complete_cb),
-				  book_data);
-
-	e_book_view_start (view);
-
-	book_data->sequence_complete_received = FALSE;
-}
-
-static void
-e_select_names_completion_contacts_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = book_data->comp;
-
-	if (e_completion_searching (E_COMPLETION (comp))) {
-		book_query_process_card_list (comp, cards);
-
-		/* Save the list of matching cards. */
-		while (cards) {
-			book_data->cached_cards = g_list_prepend (book_data->cached_cards, cards->data);
-			g_object_ref (cards->data);
-			cards = g_list_next (cards);
-		}
-	}
-}
-
-static void
-e_select_names_completion_seq_complete_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = book_data->comp;
-
-	if (out)
-		fprintf (out, "** got sequence_complete (status = %d) on book %s\n", status, e_book_get_uri (book_data->book));
-
-	/*
-	 * We aren't searching, but the addressbook has changed -- clear our card cache so that
-	 * future completion requests will take the changes into account.
-	 */
-	if (! e_completion_searching (E_COMPLETION (comp))) {
-		if (out)
-			fprintf (out, "\t we weren't searching, clearing the cache\n");
-		e_select_names_completion_clear_cache (book_data);
-		return;
-	}
-
-	if (book_data->cached_query_text
-	    && status == E_BOOK_ERROR_OK
-	    && !book_data->cache_complete
-	    && !strcmp (book_data->cached_query_text, comp->priv->query_text))
-		book_data->cache_complete = TRUE;
-
-	if (out)
-		fprintf (out, "\tending search, book_data->cache_complete == %d\n", book_data->cache_complete);
-
-	if (!book_data->sequence_complete_received) {
-		book_data->sequence_complete_received = TRUE;
-
-		if (book_data->contacts_added_tag) {
-			g_signal_handler_disconnect (book_data->book_view, book_data->contacts_added_tag);
-			book_data->contacts_added_tag = 0;
-		}
-		if (book_data->seq_complete_tag) {
-			g_signal_handler_disconnect (book_data->book_view, book_data->seq_complete_tag);
-			book_data->seq_complete_tag = 0;
-		}
-
-		if (out)
-			fprintf (out, "\t %d remaining book view's\n", comp->priv->pending_completion_seq - 1);
-
-		comp->priv->pending_completion_seq --;
-		if (comp->priv->pending_completion_seq > 0)
-			return;
-	}
-
-	e_select_names_completion_done (comp);
-}
-
-static void
-e_select_names_completion_stop_query (ESelectNamesCompletion *comp)
-{
-	GList *l;
-
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "stopping query\n");
-
-	if (comp->priv->waiting_query) {
-		if (out)
-			fprintf (out, "stopped waiting query\n");
-		g_free (comp->priv->waiting_query);
-		comp->priv->waiting_query = NULL;
-	}
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-		if (book_data->book_view_tag) {
-#if notyet
-			e_book_cancel (book_data->book, book_data->book_view_tag);
-#endif
-			book_data->book_view_tag = 0;
-		}
-		if (book_data->book_view) {
-			if (book_data->contacts_added_tag) {
-				g_signal_handler_disconnect (book_data->book_view, book_data->contacts_added_tag);
-				book_data->contacts_added_tag = 0;
-			}
-			if (book_data->seq_complete_tag) {
-				g_signal_handler_disconnect (book_data->book_view, book_data->seq_complete_tag);
-				book_data->seq_complete_tag = 0;
-			}
-
-			e_book_view_stop (book_data->book_view);
-			g_object_unref (book_data->book_view);
-			book_data->book_view = NULL;
-		}
-	}
-
-	comp->priv->pending_completion_seq = 0;
-}
-
-static void
-e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar *query_text)
-{
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (query_text);
-
-	e_select_names_completion_stop_query (comp);  /* Stop any prior queries. */
-
-	if (comp->priv->books_not_ready == 0) {
-		gchar *sexp;
-	
-		if (strlen (query_text) < comp->priv->minimum_query_length) {
-			e_completion_end_search (E_COMPLETION (comp));
-			return;
-		}
-
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = g_strdup (query_text);
-
-		sexp = book_query_sexp (comp);
-		if (sexp && *sexp) {
-			GList *l;
-
-			if (out)
-				fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text);
-
-			for (l = comp->priv->book_data; l; l = l->next) {
-				ESelectNamesCompletionBookData *book_data = l->data;
-				gboolean can_reuse_cached_cards;
-
-				if (out) {
-					fprintf (out,
-						 "book == %s[\n"
-						 "\tbook_data->cached_query_text == `%s'\n"
-						 "\tbook_data->cache_complete == %d\n"
-						 "\tbook_data->cached_cards == %p\n",
-						 e_book_get_uri (book_data->book),
-						 book_data->cached_query_text,
-						 book_data->cache_complete,
-						 book_data->cached_cards);
-				}
-
-				/* for lack of a better place, we invalidate the cache here if we
-				   notice that the text is different. */
-				if (book_data->cached_query_text
-				    && (strlen (book_data->cached_query_text) > strlen (query_text)
-					|| utf8_casefold_collate_len (book_data->cached_query_text, query_text,
-								      strlen (book_data->cached_query_text))))
-					book_data->cache_complete = FALSE;
-
-				can_reuse_cached_cards = (book_data->cached_query_text
-							  && book_data->cache_complete
-							  && book_data->cached_cards != NULL);
-
-				if (can_reuse_cached_cards) {
-
-					if (out)
-						fprintf (out, "\t*** can reuse cached cards (%d cards cached)!\n", g_list_length (book_data->cached_cards));
-
-					if (out)
-						fprintf (out, "\tusing existing query info: %s (vs %s)\n", query_text, book_data->cached_query_text);
-					book_query_process_card_list (comp, book_data->cached_cards);
-				}
-				else {
-					e_select_names_completion_clear_cache (book_data);
-					book_data->cached_query_text = g_strdup (query_text);
-
-					book_data->book_view_tag = e_book_async_get_book_view (book_data->book,
-											       sexp, 
-											       e_select_names_completion_got_book_view_cb, book_data);
-					comp->priv->pending_completion_seq++;
-				}
-
-				if (out)
-					fprintf (out, "]\n");
-			}
-
-			/* if we looped through all the books
-			   and were able to complete based
-			   solely on our cached cards, signal
-			   that the search is over. */
-			if (!comp->priv->pending_completion_seq)
-				e_select_names_completion_done (E_SELECT_NAMES_COMPLETION (comp));
-		} else {
-			g_free (comp->priv->query_text);
-			comp->priv->query_text = NULL;
-		}
-		g_free (sexp);
-
-	} else {
-
-		comp->priv->waiting_query = g_strdup (query_text);
-
-	}
-}
-
-static void
-e_select_names_completion_do_query (ESelectNamesCompletion *comp, const gchar *query_text, gint pos, gint limit)
-{
-	gchar *clean;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	clean = clean_query_text (query_text);
-	if (! (clean && *clean)) {
-		g_free (clean);
-		e_completion_end_search (E_COMPLETION (comp));
-		return;
-	}
-
-	if (out)
-		fprintf (out, "do_query: %s => %s\n", query_text, clean);
-
-	e_select_names_completion_start_query (comp, clean);
-	g_free (clean);
-}
-
-
-/*
- *
- *  Completion Search Override - a Framework for Christian-Resurrection-Holiday Edible-Chicken-Ova
- *
- */
-
-typedef struct _SearchOverride SearchOverride;
-struct _SearchOverride {
-	const gchar *trigger;
-	const gchar *text[4];
-};
-static SearchOverride override[] = { 
-	{ "why?", { "\"I must create a system, or be enslaved by another man's.\"",
-		    "            -- Wiliam Blake, \"Jerusalem\"",
-		    NULL } },
-	{ "easter-egg?", { "What were you expecting, a flight simulator?", NULL } },
-	{ NULL, { NULL } } };
-
-static gboolean
-search_override_check (SearchOverride *over, const gchar *text)
-{
-	/* The g_utf8_validate is needed because as of 2001-06-11,
-	 * EText doesn't translate from locale->UTF8 when you paste
-	 * into it.
-	 */
-	if (over == NULL || text == NULL || !g_utf8_validate (text, -1, NULL))
-		return FALSE;
-
-	return !utf8_casefold_collate (over->trigger, text);
-}
-
-
-/*
- *
- *  Completion Callbacks
- *
- */
-
-static void
-e_select_names_completion_handle_request (ECompletion *comp, const gchar *text, gint pos, gint limit)
-{
-	ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp);
-	const gchar *str;
-	gint index, j;
-	
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (text != NULL);
-	
-	if (out) {
-		fprintf (out, "\n\n**** requesting completion\n");
-		fprintf (out, "text=\"%s\" pos=%d limit=%d\n", text, pos, limit);
-	}
-
-	e_select_names_model_text_pos (selcomp->priv->text_model->source,
-				       selcomp->priv->text_model->seplen,
-				       pos, &index, NULL, NULL);
-	str = index >= 0 ? e_select_names_model_get_string (selcomp->priv->text_model->source, index) : NULL;
-
-	if (out)
-		fprintf (out, "index=%d str=\"%s\"\n", index, str);
-
-	if (str == NULL || *str == '\0') {
-		if (out)
-			fprintf (out, "aborting empty query\n");
-		e_completion_end_search (comp);
-		return;
-	}
-
-	for (j=0; override[j].trigger; ++j) {
-		if (search_override_check (&(override[j]), str)) {
-			gint k;
-
-			for (k=0; override[j].text[k]; ++k) {
-				ECompletionMatch *match = g_new (ECompletionMatch, 1);
-				e_completion_match_construct (match);
-				e_completion_match_set_text (match, text, override[j].text[k]);
-				match->score = 1 / (double) (k + 1);
-				e_completion_found_match (comp, match);
-			}
-
-			e_completion_end_search (comp);
-			return;
-		}
-	}
-
-	e_select_names_completion_do_query (selcomp, str, pos, limit);
-}
-
-static void
-e_select_names_completion_end (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "completion ended\n");
-}
-
-/*
- *
- *  Our Pseudo-Constructor
- *
- */
-
-ECompletion *
-e_select_names_completion_new (ESelectNamesTextModel *text_model)
-{
-	ESelectNamesCompletion *comp;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model), NULL);
-
-	comp = g_object_new (E_TYPE_SELECT_NAMES_COMPLETION, NULL);
-
-	comp->priv->text_model = text_model;
-	g_object_ref (text_model);
-
-	return E_COMPLETION (comp);
-}
-
-void
-e_select_names_completion_add_book (ESelectNamesCompletion *comp, EBook *book)
-{
-	ESelectNamesCompletionBookData *book_data;
-
-	g_return_if_fail (book != NULL);
-
-	book_data = g_new0 (ESelectNamesCompletionBookData, 1);
-	book_data->book = book;
-	book_data->comp = comp;
-	g_object_ref (book_data->book);
-	comp->priv->book_data = g_list_append (comp->priv->book_data, book_data);
-
-	/* XXX toshok - this doesn't work properly.  need to rethink this next bit. */
-	/* if the user is typing as we're adding books, restart the
-	   query after the new book has been added */
-	if (comp->priv->query_text && *comp->priv->query_text) {
-		char *query_text = g_strdup (comp->priv->query_text);
-		e_select_names_completion_stop_query (comp);
-		e_select_names_completion_start_query (comp, query_text);
-		g_free (query_text);
-	}
-}
-
-void
-e_select_names_completion_clear_books (ESelectNamesCompletion *comp)
-{
-	e_select_names_completion_stop_query (comp);
-	e_select_names_completion_clear_book_data (comp);
-}
-
-void
-e_select_names_completion_set_minimum_query_length (ESelectNamesCompletion *comp, int query_length)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	comp->priv->minimum_query_length = query_length;
-}
-
-gboolean
-e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *comp)
-{
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), FALSE);
-	return comp->priv->match_contact_lists;
-}
-
-
-void
-e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *comp, gboolean x)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	comp->priv->match_contact_lists = x;
-}
-
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
deleted file mode 100644
index 4ad1f4fd52..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef E_SELECT_NAMES_COMPLETION_H
-#define E_SELECT_NAMES_COMPLETION_H
-
-#include <gal/e-text/e-completion.h>
-#include <libebook/e-book-async.h>
-#include "e-select-names-text-model.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_SELECT_NAMES_COMPLETION        (e_select_names_completion_get_type ())
-#define E_SELECT_NAMES_COMPLETION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SELECT_NAMES_COMPLETION, ESelectNamesCompletion))
-#define E_SELECT_NAMES_COMPLETION_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_SELECT_NAMES_COMPLETION, ESelectNamesCompletionClass))
-#define E_IS_SELECT_NAMES_COMPLETION(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SELECT_NAMES_COMPLETION))
-#define E_IS_SELECT_NAMES_COMPLETION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_SELECT_NAMES_COMPLETION))
-
-typedef struct _ESelectNamesCompletion ESelectNamesCompletion;
-typedef struct _ESelectNamesCompletionClass ESelectNamesCompletionClass;
-struct _ESelectNamesCompletionPrivate;
-
-struct _ESelectNamesCompletion {
-	ECompletion parent;
-
-	struct _ESelectNamesCompletionPrivate *priv;
-};
-
-struct _ESelectNamesCompletionClass {
-	ECompletionClass parent_class;
-
-};
-
-GType        e_select_names_completion_get_type (void);
-
-ECompletion *e_select_names_completion_new                     (ESelectNamesTextModel *);
-void         e_select_names_completion_add_book                (ESelectNamesCompletion *, EBook *);
-void         e_select_names_completion_clear_books             (ESelectNamesCompletion *);
-void         e_select_names_completion_set_minimum_query_length (ESelectNamesCompletion *, int);
-gboolean     e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *);
-void         e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *, gboolean);
-
-G_END_DECLS
-
-#endif /* E_SELECT_NAMES_COMPLETION_H */
diff --git a/addressbook/gui/component/select-names/e-select-names-config-keys.h b/addressbook/gui/component/select-names/e-select-names-config-keys.h
deleted file mode 100644
index e0f08c3019..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-config-keys.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors :
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_SELECT_NAMES_CONFIG_KEYS_H_
-#define _E_SELECT_NAMES_CONFIG_KEYS_H_
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#define SELECT_NAMES_CONFIG_PREFIX "/apps/evolution/addressbook/completion"
-
-/* Display settings */
-#define SELECT_NAMES_CONFIG_COMPLETION_BOOKS SELECT_NAMES_CONFIG_PREFIX "/books"
-#define SELECT_NAMES_CONFIG_LAST_COMPLETION_BOOK SELECT_NAMES_CONFIG_PREFIX "/last_book"
-#define SELECT_NAMES_CONFIG_MIN_QUERY_LENGTH SELECT_NAMES_CONFIG_PREFIX "/minimum_query_length"
-
-G_END_DECLS
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-config.c b/addressbook/gui/component/select-names/e-select-names-config.c
deleted file mode 100644
index 8335ed7c3b..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-config.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-
-#include "e-select-names-config-keys.h"
-#include "e-select-names-config.h"
-
-static GConfClient *config = NULL;
-
-static void
-do_cleanup (void)
-{
-	g_object_unref (config);
-	config = NULL;
-}
-
-static void
-e_select_names_config_init (void)
-{
-	if (config)
-		return;
-
-	config = gconf_client_get_default ();
-	g_atexit ((GVoidFunc) do_cleanup);
-
-	gconf_client_add_dir (config, SELECT_NAMES_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-}
-
-void
-e_select_names_config_remove_notification (guint id)
-{
-	gconf_client_notify_remove (config, id);
-}
-
-char *
-e_select_names_config_get_last_completion_book (void)
-{
-	e_select_names_config_init ();
-	
-	return gconf_client_get_string (config, SELECT_NAMES_CONFIG_LAST_COMPLETION_BOOK, NULL);
-}
-
-void
-e_select_names_config_set_last_completion_book (const char *last_completion_book)
-{
-	e_select_names_config_init ();
-
-	gconf_client_set_string (config, SELECT_NAMES_CONFIG_LAST_COMPLETION_BOOK, last_completion_book, NULL);
-}
-
-guint
-e_select_names_config_add_notification_last_completion_book (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	e_select_names_config_init ();
-	
-	id = gconf_client_notify_add (config, SELECT_NAMES_CONFIG_LAST_COMPLETION_BOOK, func, data, NULL, NULL);
-	
-	return id;
-}
-
-gint
-e_select_names_config_get_min_query_length (void)
-{
-	e_select_names_config_init ();
-
-	return gconf_client_get_int (config, SELECT_NAMES_CONFIG_MIN_QUERY_LENGTH, NULL);
-}
-
-
-void
-e_select_names_config_set_min_query_length (gint day_end_hour)
-{
-	e_select_names_config_init ();
-
-	gconf_client_set_int (config, SELECT_NAMES_CONFIG_MIN_QUERY_LENGTH, day_end_hour, NULL);
-}
-
-guint 
-e_select_names_config_add_notification_min_query_length (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	e_select_names_config_init ();
-	
-	id = gconf_client_notify_add (config, SELECT_NAMES_CONFIG_MIN_QUERY_LENGTH, func, data, NULL, NULL);
-	
-	return id;	
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-config.h b/addressbook/gui/component/select-names/e-select-names-config.h
deleted file mode 100644
index 12d2c1314d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_SELECT_NAMES_CONFIG_H_
-#define _E_SELECT_NAMES_CONFIG_H_
-
-#include <gconf/gconf-client.h>
-
-void e_select_names_config_remove_notification (guint id);
-
-/* The last completion book */
-char 	  *e_select_names_config_get_last_completion_book	(void);
-void	  e_select_names_config_set_last_completion_book	(const char *last_completion_book);
-guint e_select_names_config_add_notification_last_completion_book (GConfClientNotifyFunc func, gpointer data);
-
-
-/* The minimum query length */
-gint	  e_select_names_config_get_min_query_length	(void);
-void	  e_select_names_config_set_min_query_length	(gint	      day_end_hour);
-guint e_select_names_config_add_notification_min_query_length (GConfClientNotifyFunc func, gpointer data);
-
-#endif /* _E_SELECT_NAMES_CONFIG_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 9e427513e0..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * 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:" BASE_VERSION
-
-static BonoboGenericFactory *factory = NULL;
-
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    const char *component_id,
-	    void *closure)
-{
-	return BONOBO_OBJECT (e_select_names_bonobo_new ());
-}
-
-
-gboolean
-e_select_names_factory_init (void)
-{
-	if (factory != NULL)
-		return TRUE;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		return FALSE;
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h
deleted file mode 100644
index 0fe85c8361..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index 1b7cbbb38e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbridge  <trow@ximian.com.
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gal/e-text/e-entry.h>
-
-#include <libgnome/gnome-i18n.h>
-#include "e-select-names-config.h"
-#include "e-select-names-manager.h"
-#include "e-select-names-marshal.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/util/eab-book-util.h>
-#include <addressbook/util/eab-destination.h>
-#include "addressbook/gui/component/addressbook.h"
-#include <bonobo/bonobo-object.h>
-
-#define DEFAULT_MINIMUM_QUERY_LENGTH 3
-
-enum {
-	CHANGED,
-	OK,
-	CANCEL,
-	LAST_SIGNAL
-};
-
-static guint e_select_names_manager_signals[LAST_SIGNAL] = { 0 };
-
-static GObjectClass *parent_class = NULL;
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-	ESelectNamesModel *original_model;
-	ESelectNamesManager *manager;
-	guint changed_tag;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-	ESelectNamesManager *manager;
-	ESelectNamesModel *model;
-	ECompletion *comp;
-	guint cleaning_tag;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_dispose (GObject *object);
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerSection routines */
-
-static void
-section_model_changed_cb (ESelectNamesModel *model, gpointer closure)
-{
-	ESelectNamesManagerSection *section = closure;
-	g_signal_emit (section->manager,
-		       e_select_names_manager_signals[CHANGED], 0,
-		       section->id,
-		       FALSE);
-}
-
-static ESelectNamesManagerSection *
-e_select_names_manager_section_new (ESelectNamesManager *manager,
-				    const gchar *id,
-				    const gchar *title,
-				    ESelectNamesModel *model)
-{
-	ESelectNamesManagerSection *section;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	section = g_new0 (ESelectNamesManagerSection, 1);
-
-	section->id = g_strdup (id);
-	section->title = g_strdup (title);
-
-	section->manager = manager;
-
-	section->model = model;
-	g_object_ref (section->model);
-	section->changed_tag =
-		g_signal_connect (section->model,
-				    "changed",
-				    G_CALLBACK (section_model_changed_cb),
-				    section);
-
-	return section;
-}
-
-static void
-e_select_names_manager_section_free (ESelectNamesManagerSection *section)
-{
-	if (section == NULL)
-		return;
-
-	g_free (section->id);
-	g_free (section->title);
-
-	if (section->model) {
-		g_signal_handler_disconnect (section->model, section->changed_tag);
-		g_object_unref (section->model);
-	}
-
-	if (section->original_model) {
-		g_object_unref (section->original_model);
-	}
-
-	g_free (section);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerEntry routines */
-
-static ESelectNamesManagerEntry *
-get_entry_info (EEntry *entry)
-{
-	g_return_val_if_fail (E_IS_ENTRY (entry), NULL);
-	return (ESelectNamesManagerEntry *) g_object_get_data (G_OBJECT (entry), "entry_info");
-}
-
-static void
-populate_popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, GtkWidget *menu, gpointer user_data)
-{
-	ESelectNamesTextModel *text_model;
-
-	g_object_get (eentry,
-		      "model", &text_model,
-		      NULL);
-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-
-	e_select_names_populate_popup (menu, text_model, ev, pos, GTK_WIDGET (eentry));
-}
-
-#if 0
-static gboolean
-clean_cb (gpointer ptr)
-{
-	ESelectNamesManagerEntry *entry = ptr;
-
-	e_select_names_model_clean (entry->model, TRUE);
-	entry->cleaning_tag = 0;
-	return FALSE;
-}
-#endif
-
-static gint
-focus_in_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	if (entry->cleaning_tag) {
-		g_source_remove (entry->cleaning_tag);
-		entry->cleaning_tag = 0;
-	}
-
-	e_select_names_model_cancel_all_contact_load (entry->model);
-
-	return FALSE;
-}
-
-static gint
-focus_out_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-#if 0
-	/* XXX fix me */
-	ESelectNamesManagerEntry *entry = user_data;
-	gboolean visible = e_entry_completion_popup_is_visible (entry->entry);
-
-	if (! visible) {
-		e_select_names_model_load_all_contacts (entry->model, entry->manager->completion_book, 100);
-		if (entry->cleaning_tag == 0)
-			entry->cleaning_tag = gtk_timeout_add (100, clean_cb, entry);
-	}
-#endif
-	return FALSE;
-}
-
-static void
-completion_popup_cb (EEntry *w, gint visible, gpointer user_data)
-{
-#if 0
-	/* XXX fix me */
-	ESelectNamesManagerEntry *entry = user_data;
-
-	if (!visible && !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry->entry->canvas)))
-		e_select_names_model_load_all_contacts (entry->model, entry->manager->completion_book, 0);
-#endif
-}
-
-static void
-completion_handler (EEntry *entry, ECompletionMatch *match)
-{
-	ESelectNamesManagerEntry *mgr_entry;
-	ESelectNamesTextModel *text_model;
-	EABDestination *dest;
-	gint i, pos, start_pos, len;
-
-	if (match == NULL || match->user_data == NULL)
-		return;
-
-	mgr_entry = get_entry_info (entry);
-	dest = EAB_DESTINATION (match->user_data);
-
-	/* Sometimes I really long for garbage collection.  Reference
-           counting makes you feel 31337, but sometimes it is just a
-           bitch. */
-	g_object_ref (dest);
-
-	g_object_get (entry,
-		      "model", &text_model,
-		      NULL);
-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-
-	pos = e_entry_get_position (entry);
-	e_select_names_model_text_pos (mgr_entry->model, text_model->seplen, pos, &i, NULL, NULL);
-	e_select_names_model_replace (mgr_entry->model, i, dest);
-	e_select_names_model_name_pos (mgr_entry->model, text_model->seplen, i, &start_pos, &len);
-	e_entry_set_position (entry, start_pos+len);
-}
-
-static ESelectNamesManagerEntry *
-e_select_names_manager_entry_new (ESelectNamesManager *manager, ESelectNamesModel *model, const gchar *id)
-{
-	ESelectNamesManagerEntry *entry;
-	ETextModel *text_model;
-	GList *l;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	entry = g_new0 (ESelectNamesManagerEntry, 1);
-
-	entry->id = g_strdup (id);
-
-	entry->entry = E_ENTRY (e_entry_new ());
-	text_model = e_select_names_text_model_new (model);
-	g_object_set(entry->entry,
-		     "model",          text_model, /* The entry takes ownership of the text model */
-		     "editable",       TRUE,
-		     "use_ellipsis",   TRUE,
-		     "allow_newlines", FALSE,
-		     NULL);
-
-	g_object_ref (entry->entry);
-
-	entry->comp = e_select_names_completion_new (E_SELECT_NAMES_TEXT_MODEL (text_model));
-
-	for (l = manager->completion_books; l; l = l->next) {
-		EBook *book = l->data;
-		e_select_names_completion_add_book (E_SELECT_NAMES_COMPLETION(entry->comp), book);
-	}
-
-	e_select_names_completion_set_minimum_query_length (E_SELECT_NAMES_COMPLETION(entry->comp),
-							    manager->minimum_query_length);
-
-	e_entry_enable_completion_full (entry->entry, entry->comp, 100, completion_handler);
-		
-	entry->manager = manager;
-
-	entry->model = model;
-	g_object_ref (model);
-	
-	g_signal_connect (entry->entry,
-			  "populate_popup",
-			  G_CALLBACK (populate_popup_cb),
-			  entry);
-			
-	g_signal_connect (entry->entry->canvas,
-			  "focus_in_event",
-			  G_CALLBACK (focus_in_cb),
-			  entry);
-	
-	g_signal_connect (entry->entry->canvas,
-			  "focus_out_event",
-			  G_CALLBACK (focus_out_cb),
-			  entry);
-
-	g_signal_connect (entry->entry,
-			  "completion_popup",
-			  G_CALLBACK (completion_popup_cb),
-			  entry);
-
-	g_object_set_data (G_OBJECT (entry->entry), "entry_info", entry);
-	g_object_set_data (G_OBJECT (entry->entry), "select_names_model", model);
-	g_object_set_data (G_OBJECT (entry->entry), "select_names_text_model", text_model);
-	g_object_set_data (G_OBJECT (entry->entry), "completion_handler", entry->comp);
-
-	return entry;
-}
-
-static void
-e_select_names_manager_entry_free (ESelectNamesManagerEntry *entry)
-{
-	if (entry == NULL)
-		return;
-
-	g_free (entry->id);
-	g_object_unref (entry->model);
-	g_object_unref (entry->entry);
-
-	if (entry->cleaning_tag)
-		g_source_remove (entry->cleaning_tag);
-
-	g_free (entry);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_save_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-	
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-
-		if (section->original_model == NULL && section->model != NULL)
-			section->original_model = e_select_names_model_duplicate (section->model);
-
-	}
-}
-
-static void
-e_select_names_manager_revert_to_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->model && section->original_model) {
-			e_select_names_model_overwrite_copy (section->model, section->original_model);
-			g_object_unref (section->original_model);
-			section->original_model = NULL;
-		}
-	}
-}
-
-static void
-e_select_names_manager_discard_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->original_model) {
-			g_object_unref (section->original_model);
-			section->original_model = NULL;
-		}
-	}
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-open_book_cb (EBook *book, EBookStatus status, gpointer user_data)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER (user_data);
-
-	if (status == E_BOOK_ERROR_OK) {
-		GList *l;
-		for (l = manager->entries; l; l = l->next) {
-			ESelectNamesManagerEntry *entry = l->data;
-			e_select_names_completion_add_book (E_SELECT_NAMES_COMPLETION(entry->comp), book);
-		}
-
-		manager->completion_books = g_list_append (manager->completion_books, book);
-		g_object_ref (book);
-	}
-
-	g_object_unref (manager); /* unref ourself (matches ref before the load_source call below) */
-}
-
-static void
-update_completion_books (ESelectNamesManager *manager)
-{
-	GSList *groups;
-
-	/* Add all the completion books */
-	for (groups = e_source_list_peek_groups (manager->source_list); groups; groups = groups->next) {
-		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		GSList *sources;
-
-		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
-			ESource *source = E_SOURCE (sources->data);
-			const char *completion = e_source_get_property (source, "completion");
-			if (completion && !g_ascii_strcasecmp (completion, "true")) {
-				EBook *book = e_book_new ();
-				g_object_ref (manager);
-				addressbook_load_source (book, source, open_book_cb, manager);
-			}
-		}
-	}
-}
-
-static void
-source_list_changed (ESourceList *source_list, ESelectNamesManager *manager)
-{
-	GList *l;
-	
-	for (l = manager->entries; l; l = l->next) {
-		ESelectNamesManagerEntry *entry = l->data;
-		e_select_names_completion_clear_books (E_SELECT_NAMES_COMPLETION (entry->comp));
-	}
-
-	g_list_foreach (manager->completion_books, (GFunc)g_object_unref, NULL);
-	g_list_free (manager->completion_books);
-	manager->completion_books = NULL;
-
-	update_completion_books (manager);
-}
-
-static void
-config_min_query_length_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ESelectNamesManager *manager = data;
-	GList *l;
-	
-	manager->minimum_query_length = e_select_names_config_get_min_query_length ();
-	if (manager->minimum_query_length <= 0)
-		manager->minimum_query_length = DEFAULT_MINIMUM_QUERY_LENGTH;
-	
-	for (l = manager->entries; l; l = l->next) {
-		ESelectNamesManagerEntry *entry = l->data;
-		e_select_names_completion_set_minimum_query_length (E_SELECT_NAMES_COMPLETION(entry->comp),
-								    manager->minimum_query_length);
-	}
-}
-
-/**
- * e_select_names_manager_new:
- *
- * Returns: a new #ESelectNamesManager
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = g_object_new (E_TYPE_SELECT_NAMES_MANAGER, NULL);
-
-	return manager;
-}
-
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-
-void
-e_select_names_manager_add_section (ESelectNamesManager *manager,
-				    const char *id,
-				    const char *title)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	e_select_names_manager_add_section_with_limit (manager, id, title, -1);
-}
-
-void
-e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-					       const char *id,
-					       const char *title,
-					       gint limit)
-{
-	ESelectNamesManagerSection *section;
-	ESelectNamesModel *model;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	model = e_select_names_model_new ();
-	e_select_names_model_set_limit (model, limit);
-	
-	section = e_select_names_manager_section_new (manager, id, title, model);
-
-	manager->sections = g_list_append (manager->sections, section);
-
-	g_object_unref (model);
-}
-
-ESelectNamesModel *
-e_select_names_manager_get_source (ESelectNamesManager *manager,
-				   const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp (section->id, id))
-			return section->model;
-	}
-	return NULL;
-}
-
-GtkWidget *
-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-
-			entry = e_select_names_manager_entry_new (manager, section->model, section->id);
-			manager->entries = g_list_append (manager->entries, entry);
-
-			return GTK_WIDGET(entry->entry);
-		}
-	}
-
-	return NULL;
-}
-
-static void
-e_select_names_response(ESelectNames *dialog, gint response_id, ESelectNamesManager *manager)
-{
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-
-	switch(response_id) {
-	case GTK_RESPONSE_OK:
-		e_select_names_manager_discard_saved_models (manager);
-		g_signal_emit (manager, e_select_names_manager_signals[OK], 0);
-		break;
-
-	case GTK_RESPONSE_CANCEL:
-		e_select_names_manager_revert_to_saved_models (manager);
-		g_signal_emit (manager, e_select_names_manager_signals[CANCEL], 0);
-		break;
-	}
-}
-
-static void
-clear_widget (gpointer data, GObject *where_object_was)
-{
-	GtkWidget **widget_ref = data;
-	*widget_ref = NULL;
-}
-
-void
-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					const char *id)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-
-	if (manager->names) {
-		
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		e_select_names_set_default (manager->names, id);
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-
-	} else {
-
-		GList *iter;
-
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-			ESelectNamesManagerSection *section = iter->data;
-			e_select_names_add_section (manager->names, section->id, section->title, section->model);
-		}
-
-		e_select_names_set_default (manager->names, id);
-
-		g_signal_connect(manager->names, 
-				 "response",
-				 G_CALLBACK(e_select_names_response),
-				 manager);
-
-		g_object_weak_ref (G_OBJECT (manager->names), clear_widget, &manager->names);
-
-		gtk_widget_show(GTK_WIDGET(manager->names));
-	}
-
-	e_select_names_manager_save_models (manager);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	guint not;
-	
-	manager->sections = NULL;
-	manager->entries  = NULL;
-
-	manager->source_list =  e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	g_signal_connect (manager->source_list, "changed", G_CALLBACK (source_list_changed), manager);
-
-	manager->completion_books  = NULL;
-
-	manager->minimum_query_length = e_select_names_config_get_min_query_length ();
-
-	update_completion_books (manager);
-
-	not = e_select_names_config_add_notification_min_query_length (config_min_query_length_changed_cb, manager);
-	manager->notifications = g_list_append (manager->notifications, GUINT_TO_POINTER (not));
-}
-
-static void
-e_select_names_manager_dispose (GObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	if (manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (manager->names));
-		manager->names = NULL;
-	}
-
-	if (manager->sections) {
-		g_list_foreach (manager->sections, (GFunc) e_select_names_manager_section_free, NULL);
-		g_list_free (manager->sections);
-		manager->sections = NULL;
-	}
-
-	if (manager->entries) {
-		g_list_foreach (manager->entries, (GFunc) e_select_names_manager_entry_free, NULL);
-		g_list_free (manager->entries);
-		manager->entries = NULL;
-	}
-
-	if (manager->source_list) {
-		g_object_unref (manager->source_list);
-		manager->source_list = NULL;
-	}
-	
-	if (manager->completion_books) {
-		g_list_foreach (manager->completion_books, (GFunc) g_object_unref, NULL);
-		g_list_free (manager->completion_books);
-		manager->completion_books = NULL;
-	}
-
-	if (manager->notifications) {
-		GList *l;
-		
-		for (l = manager->notifications; l; l = l->next)
-			e_select_names_config_remove_notification (GPOINTER_TO_UINT (l->data));
-		g_list_free (manager->notifications);
-		manager->notifications = NULL;
-	}
-	
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_select_names_manager_dispose;
-
-	e_select_names_manager_signals[CHANGED] = 
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ESelectNamesManagerClass, changed),
-			      NULL, NULL,
-			      e_select_names_marshal_NONE__POINTER_INT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_POINTER,
-			      G_TYPE_INT);
-
-	e_select_names_manager_signals[OK] =
-		g_signal_new ("ok",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ESelectNamesManagerClass, ok),
-			      NULL, NULL,
-			      e_select_names_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	e_select_names_manager_signals[CANCEL] =
-		g_signal_new ("cancel",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ESelectNamesManagerClass, cancel),
-			      NULL, NULL,
-			      e_select_names_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-/**
- * 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.
- **/
-GType
-e_select_names_manager_get_type (void)
-{
-	static GType manager_type = 0;
-
-	if (!manager_type) {
-		static const GTypeInfo manager_info =  {
-			sizeof (ESelectNamesManagerClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_manager_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNamesManager),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_manager_init,
-		};
-
-		manager_type = g_type_register_static (G_TYPE_OBJECT, "ESelectNamesManager", &manager_info, 0);
-	}
-
-	return manager_type;
-}
-
-
-
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
deleted file mode 100644
index 0830d299d5..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,68 +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)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))
-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))
-#define E_IS_SELECT_NAMES_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))
-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))
-
-typedef struct _ESelectNamesManager ESelectNamesManager;
-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;
-
-struct _ESelectNamesManager {
-	GObject object;
-	
-	GList *sections;
-	GList *entries;
-
-	ESelectNames *names;
-
-	ESourceList *source_list;	
-	GList *completion_books;
-	
-	int minimum_query_length;
-
-	GList *notifications;
-};
-
-struct _ESelectNamesManagerClass {
-	GObjectClass parent_class;
-
-	void (*changed) (ESelectNamesManager *, const gchar *section_id, gint changed_working_copy);
-	void (*ok)      (ESelectNamesManager *);
-	void (*cancel)  (ESelectNamesManager *);
-};
-
-ESelectNamesManager *e_select_names_manager_new                    (void);
-void                 e_select_names_manager_add_section            (ESelectNamesManager *manager,
-							            const char *id,
-							            const char *title);
-void                 e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-								    const char *id,
-								    const char *title,
-								    gint limit);
-ESelectNamesModel   *e_select_names_manager_get_source             (ESelectNamesManager *manager,
-								    const char *id);
-GtkWidget           *e_select_names_manager_create_entry           (ESelectNamesManager *manager,
-							            const char *id);
-void                 e_select_names_manager_activate_dialog        (ESelectNamesManager *manager,
-							            const char *id);
-/* Standard Gtk function */			      
-GType                e_select_names_manager_get_type               (void);
-
-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-marshal.list b/addressbook/gui/component/select-names/e-select-names-marshal.list
deleted file mode 100644
index 8e751dc27d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-marshal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-NONE:POINTER,INT
-NONE:NONE
-NONE:INT,INT,INT
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 74bda7a74b..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,769 +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 <libebook/e-contact.h>
-#include "e-select-names-model.h"
-#include "e-select-names-marshal.h"
-
-#define MAX_LENGTH 2047
-
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	E_SELECT_NAMES_MODEL_RESIZED,
-	E_SELECT_NAMES_MODEL_LAST_SIGNAL
-};
-
-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CONTACT,
-};
-
-struct _ESelectNamesModelPrivate {
-	gchar *id;
-	gchar *title;
-
-	GList *data;  /* of EABDestination */
-
-	gint limit;
-
-	gint freeze_count;
-	gboolean pending_changed;
-};
-
-static GObjectClass *parent_class = NULL;
-
-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_dispose (GObject *object);
-
-GType
-e_select_names_model_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ESelectNamesModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNamesModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_model_init,
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT, "ESelectNamesModel", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_model_class_init (ESelectNamesModelClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	parent_class = g_type_class_peek_parent (klass);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ESelectNamesModelClass, changed),
-			      NULL, NULL,
-			      e_select_names_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED] =
-		g_signal_new ("resized",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ESelectNamesModelClass, resized),
-			      NULL, NULL,
-			      e_select_names_marshal_NONE__INT_INT_INT,
-			      G_TYPE_NONE, 3,
-			      G_TYPE_INT,
-			      G_TYPE_INT,
-			      G_TYPE_INT);
-
-	klass->changed = NULL;
-
-	object_class->dispose = e_select_names_model_dispose;
-}
-
-/**
- * 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_dispose (GObject *object)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL (object);
-
-	if (model->priv) {
-		g_free (model->priv->title);
-		g_free (model->priv->id);
-
-		g_list_foreach (model->priv->data, (GFunc) g_object_unref, NULL);
-		g_list_free (model->priv->data);
-
-		g_free (model->priv);
-		model->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-
-static void
-e_select_names_model_changed (ESelectNamesModel *model)
-{
-	if (model->priv->freeze_count > 0) {
-		model->priv->pending_changed = TRUE;
-	} else {
-		g_signal_emit (model, e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED], 0);
-		model->priv->pending_changed = FALSE;
-	}
-}
-
-static void
-destination_changed_proxy (EABDestination *dest, gpointer closure)
-{
-	e_select_names_model_changed (E_SELECT_NAMES_MODEL (closure));
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model;
-	model = g_object_new (E_TYPE_SELECT_NAMES_MODEL, NULL);
-	return model;
-}
-
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = e_select_names_model_new ();
-	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)) {
-		EABDestination *dup = eab_destination_copy (EAB_DESTINATION (iter->data));
-		e_select_names_model_append (model, dup);
-	}
-
-	model->priv->limit = old->priv->limit;
-
-	return model;
-}
-
-gchar *
-e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator)
-{
-	gchar *text;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (separator && *separator, NULL);
-
-	if (model->priv->data == NULL) {
-		
-		text = g_strdup ("");
-
-	} else {
-		gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-		gint i = 0;
-		GList *iter = model->priv->data;
-		
-		while (iter) {
-			EABDestination *dest = EAB_DESTINATION (iter->data);
-			strv[i] = (gchar *) eab_destination_get_textrep (dest, FALSE);
-			++i;
-			iter = g_list_next (iter);
-		}
-		
-		text = g_strjoinv (separator, strv);
-
-		if (g_utf8_strlen(text, -1) > MAX_LENGTH) {
-			char *p = g_utf8_offset_to_pointer (text, MAX_LENGTH);
-			*p = '\0';
-			text = g_realloc (text, p - text + 1);
-		}
-		
-		g_free (strv);
-		
-	}
-
-	return text;
-}
-
-gchar *
-e_select_names_model_get_address_text (ESelectNamesModel *model, const char *separator)
-{
-	gchar *addr_text;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (separator && *separator, NULL);
-
-	if (model->priv->data == NULL) {
-
-		addr_text = g_strdup ("");
-		
-	} else {
-		gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-		gint i = 0;
-		GList *iter = model->priv->data;
-
-		while (iter) {
-			EABDestination *dest = EAB_DESTINATION (iter->data);
-			strv[i] = (gchar *) eab_destination_get_address (dest);
-			if (strv[i])
-				++i;
-			iter = g_list_next (iter);
-		}
-		
-		addr_text = g_strjoinv (separator, strv);
-		
-		g_free (strv);
-		
-	}
-
-	return addr_text;
-}
-
-gint
-e_select_names_model_count (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return g_list_length (model->priv->data);
-}
-
-gint
-e_select_names_model_get_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return model->priv->limit;
-}
-
-void
-e_select_names_model_set_limit (ESelectNamesModel *model, gint limit)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	model->priv->limit = MAX (limit, -1);
-}
-
-gboolean
-e_select_names_model_at_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, TRUE);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), TRUE);
-
-	return model->priv->limit >= 0 && g_list_length (model->priv->data) >= model->priv->limit;
-}
-
-const EABDestination *
-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 EAB_DESTINATION (g_list_nth_data (model->priv->data, index));
-}
-
-gchar *
-e_select_names_model_export_destinationv (ESelectNamesModel *model)
-{
-	EABDestination **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 (EABDestination *, len+1);
-	
-	for (i=0, j = model->priv->data; j != NULL; j = g_list_next (j)) {
-		EABDestination *dest = EAB_DESTINATION (j->data);
-
-		if (dest)
-			destv[i++] = dest;
-	}
-
-	str = eab_destination_exportv (destv);
-	g_free (destv);
-
-	return str;
-}
-
-static void send_changed (EABDestination *dest, EContact *contact, gpointer closure)
-{
-	ESelectNamesModel *model = closure;
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_import_destinationv (ESelectNamesModel *model,
-					  gchar *destinationv)
-{
-	EABDestination **destv;
-	gint i;
-
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-
-	destv = eab_destination_importv (destinationv);
-
-	e_select_names_model_delete_all (model);
-
-	if (destv == NULL)
-		return;
-
-	for (i = 0; destv[i]; i++) {
-		eab_destination_use_contact (destv[i], send_changed, model);
-		e_select_names_model_append (model, destv[i]);
-	}
-	g_free (destv);
-}
-
-EContact *
-e_select_names_model_get_contact (ESelectNamesModel *model, gint index)
-{
-	const EABDestination *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 ? eab_destination_get_contact (dest) : NULL;
-
-}
-
-const gchar *
-e_select_names_model_get_string (ESelectNamesModel *model, gint index)
-{
-	const EABDestination *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 ? eab_destination_get_textrep (dest, FALSE) : "";
-}
-
-static void
-connect_destination (ESelectNamesModel *model, EABDestination *dest)
-{
-	g_signal_connect (dest,
-			  "changed",
-			  G_CALLBACK (destination_changed_proxy),
-			  model);
-}
-
-static void
-disconnect_destination (ESelectNamesModel *model, EABDestination *dest)
-{
-	g_signal_handlers_disconnect_by_func (dest, destination_changed_proxy, model);
-}
-
-gboolean
-e_select_names_model_contains (ESelectNamesModel *model, const EABDestination *dest)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), FALSE);
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		if (iter->data != NULL && eab_destination_equal (dest, EAB_DESTINATION (iter->data)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-e_select_names_model_insert (ESelectNamesModel *model, gint index, EABDestination *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 && EAB_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		g_object_unref (dest);
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_insert (model->priv->data, dest, index);
-	
-	g_object_ref (dest);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_append (ESelectNamesModel *model, EABDestination *dest)
-{
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		g_object_unref (dest);
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_append (model->priv->data, dest);
-
-	g_object_ref  (dest);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_replace (ESelectNamesModel *model, gint index, EABDestination *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 && EAB_IS_DESTINATION (dest));
-	
-	new_str = eab_destination_get_textrep (dest, FALSE);
-	new_strlen = new_str ? strlen (new_str) : 0;
-
-	if (model->priv->data == NULL) {
-
-		connect_destination (model, dest);
-
-		model->priv->data = g_list_append (model->priv->data, dest);
-		g_object_ref (dest);
-
-	} else {
-		
-		node = g_list_nth (model->priv->data, index);
-
-		if (node->data != dest) {
-
-			disconnect_destination (model, EAB_DESTINATION (node->data));
-			connect_destination (model, dest);
-
-			old_str = eab_destination_get_textrep (EAB_DESTINATION (node->data), FALSE);
-			old_strlen = old_str ? strlen (old_str) : 0;
-
-			g_object_unref (node->data);
-
-			node->data = dest;
-			g_object_ref (dest);
-		}
-	}
-
-	e_select_names_model_changed (model);
-
-	g_signal_emit (model, e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED], 0,
-		       index, old_strlen, new_strlen);
-}
-
-void
-e_select_names_model_delete (ESelectNamesModel *model, gint index)
-{
-	GList *node;
-	EABDestination *dest;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-	
-	node = g_list_nth (model->priv->data, index);
-	dest = EAB_DESTINATION (node->data);
-
-	disconnect_destination (model, dest);
-	g_object_unref (dest);
-
-	model->priv->data = g_list_remove_link (model->priv->data, node);
-	g_list_free_1 (node);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_clean (ESelectNamesModel *model, gboolean clean_last_entry)
-{
-	GList *iter, *next;
-	gboolean changed = FALSE;
-
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	iter = model->priv->data;
-
-	while (iter) {
-		EABDestination *dest;
-
-		next = g_list_next (iter);
-
-		if (next == NULL && !clean_last_entry)
-			break;
-		
-		dest = iter->data ? EAB_DESTINATION (iter->data) : NULL;
-
-		if (dest == NULL || eab_destination_is_empty (dest)) {
-			if (dest) {
-				disconnect_destination (model, dest);
-				g_object_unref (dest);
-			}
-			model->priv->data = g_list_remove_link (model->priv->data, iter);
-			g_list_free_1 (iter);
-			changed = TRUE;
-		}
-		
-		iter = next;
-	}
-
-	if (changed)
-		e_select_names_model_changed (model);
-}
-
-static void
-delete_all_iter (gpointer data, gpointer closure)
-{
-	disconnect_destination (E_SELECT_NAMES_MODEL (closure), EAB_DESTINATION (data));
-	g_object_unref (data);
-}
-
-void
-e_select_names_model_delete_all (ESelectNamesModel *model)
-{
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	g_list_foreach (model->priv->data, delete_all_iter, model);
-	g_list_free (model->priv->data);
-	model->priv->data = NULL;
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (dest && E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (src && E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	e_select_names_model_delete_all (dest);
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EABDestination *d = e_select_names_model_get_destination (src, i);
-		if (d)
-			e_select_names_model_append (dest, eab_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_merge (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EABDestination *d = e_select_names_model_get_destination (src, i);
-		if (d && !e_select_names_model_contains (dest, d))
-			e_select_names_model_append (dest, eab_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length)
-{
-	gint rp = 0, i, len = 0;
-	GList *iter;
-	const gchar *str;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (seplen > 0);
-
-	i = 0;
-	iter = model->priv->data;
-	while (iter && i <= index) {
-		rp += len + (i > 0 ? seplen : 0);
-		str = eab_destination_get_textrep (EAB_DESTINATION (iter->data), FALSE);
-		len = str ? g_utf8_strlen (str, -1) : 0;
-		++i;
-		iter = g_list_next (iter);
-	}
-	
-	if (i <= index) {
-		rp = -1;
-		len = 0;
-	}
-	
-	if (pos)
-		*pos = rp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length)
-{
-	GList *iter;
-	const gchar *str;
-	gint len = 0, i = 0, sp = 0, adj = 0;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (seplen > 0);
-
-	iter = model->priv->data;
-
-	while (iter != NULL) {
-		str = eab_destination_get_textrep (EAB_DESTINATION (iter->data), FALSE);
-		len = str ? g_utf8_strlen (str, -1) : 0;
-
-		if (sp <= pos && pos <= sp + len + adj) {
-			break;
-		}
-
-		sp += len + adj + 1;
-		adj = seplen-1;
-		++i;
-
-		iter = g_list_next (iter);
-	}
-
-	if (i != 0)
-		sp += seplen-1; /* skip past "magic space" */
-
-	if (iter == NULL) {
-#if 0
-		g_print ("text_pos ended NULL\n");
-#endif
-		i = -1;
-		sp = -1;
-		len = 0;
-	} else {
-#if 0
-		g_print ("text_pos got index %d\n", i);
-#endif
-	}
-
-	if (index)
-		*index = i;
-	if (start_pos)
-		*start_pos = sp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_load_all_contacts (ESelectNamesModel *model, EBook *book)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EABDestination *dest = EAB_DESTINATION (iter->data);
-		if (!eab_destination_is_empty (dest)) {
-
-			eab_destination_load_contact (dest, book);
-		}
-	}
-}
-
-void
-e_select_names_model_cancel_all_contact_load (ESelectNamesModel *model)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EABDestination *dest = EAB_DESTINATION (iter->data);
-		if (!eab_destination_is_empty (dest)) {
-
-			eab_destination_cancel_contact_load (dest);
-		}
-	}
-}
-
-void
-e_select_names_model_freeze (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	
-	++model->priv->freeze_count;
-}
-
-void
-e_select_names_model_thaw (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->freeze_count > 0);
-
-	--model->priv->freeze_count;
-	if (model->priv->pending_changed)
-		e_select_names_model_changed (model);
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
deleted file mode 100644
index 0d21ee86b3..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,88 +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 <libebook/e-contact.h>
-#include <addressbook/util/eab-destination.h>
-
-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
-#define E_SELECT_NAMES_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))
-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))
-#define E_IS_SELECT_NAMES_MODEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))
-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))
-
-typedef struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-struct _ESelectNamesModelPrivate;
-
-struct _ESelectNamesModel {
-	GObject object;
-	
-	struct _ESelectNamesModelPrivate *priv;
-};
-
-struct _ESelectNamesModelClass {
-	GObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-	void (*resized) (ESelectNamesModel *model, gint index, gint old_len, gint new_len);
-};
-
-GType   e_select_names_model_get_type  (void);
-
-ESelectNamesModel *e_select_names_model_new       (void);
-ESelectNamesModel *e_select_names_model_duplicate (ESelectNamesModel *old);
-
-gchar             *e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator);
-gchar             *e_select_names_model_get_address_text  (ESelectNamesModel *model, const char *separator);
-
-gint                e_select_names_model_count               (ESelectNamesModel *model);
-gint                e_select_names_model_get_limit           (ESelectNamesModel *model);
-void                e_select_names_model_set_limit           (ESelectNamesModel *model, gint limit);
-gboolean            e_select_names_model_at_limit            (ESelectNamesModel *model);
-
-const EABDestination *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);
-EContact           *e_select_names_model_get_contact         (ESelectNamesModel *model, gint index);
-const gchar        *e_select_names_model_get_string          (ESelectNamesModel *model, gint index);
-
-gboolean      e_select_names_model_contains       (ESelectNamesModel *model, const EABDestination *dest);
-
-void          e_select_names_model_insert         (ESelectNamesModel *model, gint index, EABDestination *dest);
-void          e_select_names_model_append         (ESelectNamesModel *model, EABDestination *dest);
-void          e_select_names_model_replace        (ESelectNamesModel *model, gint index, EABDestination *dest);
-void          e_select_names_model_delete         (ESelectNamesModel *model, gint index);
-void          e_select_names_model_delete_all     (ESelectNamesModel *model);
-void          e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src);
-void          e_select_names_model_merge          (ESelectNamesModel *dest, ESelectNamesModel *src);
-
-void          e_select_names_model_clean      (ESelectNamesModel *model, gboolean clean_last_entry);
-
-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length);
-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length);
-
-void          e_select_names_model_load_all_contacts       (ESelectNamesModel *model, EBook *book);
-void          e_select_names_model_cancel_all_contact_load (ESelectNamesModel *model);
-
-/* This is a mildly annoying freeze/thaw pair, in that it only applies to the 'changed'
-   signal and not to 'resized'.  This could cause unexpected results in some cases. */
-void          e_select_names_model_freeze (ESelectNamesModel *model);
-void          e_select_names_model_thaw   (ESelectNamesModel *model);
-
-
-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
deleted file mode 100644
index bb0f331516..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-popup.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <addressbook/util/eab-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-list-editor/e-contact-list-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include "eab-gui-util.h"
-#include "e-select-names-popup.h"
-
-#define LIST_ICON_FILENAME "contact-list-16.png"
-#define CONTACT_ICON_FILENAME "evolution-contacts-mini.png"
-
-typedef struct _PopupInfo PopupInfo;
-struct _PopupInfo {
-	ESelectNamesTextModel *text_model;
-	EABDestination *dest;
-	gint pos;
-	gint index;
-};
-
-static PopupInfo *
-popup_info_new (ESelectNamesTextModel *text_model, EABDestination *dest, gint pos, gint index)
-{
-	PopupInfo *info = g_new0 (PopupInfo, 1);
-	info->text_model = text_model;
-	info->dest = dest;
-	info->pos = pos;
-	info->index = index;
-
-	if (text_model)
-		g_object_ref (text_model);
-
-	if (dest)
-		g_object_ref (dest);
-
-	return info;
-}
-
-static void
-popup_info_free (PopupInfo *info)
-{
-	if (info) {
-		
-		if (info->text_model)
-			g_object_unref (info->text_model);
-
-		if (info->dest)
-			g_object_unref (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... */
-
-#if TOO_MANY_MENU_ITEMS
-static void
-make_contact_editor_cb (EBook *book, gpointer user_data)
-{
-	if (book) {
-		EABDestination *dest = EAB_DESTINATION (user_data);
-		EContact *contact;
-
-		contact = (EContact *) eab_destination_get_contact (dest);
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-			EContactListEditor *ce;
-			ce = e_addressbook_show_contact_list_editor (book, contact, FALSE, TRUE);
-			e_contact_list_editor_raise (ce);
-		}
-		else {
-			EContactEditor *ce;
-			ce = e_addressbook_show_contact_editor (book, contact, FALSE, TRUE);
-			e_contact_editor_raise (ce);
-		}
-		g_object_unref (dest);
-	}
-}
-
-static void
-edit_contact_info_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	if (info == NULL)
-		return;
-
-	g_object_ref (info->dest);
-	e_book_use_default_book (make_contact_editor_cb, (gpointer) info->dest);
-}
-#endif
-
-static void
-change_email_num_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	gint n;
-	EABDestination *dest;
-	
-	if (info == NULL) 
-		return;
-
-	if (! GTK_CHECK_MENU_ITEM (w)->active)
-		return;
-
-	n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "number"));
-
-	if (n != eab_destination_get_email_num (info->dest)) {
-		dest = eab_destination_new ();
-		eab_destination_set_contact (dest, eab_destination_get_contact (info->dest), n);
-		e_select_names_model_replace (info->text_model->source, info->index, dest);
-	}
-}
-
-#if TOO_MANY_MENU_ITEMS
-static void
-remove_recipient_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete (info->text_model->source, info->index);
-}
-
-static void
-remove_all_recipients_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete_all (info->text_model->source);
-}
-
-static void
-toggle_html_mail_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM (w);
-	const EABDestination *dest;
-
-	if (info == NULL)
-		return;
-
-	dest = info->dest;
-
-	item = GTK_CHECK_MENU_ITEM (item);
-	eab_destination_set_html_mail_pref ((EABDestination *) dest, item->active);
-}
-#endif
-
-static void
-populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
-{
-	GtkWidget *image;
-	EContact *contact;
-	GtkWidget *menuitem;
-	GList *email_list;
-
-	contact = eab_destination_get_contact (info->dest);
-
-#if TOO_MANY_MENU_ITEMS
-	menuitem = gtk_separator_menu_item_new();
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	menuitem = gtk_menu_item_new_with_label (_("Remove All"));
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (remove_all_recipients_cb),
-			  info);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	menuitem = gtk_menu_item_new_with_label (_("Remove"));
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (remove_recipient_cb),
-			  info);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	menuitem = gtk_menu_item_new_with_label (list ? _("View Contact List") : _("View Contact Info"));
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (edit_contact_info_cb),
-			  info);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	menuitem = gtk_check_menu_item_new_with_label (_("Send HTML Mail?"));
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					eab_destination_get_html_mail_pref (info->dest));
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (toggle_html_mail_cb),
-			  info);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-#endif
-
-	email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-
-	if (email_list) {
-		menuitem = gtk_separator_menu_item_new();
-		gtk_widget_show (menuitem);
-		gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-		
-		if (g_list_length (email_list) > 1) {
-			GList *l;
-			GSList *radiogroup = NULL;
-			gint n = eab_destination_get_email_num (info->dest);
-			gint j = g_list_length (email_list) - 1;
-
-			for (l = g_list_last (email_list); l; l = l->prev) {
-				char *email = l->data;
-				char *label = NULL;
-
-				if (!strncmp (email, "<?xml", 5)) {
-					EABDestination *dest = eab_destination_import (email);
-					if (dest) {
-						label = g_strdup (eab_destination_get_textrep (dest, TRUE));
-						g_object_unref (dest);
-					}
-				}
-				else {
-					label = g_strdup (email);
-				}
-
-				if (list) {
-					menuitem = gtk_menu_item_new_with_label (label);
-				}
-				else {
-					menuitem = gtk_radio_menu_item_new_with_label (radiogroup, label);
-					g_signal_connect (menuitem, "toggled",
-							  G_CALLBACK (change_email_num_cb),
-							  info);
-					if (j == n) 
-						gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
-
-					g_object_set_data (G_OBJECT (menuitem), "number", GINT_TO_POINTER (j));
-					radiogroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-				}
-
-				gtk_widget_show (menuitem);
-				gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-				j--;
-
-				g_free (label);
-			}
-		} else {
-			menuitem = gtk_menu_item_new_with_label (eab_destination_get_email (info->dest));
-			gtk_widget_show (menuitem);
-			gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-		}
-
-		g_list_foreach (email_list, (GFunc)g_free, NULL);
-		g_list_free (email_list);
-	}
-
-	menuitem = gtk_separator_menu_item_new ();
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	image = gtk_image_new_from_file (list
-					 ? EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME
-					 : EVOLUTION_IMAGESDIR "/" CONTACT_ICON_FILENAME);
-	gtk_widget_show (image);
-	menuitem = gtk_image_menu_item_new_with_label (eab_destination_get_name (info->dest));
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
-				       image);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-}
-
-static void
-quick_add_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_contact_quick_add_free_form (eab_destination_get_address (info->dest), NULL, NULL);
-}
-
-static void
-populate_popup_nocontact (GtkWidget *pop, PopupInfo *info)
-{
-	const gchar *str;
-	GtkWidget *menuitem;
-
-	menuitem = gtk_separator_menu_item_new ();
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	menuitem = gtk_menu_item_new_with_label (_("Add to Contacts"));
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (quick_add_cb),
-			  info);
-
-#if TOO_MANY_MENU_ITEMS
-	menuitem = gtk_check_menu_item_new_with_label (_("Send HTML Mail?"));
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					eab_destination_get_html_mail_pref (info->dest));
-	g_signal_connect (menuitem, "toggled",
-			  G_CALLBACK (toggle_html_mail_cb),
-			  info);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-#endif
-
-	menuitem = gtk_separator_menu_item_new ();
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-
-	str = eab_destination_get_name (info->dest);
-	if (! (str && *str))
-		str = eab_destination_get_email (info->dest);
-	if (! (str && *str))
-		str = _("Unnamed Contact");
-
-	menuitem = gtk_menu_item_new_with_label (str);
-	gtk_widget_show (menuitem);
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
-}
-
-void
-e_select_names_populate_popup (GtkWidget *menu, ESelectNamesTextModel *text_model,
-			       GdkEventButton *ev, gint pos, GtkWidget *for_widget)
-{
-	ESelectNamesModel *model;
-	PopupInfo *info;
-	EABDestination *dest;
-	gint index;
-
-	g_return_if_fail (GTK_IS_MENU_SHELL (menu));
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));
-	g_return_if_fail (ev);
-	g_return_if_fail (0 <= pos);
-
-	model = text_model->source;
-
-	e_select_names_model_text_pos (model, text_model->seplen, pos, &index, NULL, NULL);
-	if (index < 0 || index >= e_select_names_model_count (model))
-		return;
-
-	/* XXX yuck, why does this return a const? */
-	dest = (EABDestination *)e_select_names_model_get_destination (model, index);
-	if (eab_destination_is_empty (dest))
-		return;
-
-	info = popup_info_new (text_model, dest, pos, index);
-	
-	if (eab_destination_get_contact (dest)) {
-		populate_popup_contact (menu, eab_destination_is_evolution_list (dest), info);
-	} else {
-		populate_popup_nocontact (menu, info);
-	}
-
-	/* Clean up our info item after we've made our selection. */
-	g_signal_connect (menu,
-			  "selection-done",
-			  G_CALLBACK (popup_info_cleanup),
-			  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 531275190b..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_SELECT_NAMES_POPUP_H__
-#define __E_SELECT_NAMES_POPUP_H__
-
-#include "e-select-names-text-model.h"
-
-void e_select_names_populate_popup (GtkWidget *menu, ESelectNamesTextModel *text_model,
-				    GdkEventButton *ev, gint pos, GtkWidget *for_widget);
-
-#endif /* __E_SELECT_NAMES_POPUP_H__ */
-
diff --git a/addressbook/gui/component/select-names/e-select-names-section.etspec b/addressbook/gui/component/select-names/e-select-names-section.etspec
deleted file mode 100644
index 9d7b038892..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-section.etspec
+++ /dev/null
@@ -1,7 +0,0 @@
-<ETableSpecification no-headers="true" cursor-mode="line" alternating-row-colors="false">
-  <ETableColumn model_col= "0" _title="Name" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="collate" search="string"/>
-    <ETableState>
-	<column source="0"/>
-	    <grouping> <leaf column="0" ascending="true"/> </grouping>
-    </ETableState>
-</ETableSpecification>
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 aaa6936c8d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,366 +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 <libgnome/gnome-i18n.h>
-#include <libebook/e-contact.h>
-#include "e-select-names-table-model.h"
-
-/* Object argument IDs */
-enum {
-	PROP_0,
-	PROP_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_dispose      (GObject *object);
-static void e_select_names_table_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_select_names_table_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,
-						      ESelectNamesTableModel *model);
-
-static ETableModelClass *parent_class = NULL;
-
-static void
-e_select_names_table_model_add_source (ESelectNamesTableModel *model,
-				       ESelectNamesModel     *source)
-{
-	model->source = source;
-	if (model->source)
-		g_object_ref(model->source);
-	model->source_changed_id = g_signal_connect(model->source, "changed",
-						    G_CALLBACK(e_select_names_table_model_model_changed),
-						    model);
-}
-
-static void
-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)
-{
-	if (model->source_changed_id)
-		g_signal_handler_disconnect(model->source, model->source_changed_id);
-	if (model->source)
-		g_object_unref(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.
- **/
-GType
-e_select_names_table_model_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ESelectNamesTableModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_table_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNamesTableModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_table_model_init,
-		};
-
-		type = g_type_register_static (e_table_model_get_type (), "ESelectNamesTableModel", &info, 0);
-	}
-
-	return 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 = g_object_new (E_TYPE_SELECT_NAMES_TABLE_MODEL, NULL);
-	g_object_set(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 EABDestination *dest = e_select_names_model_get_destination (model->source, i);
-			EContact *contact = dest ? eab_destination_get_contact (dest) : NULL;
-
-			if (contact) {
-				model->data[i].name =  e_contact_get(contact, E_CONTACT_FULL_NAME);
-				if (model->data[i].name == 0)
-					model->data[i].name = g_strdup("");
-				model->data[i].email = e_contact_get(contact, E_CONTACT_EMAIL_1);
-				if (model->data[i].email == 0)
-					model->data[i].email = g_strdup("");
-			} else {
-				const gchar *name = eab_destination_get_name (dest);
-				const gchar *email = eab_destination_get_email (dest);
-
-				model->data[i].name =  g_strdup (name && *name ? name : email);
-				model->data[i].email = g_strdup (email);
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	if (model->data) {
-		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_dispose (GObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 3;
-}
-
-/* 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;
-	case 2:
-		/* underline column*/
-		return (void*)TRUE;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_property (GObject *object, guint prop_id,
-					 const GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(g_value_get_object (value)));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_property (GObject *object, guint prop_id,
-					 GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_SOURCE:
-		g_value_set_object (value, model->source);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		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)
-{
-	GObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_select_names_table_model_dispose;
-	object_class->get_property = e_select_names_table_model_get_property;
-	object_class->set_property = e_select_names_table_model_set_property;
-
-	g_object_class_install_property (object_class, PROP_SOURCE, 
-					 g_param_spec_object ("source",
-							      _("Source"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_SELECT_NAMES_MODEL,
-							      G_PARAM_READWRITE));
-
-	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 1fd1026f19..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)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))
-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (G_TYPE_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 */			      
-GType       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 e885de5bf6..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,852 +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 <libgnome/gnome-i18n.h>
-
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include "e-select-names-text-model.h"
-#include "eab-gui-util.h"
-
-static FILE *out = NULL; /* stream for debugging spew */
-
-/* Object argument IDs */
-enum {
-	PROP_0,
-	PROP_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_dispose      (GObject *object);
-static void e_select_names_text_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_select_names_text_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-static void e_select_names_text_model_set_source (ESelectNamesTextModel *model, ESelectNamesModel *source);
-
-static const gchar *e_select_names_text_model_get_text      (ETextModel *model);
-static void         e_select_names_text_model_set_text      (ETextModel *model, const gchar *text);
-static void         e_select_names_text_model_insert        (ETextModel *model, gint position, const gchar *text);
-static void         e_select_names_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);
-static void         e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static gint         e_select_names_text_model_obj_count   (ETextModel *model);
-static const gchar *e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len);
-static void         e_select_names_text_model_activate_obj (ETextModel *model, gint n);
-
-
-static ETextModelClass *parent_class;
-#define PARENT_TYPE e_text_model_get_type()
-
-/**
- * e_select_names_text_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTextModel class.
- **/
-GtkType
-e_select_names_text_model_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ESelectNamesTextModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_text_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNamesTextModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_text_model_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "ESelectNamesTextModel", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)
-{
-	GObjectClass *object_class;
-	ETextModelClass *text_model_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	text_model_class = E_TEXT_MODEL_CLASS(klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_select_names_text_model_dispose;
-	object_class->get_property = e_select_names_text_model_get_property;
-	object_class->set_property = e_select_names_text_model_set_property;
-
-	g_object_class_install_property (object_class, PROP_SOURCE, 
-					 g_param_spec_object ("source",
-							      _("Source"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_SELECT_NAMES_MODEL,
-							      G_PARAM_READWRITE));
-
-	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_contact (model, i) ? "<contact>" : "");
-	fprintf (out, "\n");
-}
-
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-	const gchar *default_sep;
-
-	model->last_magic_comma_pos = -1;
-
-	if (getenv ("EVOLUTION_DISABLE_MAGIC_COMMA"))
-		default_sep = ",";
-	else
-		default_sep = ", ";
-
-	e_select_names_text_model_set_separator (model, default_sep);
-}
-
-static void
-e_select_names_text_model_dispose (GObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	if (model->text) {
-		g_free (model->text);
-		model->text = NULL;
-	}
-	if (model->sep) {
-		g_free (model->sep);
-		model->sep = NULL;
-	}
-	
-	e_select_names_text_model_set_source (model, NULL);
-	
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-static void
-e_select_names_text_model_set_property (GObject *object, guint prop_id,
-					 const GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_SOURCE:
-		e_select_names_text_model_set_source(model, E_SELECT_NAMES_MODEL (g_value_get_object(value)));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_select_names_text_model_get_property (GObject *object, guint prop_id,
-					 GValue *value, GParamSpec *pspec)
-{
-	ESelectNamesTextModel *model;
-
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_SOURCE:
-		g_value_set_object (value, model->source);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-resize_cb (ESelectNamesModel *source, gint index, gint old_len, gint new_len, ETextModel *model)
-{
-	EReposDeleteShift repos_del;
-	EReposInsertShift repos_ins;
-	gint pos;
-	gint seplen = E_SELECT_NAMES_TEXT_MODEL (model)->seplen;
-
-	e_select_names_model_name_pos (source, seplen, index, &pos, NULL);
-
-	if (new_len < old_len) {
-
-		repos_del.model = model;
-		repos_del.pos = pos;
-		repos_del.len = old_len - new_len;
-		e_text_model_reposition (model, e_repos_delete_shift, &repos_del);
-
-	} else if (old_len < new_len) {
-
-		repos_ins.model = model;
-		repos_ins.pos = pos;
-		repos_ins.len = new_len - old_len;
-		e_text_model_reposition (model, e_repos_insert_shift, &repos_ins);
-
-	}
-}
-
-static void
-changed_cb (ESelectNamesModel *source, ETextModel *model)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	
-	g_free (text_model->text);
-	text_model->text = NULL;
-
-	e_text_model_changed (model);
-}
-
-
-static void
-e_select_names_text_model_set_source (ESelectNamesTextModel *model,
-				      ESelectNamesModel     *source)
-{
-	if (source == model->source)
-		return;
-	
-	if (model->source) {
-		g_signal_handler_disconnect (model->source, model->source_changed_id);
-		g_signal_handler_disconnect (model->source, model->source_resize_id);
-		g_object_unref (model->source);
-	}
-
-	model->source = source;
-
-	if (model->source) {
-		g_object_ref (model->source);
-		model->source_changed_id = g_signal_connect (model->source,
-							     "changed",
-							     G_CALLBACK (changed_cb),
-							     model);
-		model->source_resize_id = g_signal_connect (model->source,
-							    "resized",
-							    G_CALLBACK (resize_cb),
-							    model);
-	}
-}
-
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = g_object_new (E_TYPE_SELECT_NAMES_TEXT_MODEL, NULL);
-	e_select_names_text_model_set_source (E_SELECT_NAMES_TEXT_MODEL (model), source);
-	return model;
-}
-
-void
-e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));
-	g_return_if_fail (sep && *sep);
-
-	g_free (model->sep);
-	model->sep = g_strdup (sep);
-	model->seplen = g_utf8_strlen (sep, -1);
-}
-
-static const gchar *
-e_select_names_text_model_get_text (ETextModel *model)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	if (snm == NULL)
-		return "";
-	else if (snm->text == NULL)
-		snm->text = e_select_names_model_get_textification (snm->source, snm->sep);
-
-	return snm->text;
-}
-
-static void
-e_select_names_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	e_select_names_model_delete_all (snm->source);
-	e_select_names_text_model_insert (model, 0, text);
-}
-
-static void
-e_select_names_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{
-	e_select_names_text_model_insert_length (model, position, text, g_utf8_strlen (text, -1));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gchar *text, gint length)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-	const char *t;
-	gchar *tmp;
-
-	if (out) {
-		tmp = g_strndup (text, length);
-		fprintf (out, ">> insert  \"%s\" (len=%d) at %d\n", tmp, length, pos);
-		g_free (tmp);
-	}
-
-	tmp = e_select_names_model_get_textification (source, text_model->sep);
-	pos = CLAMP (pos, 0, g_utf8_strlen (tmp, -1));
-	g_free (tmp);
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	g_signal_handler_block (source, text_model->source_resize_id);
-
-	/* We handle this one character at a time. */
-
-	for (t = text; length >= 0; t = g_utf8_next_char (t), length--) {
-		gint index, start_pos, text_len;
-		gboolean inside_quote = FALSE;
-		gunichar ut = g_utf8_get_char (t);
-
-		if (ut == 0)
-			break;
-
-		text_model->last_magic_comma_pos = -1;
-
-		if (out) 
-			fprintf (out, "processing [%d]\n", ut);
-
-		e_select_names_model_text_pos (source, text_model->seplen, pos, &index, &start_pos, &text_len);
-
-		if (out) 
-			fprintf (out, "index=%d start_pos=%d text_len=%d\n", index, start_pos, text_len);
-
-		/* Is this a quoted or an unquoted separator we are dealing with? */
-		if (ut == g_utf8_get_char(text_model->sep) && index >= 0) {
-			const EABDestination *dest = e_select_names_model_get_destination (source, index);
-			if (dest) {
-				const gchar *str = eab_destination_get_textrep (dest, FALSE);
-				int j;
-				const char *jp;
-
-				if (out)
-					fprintf (out, "str=%s pos=%d\n", str, pos);
-
-				for (jp = str, j = 0; j<pos-start_pos && *jp; jp = g_utf8_next_char (jp), ++j) {
-					if (*jp == '"') {
-						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 (ut == g_utf8_get_char (text_model->sep) && !inside_quote) {
-
-			/* This is the case of hitting , first thing in an empty entry */
-			if (index == -1) {
-				EReposAbsolute repos;
-				
-				e_select_names_model_insert (source, 0, eab_destination_new ());
-				e_select_names_model_insert (source, 0, eab_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, eab_destination_new ());
-
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = text_model->seplen;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-					pos += text_model->seplen;
-				} 
-
-			} else {
-				EReposInsertShift repos;
-				gint offset = MAX (pos - start_pos, 0);
-				const gchar *str = e_select_names_model_get_string (source, index);
-				gchar *str1 = g_strndup (str, offset);
-				gchar *str2 = g_strdup (str+offset);
-				EABDestination *d1 = eab_destination_new (), *d2 = eab_destination_new ();
-
-				eab_destination_set_raw (d1, str1);
-				eab_destination_set_raw (d2, str2);
-
-				e_select_names_model_replace (source, index, d1);
-				e_select_names_model_insert (source, index+1, d2);
-
-				g_free (str1);
-				g_free (str2);
-
-				repos.model = model;
-				repos.pos = pos;
-				repos.len = text_model->seplen;
-				e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				pos += text_model->seplen;
-			}
-
-			if (text_model->seplen > 1)
-				text_model->last_magic_comma_pos = pos;
-
-		} else {
-			EReposInsertShift repos;
-			gint offset = MAX (pos - start_pos, 0);
-			const gchar *str;
-			GString *new_str = g_string_new (NULL);
-			gint this_length = 1;
-			gboolean whitespace = g_unichar_isspace (ut);
-
-			str = index >= 0 ? e_select_names_model_get_string (source, index) : NULL;
-			if (str && *str) {
-				if (pos <= start_pos) {
-					if (whitespace) {
-						/* swallow leading whitespace */
-						this_length = 0;
-					} else {
-						/* Adjust for our "magic white space" */
-						/* FIXME: This code does the wrong thing if seplen > 2 */
-						g_string_append_unichar (new_str, ut);
-						g_string_append (new_str, pos < start_pos ? " " : "");
-						g_string_append (new_str, str);
-						if (pos < start_pos)
-							++this_length;
-					}
-				} else {
-					const char *u;
-					int n;
-					for (u = str, n = 0; n < offset; u = g_utf8_next_char (u), n++) 
-						g_string_append_unichar (new_str, g_utf8_get_char (u));
-					g_string_append_unichar (new_str, ut);
-					g_string_append (new_str, u);
-				}
-			} else {
-				if (whitespace) {
-					/* swallow leading whitespace */
-					this_length = 0;
-				} else {
-					g_string_append_unichar (new_str, ut);
-				}
-			}
-
-			if (new_str->len) {
-
-				EABDestination *dest;
-				dest = index >= 0 ? eab_destination_copy (e_select_names_model_get_destination (source, index)) : eab_destination_new ();
-				eab_destination_set_raw (dest, new_str->str);
-				e_select_names_model_replace (source, index, dest);
-				
-				/* e_select_names_model_replace (source, index, dest); */
-
-				if (this_length > 0) {
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = this_length;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-
-					pos += this_length;
-				}
-			}
-			g_string_free (new_str, TRUE);
-		}
-	}
-
-	dump_model (text_model);
-
-	g_signal_handler_unblock (source, text_model->source_resize_id);
-}
-
-
-static void
-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-	gint index, start_pos, text_len, offset;
-		
-	if (out) {
-		const gchar *str = e_select_names_model_get_textification (source, text_model->sep);
-		gint i, len;
-
-		fprintf (out, ">> delete %d at pos %d\n", length, pos);
-
-		len = strlen (str);
-		for (i=0; i<pos && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "[");
-		for (i=pos; i<pos+length && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "]");
-		for (i=pos+length; i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "\n");
-	}
-
-	if (length < 0)
-		return;
-
-	if (text_model->last_magic_comma_pos == pos+1 && length == 1) {
-		pos -= text_model->seplen-1;
-		if (pos >= 0)
-			length = text_model->seplen;
-		text_model->last_magic_comma_pos = -1;
-	}
-
-	e_select_names_model_text_pos (source, text_model->seplen, pos, &index, &start_pos, &text_len);
-
-	if (out) 
-		fprintf (out, "index=%d, start_pos=%d, text_len=%d\n", index, start_pos, text_len);
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	g_signal_handler_block (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;
-			EABDestination *new_dest;
-			const gchar *str1 = e_select_names_model_get_string (source, index);
-			const gchar *str2 = e_select_names_model_get_string (source, index+1);
-			gchar *new_str;
-
-			while (str1 && *str1 && isspace ((gint) *str1))
-				++str1;
-			while (str2 && *str2 && isspace ((gint) *str2))
-				++str2;
-			
-			if (str1 && str2)
-				new_str = g_strdup_printf ("%s%s%s", str1, text_model->sep+1, str2);
-			else if (str1)
-				new_str = g_strdup (str1);
-			else if (str2)
-				new_str = g_strdup (str2);
-			else
-				new_str = g_strdup ("");
-
-			if (out)
-				fprintf (out, "joining \"%s\" and \"%s\" to \"%s\"\n", str1, str2, new_str);
-
-			e_select_names_model_delete (source, index+1);
-
-			new_dest = eab_destination_new ();
-			eab_destination_set_raw (new_dest, new_str);
-			e_select_names_model_replace (source, index, new_dest);
-			g_free (new_str);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_model->seplen;
-
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			if (length > 1)
-				e_select_names_text_model_delete (model, pos, length-1);
-		} else {
-			/* If we are at the end of the last entry (which we must be if we end up in this block),
-			   we can just do nothing.  So this else-block is here just to give us a place to
-			   put this comment. */
-		}
-
-		goto finished;
-	}
-	
-	if (pos + length > start_pos + text_len) {
-		/* Uh oh... our changes straddle two objects. */
-
-		if (pos == start_pos) { /* Delete the whole thing */
-			EReposDeleteShift repos;
-		
-			e_select_names_model_delete (source, index);
-
-			if (out) 
-				fprintf (out, "deleted all of %d\n", index);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_len + text_model->seplen;
-		
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			length -= text_len + text_model->seplen;
-			if (length > 0)
-				e_select_names_text_model_delete (model, pos, length);
-
-		} else {
-			/* Delete right up to the end, and then call e_select_names_text_model_delete again
-			   to finish the job. */
-			gint len1, len2;
-			
-			len1 = text_len - (pos - start_pos);
-			len2 = length - len1;
-
-			if (out) 
-				fprintf (out, "two-stage delete: %d, %d\n", len1, len2);
-
-
-			e_select_names_text_model_delete (model, pos, len1);
-			e_select_names_text_model_delete (model, pos, len2);
-		}
-
-		goto finished;
-	}
-
-	/* Our changes are confined to just one entry. */
-	if (length > 0) {
-		const gchar *str;
-		gchar *new_str;
-		
-		offset = pos - start_pos;
-		
-		str = e_select_names_model_get_string (source, index);
-
-		if (str) {
-			const char *p;
-			char *np;
-			int i;
-			EReposDeleteShift repos;
-			EABDestination *dest;
-
-			new_str = g_new0 (char, strlen (str) * 6 + 1); /* worse case it can't be any longer than this */
-
-			/* copy the region before the deletion */
-			for (p = str, i = 0, np = new_str; i < offset; i++) {
-				gunichar ch;
-
-				ch = g_utf8_get_char (p);
-				g_unichar_to_utf8 (ch, np);
-
-				np = g_utf8_next_char (np);
-				p = g_utf8_next_char (p);
-			}
-
-			/* skip the deleted segment */
-			for (i = 0; i < length; i++)
-				p = g_utf8_next_char (p);
-
-			/* copy the region after the deletion */
-			for (; *p; p = g_utf8_next_char (p)) {
-				gunichar ch;
-
-				ch = g_utf8_get_char (p);
-				g_unichar_to_utf8 (ch, np);
-
-				np = g_utf8_next_char (np);
-			}
-
-			dest = index >= 0 ? eab_destination_copy (e_select_names_model_get_destination (source, index)) : eab_destination_new ();
-			eab_destination_set_raw (dest, new_str);
-			e_select_names_model_replace (source, index, dest);
-			
-			if (out)
-				fprintf (out, "new_str: \"%s\"\n", new_str);
-
-			g_free (new_str);
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = length;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-			
-		} else {
-			EReposDeleteShift repos;
-			
-			e_select_names_model_delete (source, index);
-			
-			if (out)
-				fprintf (out, "deleted %d\n", index);
-
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_model->seplen;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-		}
-	}
-
- finished:
-	E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = -1;
-	g_signal_handler_unblock (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 EABDestination *dest;
-		--i;
-		dest = e_select_names_model_get_destination (source, i);
-		if (eab_destination_get_contact (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 EABDestination *dest = e_select_names_model_get_destination (source, i);
-		if (eab_destination_get_contact (dest))
-			--n;
-		++i;
-	} while (n >= 0 && i < N);
-
-	if (i <= N)
-		--i;
-	else
-		i = -1;
-
-	return i;
-}
-
-static const gchar *
-e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len)
-{
-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);
-	ESelectNamesModel *source = text_model->source;
-	gint i, pos;
-
-	i = nth_obj_index (source, n);
-	if (i < 0)
-		return NULL;
-	
-	e_select_names_model_name_pos (source, text_model->seplen, i, &pos,  len);
-	if (pos < 0)
-		return NULL;
-	
-	if (text_model->text == NULL)
-		text_model->text = e_select_names_model_get_textification (source, text_model->sep);
-	return g_utf8_offset_to_pointer (text_model->text, pos);
-}
-
-static void
-e_select_names_text_model_activate_obj (ETextModel *model, gint n)
-{
-#if notyet
-	/* XXX the new ebook doesn't have e_contact_get_book, and we
-	   don't really want to add it, so this can't be implemented
-	   this simply anymore */
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	EContact *contact;
-	gint i;
-
-	i = nth_obj_index (source, n);
-	g_return_if_fail (i >= 0);
-
-	contact = e_select_names_model_get_contact (source, i);
-	g_return_if_fail (contact != NULL);
-	
-	/* present read-only contact editor when someone double clicks from here */
-	if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-		EContactListEditor *ce;
-		ce = e_addressbook_show_contact_list_editor (e_contact_get_book(contact), contact, FALSE, FALSE);
-		e_contact_list_editor_raise (ce);
-	}
-	else {
-		EABContactEditor *ce;
-		ce = e_addressbook_show_contact_editor (e_contact_get_book(contact), contact, FALSE, FALSE);
-		e_contact_editor_raise (ce);
-	}
-#endif
-}
-
-
-
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 eec062aee6..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <gtk/gtkobject.h>
-#include <gal/e-text/e-text-model.h>
-#include "e-select-names-model.h"
-
-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))
-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-
-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;
-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;
-
-struct _ESelectNamesTextModel {
-	ETextModel parent;
-
-	ESelectNamesModel *source;
-	gint source_changed_id;
-	gint source_resize_id;
-
-	gchar *text;
-
-	gchar *sep;
-	gint seplen;
-	
-	gint last_magic_comma_pos;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new           (ESelectNamesModel *source);
-void        e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep);
-
-/* Standard Gtk function */			      
-GType       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 3925857447..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,845 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-without.h>
-#include <gal/widgets/e-popup-menu.h>
-
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/widgets/e-addressbook-table-adapter.h>
-#include <addressbook/util/eab-book-util.h>
-#include <addressbook/gui/component/addressbook-component.h>
-#include <addressbook/gui/component/addressbook.h>
-
-#include "e-select-names-config.h"
-#include "e-select-names.h"
-#include "e-select-names-table-model.h"
-#include <gal/widgets/e-categories-master-list-option-menu.h>
-#include <gal/e-text/e-entry.h>
-#include <e-util/e-categories-master-list-wombat.h>
-#include "e-util/e-sexp.h"
-
-static void e_select_names_init		(ESelectNames		 *names);
-static void e_select_names_class_init	(ESelectNamesClass	 *klass);
-static void e_select_names_dispose (GObject *object);
-static void update_query (GtkWidget *widget, ESelectNames *e_select_names);
-
-static void sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl);
-
-static GtkDialogClass *parent_class = NULL;
-#define PARENT_TYPE gtk_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char                   *title;
-	ESelectNamesModel      *source;
-	ESelectNamesTableModel *table_model;
-	ESelectNames           *names;
-	GtkWidget              *label;
-	GtkWidget              *button;
-	GtkWidget              *recipient_table;
-	gulong                  changed_id;
-} ESelectNamesChild;
-
-GType
-e_select_names_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (ESelectNamesClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_select_names_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (ESelectNames),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_select_names_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "ESelectNames", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_class_init (ESelectNamesClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_select_names_dispose;
-}
-
-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);
-
-static void
-search_result (EABModel *model, EBookViewStatus status, ESelectNames *esn)
-{
-	sync_table_and_models (NULL, esn);
-}
-
-static void
-set_book(EBook *book, EBookStatus status, ESelectNames *esn)
-{
-	g_object_set(esn->model,
-		     "book", book,
-		     NULL);
-	update_query (NULL, esn);
-	g_object_unref(book);
-	g_object_unref(esn->model);
-	g_object_unref(esn);
-}
-
-static ESource *
-find_first_source (ESourceList *source_list)
-{
-	GSList *groups, *sources, *l, *m;
-			
-	groups = e_source_list_peek_groups (source_list);
-	for (l = groups; l; l = l->next) {
-		ESourceGroup *group = l->data;
-				
-		sources = e_source_group_peek_sources (group);
-		for (m = sources; m; m = m->next) {
-			ESource *source = m->data;
-
-			return source;
-		}				
-	}
-
-	return NULL;
-}
-
-static void
-addressbook_model_set_source (ESelectNames *e_select_names, EABModel *model, ESource *source)
-{
-	EBook *book;
-
-	book = e_book_new();
-
-	g_object_ref(e_select_names);
-	g_object_ref(model);
-
-	addressbook_load_source (book, source, (EBookCallback) set_book, e_select_names);
-}
-
-static void *
-contact_key (const EContact *contact)
-{
-	EBook *book = NULL;
-	const gchar *book_uri;
-	
-	if (contact == NULL)
-		return NULL;
-
-	g_assert (E_IS_CONTACT (contact));
-
-#if notyet
-	/* XXX we need a way to reproduce this here somehow.. or at
-	   least make sure we never collide between two contacts in
-	   different books. */
-	book = e_contact_get_book (contact);
-#endif
-	book_uri = book ? e_book_get_uri (book) : "NoBook";
-	return g_strdup_printf ("%s|%s", book_uri ? book_uri : "NoURI", (char*)e_contact_get_const ((EContact*)contact, E_CONTACT_UID));
-}
-
-static void
-sync_one_model (gpointer k, gpointer val, gpointer closure)
-{
-	ETableWithout *etw = E_TABLE_WITHOUT (closure);
-	ESelectNamesChild *child = val;
-	ESelectNamesModel *model = child->source;
-	gint i, count;
-	EContact *contact;
-	void *key;
-	
-	count = e_select_names_model_count (model);
-	for (i = 0; i < count; ++i) {
-		contact = e_select_names_model_get_contact (model, i);
-		if (contact) {
-			key = contact_key (contact);
-			e_table_without_hide (etw, key);
-			g_free (key);
-		}
-	}
-}
-
-static void
-sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl)
-{
-	e_table_without_show_all (E_TABLE_WITHOUT (esl->without));
-	g_hash_table_foreach (esl->children, sync_one_model, esl->without);
-}
-
-static void
-real_add_address_cb (int model_row, gpointer closure)
-{
-	ESelectNamesChild *child = closure;
-	ESelectNames *names = child->names;
-	const EContact *contact;
-	EABDestination *dest = eab_destination_new ();
-	gint mapped_row;
-
-	mapped_row = e_table_subset_view_to_model_row (E_TABLE_SUBSET (names->without), model_row);
-
-	contact = eab_model_contact_at (EAB_MODEL(names->model), mapped_row);
-	
-	if (contact != NULL) {
-		eab_destination_set_contact (dest, (EContact*)contact, 0);
-
-		e_select_names_model_append (child->source, dest);
-		e_select_names_model_clean (child->source, FALSE);
-	}
-}
-
-static void
-real_add_address(ESelectNames *names, ESelectNamesChild *child)
-{
-	e_select_names_model_freeze (child->source);
-	e_table_selected_row_foreach(e_table_scrolled_get_table(names->table),
-				     real_add_address_cb, child);
-	e_select_names_model_thaw (child->source);
-}
-
-static void
-add_address(ETable *table, int row, int col, GdkEvent *event, ESelectNames *names)
-{
-	ESelectNamesChild *child;
-
-	child = g_hash_table_lookup(names->children, names->def);
-	if (child) {
-		real_add_address(names, child);
-	}
-}
-
-static void
-sensitize_button (gpointer key, gpointer data, gpointer user_data)
-{
-	gboolean *sensitive = user_data;
-	ESelectNamesChild *child = data;
-
-	gtk_widget_set_sensitive (child->button, *sensitive);
-}
-
-static void
-selection_change (ETable *table, ESelectNames *names)
-{
-	gboolean sensitive;
-
-	sensitive = e_table_selected_count (table) > 0;
-
-	g_hash_table_foreach (names->children, sensitize_button, &sensitive);
-}
-
-static void *
-esn_get_key_fn (ETableModel *source, int row, void *closure)
-{
-	EABModel *model = EAB_MODEL (closure);
-	const EContact *contact = eab_model_contact_at (model, row);
-	void *key = contact_key (contact);
-	return key;
-}
-
-static void *
-esn_dup_key_fn (const void *key, void *closure)
-{
-	void *dup = (void *) g_strdup ((const gchar *) key);
-	return dup;
-}
-
-static void
-esn_free_gotten_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-static void
-esn_free_duped_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *adapter;
-	ETableModel *without;
-	EABModel *model;
-	GtkWidget *table;
-
-	model = eab_model_new ();
-	adapter = E_TABLE_MODEL (eab_table_adapter_new (model));
-
-	g_object_set(model,
-		     "editable", FALSE,
-		     NULL);
-
-	without = e_table_without_new (adapter,
-				       g_str_hash,
-				       g_str_equal,
-				       esn_get_key_fn,
-				       esn_dup_key_fn,
-				       esn_free_gotten_key_fn,
-				       esn_free_duped_key_fn,
-				       model);
-
-	table = e_table_scrolled_new_from_spec_file (without,
-						     NULL,
-						     EVOLUTION_ETSPECDIR "/e-select-names.etspec",
-						     NULL);
-
-	g_object_set_data(G_OBJECT(table), "adapter", adapter);
-	g_object_set_data(G_OBJECT(table), "without", without);
-	g_object_set_data(G_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-source_selected (ESourceOptionMenu *menu, ESource *source, ESelectNames *e_select_names)
-{
-	addressbook_model_set_source (e_select_names, e_select_names->model, source);
-	e_select_names_config_set_last_completion_book (e_source_peek_uid (source));
-}
-
-static void
-update_query (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	char *category = "";
-	const char *search = "";
-	char *query;
-	char *q_array[4];
-	int i;
-	GString *s = g_string_new ("");
-
-	if (e_select_names->categories) {
-		category = e_categories_master_list_option_menu_get_category (E_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories));
-	}
-	if (e_select_names->select_entry) {
-		search = gtk_entry_get_text (GTK_ENTRY (e_select_names->select_entry));
-	}
-
-	e_sexp_encode_string (s, search);
-
-	i = 0;
-	q_array[i++] = "(contains \"email\" \"\")";
-	if (category && *category)
-		q_array[i++] = g_strdup_printf ("(is \"category\" \"%s\")", category);
-	if (search && *search)
-		q_array[i++] = g_strdup_printf ("(or (beginswith \"email\" %s) "
-						"    (beginswith \"full_name\" %s) "
-						"    (beginswith \"nickname\" %s)"
-						"    (beginswith \"file_as\" %s))",
-						s->str, s->str, s->str, s->str);
-	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]);
-	}
-	g_object_set (e_select_names->model,
-		      "query", query,
-		      NULL);
-	for (i = 1; q_array[i]; i++) {
-		g_free (q_array[i]);
-	}
-	g_free (query);
-	g_string_free (s, TRUE);
-}
-
-static void
-status_message (EABModel *model, const gchar *message, ESelectNames *e_select_names)
-{
-	if (message == NULL)
-		gtk_label_set_text (GTK_LABEL (e_select_names->status_message), "");
-	else
-		gtk_label_set_text (GTK_LABEL (e_select_names->status_message), message);
-}
-
-static void
-categories_changed (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	update_query (widget, e_select_names);
-}
-
-static void
-select_entry_changed (GtkWidget *widget, ESelectNames *e_select_names)
-{
-	if (e_select_names->select_entry) {
-		const char *select_string = gtk_entry_get_text (GTK_ENTRY (e_select_names->select_entry));
-		char *select_strcoll_string = g_utf8_collate_key (select_string, -1);
-		int count;
-		ETable *table;
-		int i;
-
-		table = e_table_scrolled_get_table (e_select_names->table);
-
-		count = e_table_model_row_count (e_select_names->without);
-
-		for (i = 0; i < count; i++) {
-			int model_row = e_table_view_to_model_row (table, i);
-			char *row_strcoll_string =
-				g_utf8_collate_key (e_table_model_value_at (e_select_names->without,
-									    E_CONTACT_FULL_NAME,
-									    model_row),
-						    -1);
-			if (g_utf8_collate (select_strcoll_string, row_strcoll_string) <= 0) {
-				g_free (row_strcoll_string);
-				break;
-			}
-			g_free (row_strcoll_string);
-		}
-		g_free (select_strcoll_string);
-		if (i == count)
-			i --;
-
-		if (count > 0) {
-			i = e_table_view_to_model_row (table, i);
-			e_table_set_cursor_row (table, i);
-		}
-	}
-}
-
-GtkWidget *e_select_names_create_categories (gchar *name,
-					     gchar *string1, gchar *string2,
-					     gint int1, gint int2);
-
-GtkWidget *
-e_select_names_create_categories (gchar *name,
-				  gchar *string1, gchar *string2,
-				  gint int1, gint int2)
-{
-	ECategoriesMasterList *ecml;
-	GtkWidget *option_menu;
-
-	ecml = e_categories_master_list_wombat_new ();
-	option_menu = e_categories_master_list_option_menu_new (ecml);
-	g_object_unref (ecml);
-
-	return option_menu;
-}
-
-static void
-clear_widget (gpointer data, GObject *where_object_was)
-{
-	GtkWidget **widget_ref = data;
-	*widget_ref = NULL;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget, *button, *table, *esom;
-	ESource *source = NULL;
-	char *uid;
-	
-	/* FIXME What to do on error/NULL ? */
-	e_select_names->source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL, NULL);
-	e_select_names->gui = gui;
-
-	/* Add the source menu */
-	esom = e_source_option_menu_new (e_select_names->source_list);
-	g_signal_connect (esom, "source_selected", G_CALLBACK (source_selected), e_select_names);
-	gtk_widget_show (esom);
-
-	table = glade_xml_get_widget (gui, "show_contacts_table");
-	gtk_table_attach (GTK_TABLE (table), esom, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
-	/* Set up the rest of the widgets */
-	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_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(e_select_names)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_select_names),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_dialog_set_default_response (GTK_DIALOG (e_select_names),
-					 GTK_RESPONSE_OK);
-
-	gtk_container_set_border_width (GTK_CONTAINER (e_select_names), 12);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (e_select_names)->vbox), 6);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (e_select_names)->action_area), 12);
-
-	gtk_window_set_modal (GTK_WINDOW (e_select_names), TRUE);
-
-	gtk_window_set_title(GTK_WINDOW(e_select_names), _("Select Contacts from Addressbook")); 
-	gtk_window_set_resizable(GTK_WINDOW(e_select_names), TRUE);
-
-	e_select_names->table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));
-	e_select_names->model = g_object_get_data(G_OBJECT(e_select_names->table), "model");
-	e_select_names->adapter = g_object_get_data(G_OBJECT(e_select_names->table), "adapter");
-	e_select_names->without = g_object_get_data(G_OBJECT(e_select_names->table), "without");
-	gtk_widget_show (GTK_WIDGET (e_select_names->table));
-
-	e_select_names->status_message = glade_xml_get_widget (gui, "status-message");
-	if (e_select_names->status_message && !GTK_IS_LABEL (e_select_names->status_message))
-		e_select_names->status_message = NULL;
-	if (e_select_names->status_message) {
-		e_select_names->status_id = g_signal_connect (e_select_names->model, "status_message",
-							      G_CALLBACK (status_message), e_select_names);
-		g_object_weak_ref (G_OBJECT (e_select_names->status_message), clear_widget, &e_select_names->status_message);
-	}
-
-	e_select_names->search_id = g_signal_connect (e_select_names->model,
-						      "search_result", G_CALLBACK (search_result),
-						      e_select_names);
-
-	e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
-	if (e_select_names->categories && !E_IS_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories))
-		e_select_names->categories = NULL;
-	if (e_select_names->categories) {
-		g_signal_connect(e_select_names->categories, "changed",
-				 G_CALLBACK(categories_changed), e_select_names);
-		g_object_weak_ref (G_OBJECT (e_select_names->categories), clear_widget, &e_select_names->categories);
-	}
-	gtk_widget_show (e_select_names->categories);
-
-	e_select_names->select_entry = glade_xml_get_widget (gui, "entry-select");
-	if (e_select_names->select_entry && !GTK_IS_ENTRY (e_select_names->select_entry))
-		e_select_names->select_entry = NULL;
-	if (e_select_names->select_entry) {
-		g_signal_connect(e_select_names->select_entry, "changed",
-				 G_CALLBACK(select_entry_changed), e_select_names);
-		g_signal_connect(e_select_names->select_entry, "activate",
-				 G_CALLBACK(update_query), e_select_names);
-		g_object_weak_ref (G_OBJECT (e_select_names->select_entry), clear_widget, &e_select_names->select_entry);
-	}
-
-	button  = glade_xml_get_widget (gui, "button-find");
-	if (button && GTK_IS_BUTTON (button))
-		g_signal_connect(button, "clicked",
-				 G_CALLBACK(update_query), e_select_names);
-
-	g_signal_connect (e_table_scrolled_get_table (e_select_names->table), "double_click",
-			  G_CALLBACK (add_address), e_select_names);
-	g_signal_connect (e_table_scrolled_get_table (e_select_names->table), "selection_change",
-			  G_CALLBACK (selection_change), e_select_names);
-	selection_change (e_table_scrolled_get_table (e_select_names->table), e_select_names);
-
-	/* Select a source for to display initially */
-	uid = e_select_names_config_get_last_completion_book ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (e_select_names->source_list, uid);
-		g_free (uid);
-	}
-	
-	if (!source)	
-		source = find_first_source (e_select_names->source_list);
-
-	/* FIXME What if we still can't find a source? */
-	e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source);
-
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	g_signal_handler_disconnect(child->source, child->changed_id);
-
-	g_free(child->title);
-	g_object_unref(child->table_model);
-	g_object_unref(child->source);
-	g_free(key);
-	g_free(child);
-}
-
-static void
-e_select_names_dispose (GObject *object)
-{
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-
-	if (e_select_names->source_list) {
-		g_object_unref (e_select_names->source_list);
-		e_select_names->source_list = NULL;
-	}
-	
-	if (e_select_names->status_id) {
-		g_signal_handler_disconnect(e_select_names->model, e_select_names->status_id);
-		e_select_names->status_id = 0;
-	}
-
-	if (e_select_names->search_id) {
-		g_signal_handler_disconnect(e_select_names->model, e_select_names->search_id);
-		e_select_names->search_id = 0;
-	}
-
-	if (e_select_names->gui) {
-		g_object_unref(e_select_names->gui);
-		e_select_names->gui = NULL;
-	}
-
-	if (e_select_names->children) {
-		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);
-		e_select_names->children = NULL;
-	}
-
-	if (e_select_names->without) {
-		g_object_unref(e_select_names->without);
-		e_select_names->without = NULL;
-	}
-	if (e_select_names->adapter) {
-		g_object_unref(e_select_names->adapter);
-		e_select_names->adapter = NULL;
-	}
-	if (e_select_names->model) {
-		g_object_unref(e_select_names->model);
-		e_select_names->model = NULL;
-	}
-
-	if (e_select_names->def) {
-		g_free(e_select_names->def);
-		e_select_names->def = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-GtkWidget*
-e_select_names_new (void)
-{
-	ESelectNames *e_select_names;
-	
-	e_select_names = g_object_new (E_TYPE_SELECT_NAMES, NULL);
-
-	return GTK_WIDGET (e_select_names);
-}
-
-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 {
-	ESelectNamesChild *child;
-	int row;
-};
-typedef struct _RightClickData RightClickData;
-
-static void
-remove_cb (GtkWidget *widget, void *data)
-{
-	RightClickData *rcdata = (RightClickData *)data;
-
-	e_select_names_model_delete (rcdata->child->source, rcdata->row);
-
-	/* Free everything we've created */
-	g_free (rcdata);
-}
-
-static void
-section_right_click_cb (ETable *et, int row, int col, GdkEvent *ev, ESelectNamesChild *child)
-{
-	static EPopupMenu right_click_menu[] = {
-		E_POPUP_ITEM (N_("Remove"), G_CALLBACK (remove_cb), 0),
-		E_POPUP_TERMINATOR
-	};
-	RightClickData *rcdata = g_new0 (RightClickData, 1);
-
-	rcdata->row = row;
-	rcdata->child = child;
-
-	e_popup_menu_run (right_click_menu, (GdkEvent *)ev, 0, 0, rcdata);
-}
-
-void
-e_select_names_add_section (ESelectNames *e_select_names,
-			    const char *name, const char *id,
-			    ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *label;
-	GtkWidget *alignment;
-	GtkTable *table;
-	char *label_text;
-	ETable *etable;
-	ETableExtras *extras;
-	ECell *string_cell;
-
-	GtkWidget *sw;
-
-	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));
-
-	child->table_model = (ESelectNamesTableModel*)e_select_names_table_model_new (source);
-
-	child->source = source;
-	g_object_ref(child->source);
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-
-	label_text = g_strconcat (child->title, " ->", NULL);
-
-	label = gtk_label_new ("");
-
-	gtk_label_set_markup (GTK_LABEL(label), label_text);
-
-	g_free (label_text);
-
-	button = gtk_button_new ();
-	gtk_container_add (GTK_CONTAINER (button), label);
-	child->label = label;
-	child->button = button;
-
-	gtk_container_add(GTK_CONTAINER(alignment), button);
-	gtk_widget_show_all(alignment);
-	g_signal_connect(button, "clicked",
-			 G_CALLBACK(button_clicked), child);
-	gtk_table_attach(table, alignment,
-			 0, 1,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-
-	etable = e_table_scrolled_get_table (e_select_names->table);
-	gtk_widget_set_sensitive (button, e_table_selected_count (etable) > 0);
-
-	extras = e_table_extras_new ();
-	string_cell = e_table_extras_get_cell (extras, "string");
-
-	g_object_set (string_cell,
-		      "underline_column", 2,
-		      NULL);
-		      
-	sw = e_table_scrolled_new_from_spec_file (E_TABLE_MODEL (child->table_model),
-						  extras,
-						  EVOLUTION_ETSPECDIR "/e-select-names-section.etspec",
-						  NULL);
-	g_object_unref (extras);
-
-	child->recipient_table = GTK_WIDGET (e_table_scrolled_get_table (E_TABLE_SCROLLED (sw)));
-
-	g_signal_connect (child->recipient_table,
-			  "right_click",
-			  G_CALLBACK (section_right_click_cb),
-			  child);
-
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	
-	g_signal_connect(child->recipient_table, "double_click",
-			 G_CALLBACK(remove_address), child);
-
-	child->changed_id = g_signal_connect (child->source,
-					      "changed",
-					      G_CALLBACK (sync_table_and_models),
-					      e_select_names);
-	
-	gtk_widget_show_all (sw);
-	
-	gtk_table_attach(table, sw,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-
-	sync_table_and_models (child->source, e_select_names);
-}
-
-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) {
-			GtkWidget *label = child->label;
-
-			/* set the previous default to non-bold */
-			gtk_label_set_markup (GTK_LABEL (label), child->title);
-		}
-	}
-
-	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) {
-			GtkWidget *label = child->label;
-			char *markup = g_strconcat ("<b>", child->title, "</b>", NULL);
-
-			/* set the new default to bold */
-			gtk_label_set_markup (GTK_LABEL (label), markup);
-			g_free (markup);
-		}
-	}
-}
diff --git a/addressbook/gui/component/select-names/e-select-names.etspec b/addressbook/gui/component/select-names/e-select-names.etspec
deleted file mode 100644
index 7a260887ff..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.etspec
+++ /dev/null
@@ -1,7 +0,0 @@
-<ETableSpecification no-headers="true" cursor-mode="line">
-  <ETableColumn model_col= "69" _title="Name" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="collate" search="string"/>
-    <ETableState>
-	<column source="0"/>
-	    <grouping> <leaf column="0" ascending="true"/> </grouping>
-    </ETableState>
-</ETableSpecification>
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 e927932d13..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SELECT_NAMES_H__
-#define __E_SELECT_NAMES_H__
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <libedataserver/e-source-list.h>
-#include <widgets/misc/e-source-option-menu.h>
-
-#include "e-addressbook-model.h"
-
-#include "e-select-names-model.h"
-
-G_BEGIN_DECLS
-
-/* ESelectNames - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TYPE_SELECT_NAMES		(e_select_names_get_type ())
-#define E_SELECT_NAMES(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES, ESelectNames))
-#define E_SELECT_NAMES_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES, ESelectNamesClass))
-#define E_IS_SELECT_NAMES(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SELECT_NAMES))
-#define E_IS_SELECT_NAMES_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SELECT_NAMES))
-
-typedef struct _ESelectNames       ESelectNames;
-typedef struct _ESelectNamesClass  ESelectNamesClass;
-typedef struct _ESelectNamesFolder ESelectNamesFolder;
-
-struct _ESelectNames
-{
-	GtkDialog parent;
-	
-	ESourceList *source_list;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *adapter;
-	ETableModel *without;
-	EABModel *model;
-	GtkWidget *categories;
-	GtkWidget *select_entry;
-	GtkWidget *status_message;
-	char *def;
-	ESelectNamesFolder *current_folder;
-
-	/* signal handlers */
-	gulong status_id;
-	gulong search_id;
-};
-
-struct _ESelectNamesClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GType      e_select_names_get_type     (void);
-
-GtkWidget *e_select_names_new          (void);
-
-void       e_select_names_add_section  (ESelectNames         *e_select_names,
-				       	const char           *name,
-				       	const char           *id,
-				       	ESelectNamesModel    *source);
-void       e_select_names_set_default  (ESelectNames         *e_select_names,
-					const char           *id);
-
-G_END_DECLS
-
-#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 edcf6bbab0..0000000000
--- a/addressbook/gui/component/select-names/recipient.glade
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
-
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">window1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-
-    <child>
-      <widget class="GtkHBox" id="hbox-top">
-        <property name="homogeneous">no</property>
-        <property name="spacing">4</property>
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GtkAlignment" id="alignment1">
-            <property name="xalign">1.08033e-07</property>
-            <property name="yalign">0</property>
-            <property name="xscale">1</property>
-            <property name="yscale">0</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkButton" id="text-button">
-                <property name="can_focus">yes</property>
-                <property name="label" translatable="yes">-&gt;</property>
-                <property name="visible">yes</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">no</property>
-            <property name="fill">yes</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-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 bf63b9dfa4..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="dialog-top">
-  <property name="border_width">12</property>
-  <property name="title" translatable="yes">Select Names</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">417</property>
-  <property name="default_height">332</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button5">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-top">
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
-	  <property name="n_columns">1</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHSeparator" id="hseparator1">
-	      <property name="visible">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options"></property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox5">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkTable" id="table4">
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">3</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label32">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Type a name into the entry, or
-select one from the list below:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table-recipients">
-		      <property name="visible">True</property>
-		      <property name="n_rows">1</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label20">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Selected Contacts:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment4">
-		      <property name="visible">True</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox6">
-			  <property name="border_width">3</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox1">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkEntry" id="entry-select">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="button-find">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Find</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment3">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">1</property>
-			      <property name="yscale">1</property>
-
-			      <child>
-				<widget class="Custom" id="table-source">
-				  <property name="visible">True</property>
-				  <property name="creation_function">e_addressbook_create_ebook_table</property>
-				  <property name="int1">0</property>
-				  <property name="int2">0</property>
-				  <property name="last_modification_time">Sat, 10 Jun 2000 22:02:57 GMT</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="status-message">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">3</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame1">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkTable" id="show_contacts_table">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label30">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Folder:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label31">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Category:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment5">
-		      <property name="visible">True</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">1</property>
-
-		      <child>
-			<widget class="Custom" id="custom-categories">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_select_names_create_categories</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Tue, 19 Feb 2002 23:06:24 GMT</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Show Contacts</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore
deleted file mode 100644
index ddbd38bb6e..0000000000
--- a/addressbook/gui/contact-editor/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
-contact-editor.gladep
-e-contact-editor-marshal.c
-e-contact-editor-marshal.h
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
deleted file mode 100644
index 685004dabb..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_builddir)/shell				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DG_LOG_DOMAIN=\"contact-editor\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libecontacteditor.la
-
-libecontacteditor_la_SOURCES = 			\
-	$(MARSHAL_GENERATED)			\
-	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-quick-add.c			\
-	e-contact-quick-add.h
-
-MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST=	$(glade_DATA)		\
-		e-contact-editor-marshal.list
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index 10b05c27b4..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2360 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-<requires lib="bonobo"/>
-
-<widget class="GtkDialog" id="dialog2">
-  <property name="border_width">2</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button28">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button29">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button30">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table2">
-	  <property name="visible">True</property>
-	  <property name="n_rows">2</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">0</property>
-	  <property name="column_spacing">2</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry2">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox1">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">2</property>
-
-	      <child>
-		<widget class="GtkButton" id="button31">
-		  <property name="border_width">2</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Add</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="button32">
-		  <property name="border_width">2</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Delete</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-	      <property name="visible">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="clist1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog-add-phone">
-  <property name="title" translatable="yes">New phone type</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button43">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Add</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button44">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkFrame" id="frame-add-phone">
-	  <property name="border_width">4</property>
-	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment9">
-	      <property name="border_width">9</property>
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-add-phone">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="has_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label21">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">New phone type</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GnomeApp" id="contact editor">
-  <property name="title" translatable="yes">Contact Editor</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="enable_layout_config">True</property>
-
-  <child internal-child="dock">
-    <widget class="BonoboDock" id="dock1">
-      <property name="visible">True</property>
-      <property name="allow_floating">True</property>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook-contact-editor">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkTable" id="table-contact-editor-general">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">14</property>
-	      <property name="n_columns">8</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-phone1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-phone2">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-phone3">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-phone4">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="button-fullname">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Full _Name...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment3">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">1</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-email1">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow1">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment5">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-phone4">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow5">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">6</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment7">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-phone2">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow3">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">6</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment8">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-phone1">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow2">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">6</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator4">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="y_padding">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment6">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-phone3">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow4">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">6</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-fullname">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="has_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="has_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-jobtitle">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-company">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-email1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator5">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="y_padding">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCombo" id="combo-file-as">
-		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">True</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
-
-		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="entry-file-as">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="convertwidget3">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget4">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator6">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">8</property>
-		  <property name="y_padding">2</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment-htmlmail">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="checkbutton-htmlmail">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Wants to receive _HTML mail</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">6</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="x_options">expand|shrink|fill</property>
-		  <property name="y_options">shrink|fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment4">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-address">
-		      <property name="visible">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow6">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">6</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox1">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-phone1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Business:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-phone1</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox2">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-phone2">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Home:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-phone2</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox3">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-phone3">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Business fa_x:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-phone3</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox4">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-phone4">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Mobile:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-phone4</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox5">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-email1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Primary _email:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-email1</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox-business">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-address">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"> B_usiness:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">text-address</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="checkbutton-mailingaddress">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_This is the mailing address</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">9</property>
-		  <property name="bottom_attach">10</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator9">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">11</property>
-		  <property name="bottom_attach">12</property>
-		  <property name="y_padding">2</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator10">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">11</property>
-		  <property name="bottom_attach">12</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEventBox" id="eventbox7">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label-jobtitle">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Job title:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">entry-jobtitle</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom1">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">malehead.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:19:47 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom2">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">cellphone.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:02 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">5</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom3">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">envelope.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:19:51 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom4">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">house.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:06 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">5</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">10</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom10">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">globe.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:19:56 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">8</property>
-		  <property name="bottom_attach">10</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-company">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Organi_zation:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-company</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="button-fulladdr">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">A_ddress...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">6</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="accellabel-fileas">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">File a_s:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-file-as</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="accellabel-web">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Web page address:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-web</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">8</property>
-		  <property name="bottom_attach">9</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment16">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="button-categories">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Categories...</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">12</property>
-		  <property name="bottom_attach">13</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom6">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">briefcase.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:09 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">12</property>
-		  <property name="bottom_attach">14</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment19">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkEntry" id="entry-categories">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">12</property>
-		  <property name="bottom_attach">13</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow3">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="text-address">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">9</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="entry-web">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_contact_editor_create_web</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Sat, 08 Feb 2003 09:14:46 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">8</property>
-		  <property name="bottom_attach">9</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="accellabel-blog">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Blog address:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-web</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">9</property>
-		  <property name="bottom_attach">10</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="entry-blog">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_contact_editor_create_web</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Sat, 08 Feb 2003 09:14:46 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">9</property>
-		  <property name="bottom_attach">10</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label15">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">General</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table-contact-editor-details">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">9</property>
-	      <property name="n_columns">6</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label-department">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">D_epartment:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-department</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-office">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Office:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-office</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-profession">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">P_rofession:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-profession</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-nickname">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Nickname:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-nickname</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-spouse">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">S_pouse:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-spouse</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-birthday">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Birthda_y:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">dateedit-birthday</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-assistant">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">A_ssistant's name:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-assistant</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-manager">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Manager's name:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry-manager</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-anniversary">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Anni_versary:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">dateedit-anniversary</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">3</property>
-		  <property name="right_attach">4</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-spouse">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-department">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-office">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-profession">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-nickname">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">2</property>
-		  <property name="right_attach">3</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-assistant">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="entry-manager">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator7">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_padding">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label-comments">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">No_tes:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">text-comments</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">8</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator8">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">6</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom7">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">briefcase.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:13 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom8">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">malehead.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:16 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow2">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="text-comments">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">8</property>
-		  <property name="bottom_attach">9</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="custom9">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">globe.png</property>
-		  <property name="string2"></property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 18 May 2000 12:20:19 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">9</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="dateedit-birthday">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="creation_function">e_contact_editor_create_date</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Tue, 05 Jun 2001 02:36:27 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="dateedit-anniversary">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="creation_function">e_contact_editor_create_date</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Tue, 05 Jun 2001 02:36:32 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">4</property>
-		  <property name="right_attach">6</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label16">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Details</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox3">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox1">
-		  <property name="border_width">7</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">4</property>
-
-		  <child>
-		    <widget class="Custom" id="custom12">
-		      <property name="visible">True</property>
-		      <property name="creation_function">e_create_image_widget</property>
-		      <property name="string1">globe.png</property>
-		      <property name="string2"></property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Thu, 18 May 2000 12:20:13 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label24">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">If this person publishes free/busy or other calendar information on the Internet, enter the address
-of that information here.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">7.45058e-09</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment18">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0.75</property>
-		  <property name="yscale">1</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table-contact-editor-collaboration">
-		      <property name="border_width">6</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label-caluri">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Public Calendar URL:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-caluri</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label-fburl">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">F_ree/Busy URL:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry-fburl</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-caluri">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Mon, 10 Feb 2003 20:37:57 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-fburl">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_editor_create_web</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Mon, 10 Feb 2003 20:38:00 GMT</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label21">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Collaboration</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">True</property>
-      <property name="fill">True</property>
-    </packing>
-  </child>
-
-  <child internal-child="appbar">
-    <widget class="GnomeAppBar" id="appbar1">
-      <property name="visible">True</property>
-      <property name="has_progress">True</property>
-      <property name="has_status">True</property>
-    </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">True</property>
-      <property name="fill">True</property>
-    </packing>
-  </child>
-</widget>
-
-</glade-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 34977e3fb7..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <e-contact-editor-address.h>
-
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_address_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_address_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_ADDRESS,
-	PROP_EDITABLE
-};
-
-GType
-e_contact_editor_address_get_type (void)
-{
-	static GType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type) {
-		static const GTypeInfo contact_editor_address_info =  {
-			sizeof (EContactEditorAddressClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_address_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorAddress),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_address_init,
-		};
-
-		contact_editor_address_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorAddress", &contact_editor_address_info, 0);
-	}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
-	object_class->set_property = e_contact_editor_address_set_property;
-	object_class->get_property = e_contact_editor_address_get_property;
-	object_class->dispose = e_contact_editor_address_dispose;
-
-	g_object_class_install_property (object_class, PROP_ADDRESS, 
-					 g_param_spec_pointer ("address",
-							       _("Address"),
-							       /*_( */"XXX blurb" /*)*/,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-checkaddress");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-city");
-		list = add_to_tab_order(list, gui, "entry-region");
-		list = add_to_tab_order(list, gui, "entry-code");
-		list = add_to_tab_order(list, gui, "combo-country");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static char * countries [] = {
-	N_("United States"),
-	N_("Afghanistan"),
-	N_("Albania"),
-	N_("Algeria"),
-	N_("American Samoa"),
-	N_("Andorra"),
-	N_("Angola"),
-	N_("Anguilla"),
-	N_("Antarctica"),
-	N_("Antigua And Barbuda"),
-	N_("Argentina"),
-	N_("Armenia"),
-	N_("Aruba"),
-	N_("Australia"),
-	N_("Austria"),
-	N_("Azerbaijan"),
-	N_("Bahamas"),
-	N_("Bahrain"),
-	N_("Bangladesh"),
-	N_("Barbados"),
-	N_("Belarus"),
-	N_("Belgium"),
-	N_("Belize"),
-	N_("Benin"),
-	N_("Bermuda"),
-	N_("Bhutan"),
-	N_("Bolivia"),
-	N_("Bosnia And Herzegowina"),
-	N_("Botswana"),
-	N_("Bouvet Island"),
-	N_("Brazil"),
-	N_("British Indian Ocean Territory"),
-	N_("Brunei Darussalam"),
-	N_("Bulgaria"),
-	N_("Burkina Faso"),
-	N_("Burundi"),
-	N_("Cambodia"),
-	N_("Cameroon"),
-	N_("Canada"),
-	N_("Cape Verde"),
-	N_("Cayman Islands"),
-	N_("Central African Republic"),
-	N_("Chad"),
-	N_("Chile"),
-	N_("China"),
-	N_("Christmas Island"),
-	N_("Cocos (Keeling) Islands"),
-	N_("Colombia"),
-	N_("Comoros"),
-	N_("Congo"),
-	N_("Congo"),
-	N_("Cook Islands"),
-	N_("Costa Rica"),
-	N_("Cote d'Ivoire"),
-	N_("Croatia"),
-	N_("Cuba"),
-	N_("Cyprus"),
-	N_("Czech Republic"),
-	N_("Denmark"),
-	N_("Djibouti"),
-	N_("Dominica"),
-	N_("Dominican Republic"),
-	N_("East Timor"),
-	N_("Ecuador"),
-	N_("Egypt"),
-	N_("El Salvador"),
-	N_("Equatorial Guinea"),
-	N_("Eritrea"),
-	N_("Estonia"),
-	N_("Ethiopia"),
-	N_("Falkland Islands"),
-	N_("Faroe Islands"),
-	N_("Fiji"),
-	N_("Finland"),
-	N_("France"),
-	N_("French Guiana"),
-	N_("French Polynesia"),
-	N_("French Southern Territories"),
-	N_("Gabon"),
-	N_("Gambia"),
-	N_("Georgia"),
-	N_("Germany"),
-	N_("Ghana"),
-	N_("Gibraltar"),
-	N_("Greece"),
-	N_("Greenland"),
-	N_("Grenada"),
-	N_("Guadeloupe"),
-	N_("Guam"),
-	N_("Guatemala"),
-	N_("Guinea"),
-	N_("Guinea-bissau"),
-	N_("Guyana"),
-	N_("Haiti"),
-	N_("Heard And McDonald Islands"),
-	N_("Holy See"),
-	N_("Honduras"),
-	N_("Hong Kong"),
-	N_("Hungary"),
-	N_("Iceland"),
-	N_("India"),
-	N_("Indonesia"),
-	N_("Ireland"),
-	N_("Israel"),
-	N_("Italy"),
-	N_("Jamaica"),
-	N_("Japan"),
-	N_("Jordan"),
-	N_("Kazakhstan"),
-	N_("Kenya"),
-	N_("Kiribati"),
-	N_("Korea, Republic Of"),
-	N_("Kuwait"),
-	N_("Kyrgyzstan"),
-	N_("Laos"),
-	N_("Latvia"),
-	N_("Lebanon"),
-	N_("Lesotho"),
-	N_("Liberia"),
-	N_("Liechtenstein"),
-	N_("Lithuania"),
-	N_("Luxembourg"),
-	N_("Macau"),
-	N_("Macedonia"),
-	N_("Madagascar"),
-	N_("Malawi"),
-	N_("Malaysia"),
-	N_("Maldives"),
-	N_("Mali"),
-	N_("Malta"),
-	N_("Marshall Islands"),
-	N_("Martinique"),
-	N_("Mauritania"),
-	N_("Mauritius"),
-	N_("Mayotte"),
-	N_("Mexico"),
-	N_("Micronesia"),
-	N_("Moldova, Republic Of"),
-	N_("Monaco"),
-	N_("Mongolia"),
-	N_("Montserrat"),
-	N_("Morocco"),
-	N_("Mozambique"),
-	N_("Myanmar"),
-	N_("Namibia"),
-	N_("Nauru"),
-	N_("Nepal"),
-	N_("Netherlands"),
-	N_("Netherlands Antilles"),
-	N_("New Caledonia"),
-	N_("New Zealand"),
-	N_("Nicaragua"),
-	N_("Niger"),
-	N_("Nigeria"),
-	N_("Niue"),
-	N_("Norfolk Island"),
-	N_("Northern Mariana Islands"),
-	N_("Norway"),
-	N_("Oman"),
-	N_("Pakistan"),
-	N_("Palau"),
-	N_("Palestinian Territory"),
-	N_("Panama"),
-	N_("Papua New Guinea"),
-	N_("Paraguay"),
-	N_("Peru"),
-	N_("Philippines"),
-	N_("Pitcairn"),
-	N_("Poland"),
-	N_("Portugal"),
-	N_("Puerto Rico"),
-	N_("Qatar"),
-	N_("Reunion"),
-	N_("Romania"),
-	N_("Russian Federation"),
-	N_("Rwanda"),
-	N_("Saint Kitts And Nevis"),
-	N_("Saint Lucia"),
-	N_("Saint Vincent And The Grena-dines"),
-	N_("Samoa"),
-	N_("San Marino"),
-	N_("Sao Tome And Principe"),
-	N_("Saudi Arabia"),
-	N_("Senegal"),
-	N_("Seychelles"),
-	N_("Sierra Leone"),
-	N_("Singapore"),
-	N_("Slovakia"),
-	N_("Slovenia"),
-	N_("Solomon Islands"),
-	N_("Somalia"),
-	N_("South Africa"),
-	N_("South Georgia And The South Sandwich Islands"),
-	N_("Spain"),
-	N_("Sri Lanka"),
-	N_("St. Helena"),
-	N_("St. Pierre And Miquelon"),
-	N_("Sudan"),
-	N_("Suriname"),
-	N_("Svalbard And Jan Mayen Islands"),
-	N_("Swaziland"),
-	N_("Sweden"),
-	N_("Switzerland"),
-	N_("Taiwan"),
-	N_("Tajikistan"),
-	N_("Tanzania, United Republic Of"),
-	N_("Thailand"),
-	N_("Togo"),
-	N_("Tokelau"),
-	N_("Tonga"),
-	N_("Trinidad And Tobago"),
-	N_("Tunisia"),
-	N_("Turkey"),
-	N_("Turkmenistan"),
-	N_("Turks And Caicos Islands"),
-	N_("Tuvalu"),
-	N_("Uganda"),
-	N_("Ukraine"),
-	N_("United Arab Emirates"),
-	N_("United Kingdom"),
-	N_("United States Minor Outlying Islands"),
-	N_("Uruguay"),
-	N_("Uzbekistan"),
-	N_("Vanuatu"),
-	N_("Venezuela"),
-	N_("Viet Nam"),
-	N_("Virgin Islands, British"),
-	N_("Virgin Islands, U.S."),
-	N_("Wallis And Futuna Islands"),
-	N_("Western Sahara"),
-	N_("Yemen"),
-	N_("Yugoslavia"),
-	N_("Zambia"),
-	N_("Zimbabwe"),
-	NULL
-};
-
-static int
-compare_func (const void *voida, const void *voidb)
-{
-	char * const *stringa = voida, * const *stringb = voidb;
-
-	return strcoll (*stringa, *stringb);
-}
-
-static void
-fill_in_countries (GladeXML *gui)
-{
-	GtkCombo *combo;
-	combo = (GtkCombo *) glade_xml_get_widget(gui, "combo-country");
-	if (combo && GTK_IS_COMBO (combo)) {
-		static gboolean sorted = FALSE;
-		static GList *country_list;
-		if (!sorted) {
-			int i;
-			char *locale;
-
-			for (i = 0; countries[i]; i++) {
-				countries[i] = _(countries[i]);
-			}
-
-			locale = setlocale (LC_COLLATE, NULL);
-			qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
-			country_list = NULL;
-			for (i = 0; countries[i]; i++) {
-				country_list = g_list_prepend (country_list, countries[i]);
-			}
-			country_list = g_list_reverse (country_list);
-			sorted = TRUE;
-		}
-		gtk_combo_set_popdown_strings (combo, country_list);
-	}
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	char *icon_path;
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_address), TRUE);
-
-#if notyet
-	e_contact_editor_address->address = NULL;
-#endif
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL, NULL);
-	e_contact_editor_address->gui = gui;
-
-	setup_tab_order (gui);
-	fill_in_countries (gui);
-
-	widget = glade_xml_get_widget(gui, "dialog-checkaddress");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_address),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png");
-	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_address), icon_path);
-	g_free (icon_path);
-}
-
-void
-e_contact_editor_address_dispose (GObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui) {
-		g_object_unref(e_contact_editor_address->gui);
-		e_contact_editor_address->gui = NULL;
-	}
-
-#if notyet
-	if (e_contact_editor_address->address) {
-		e_card_delivery_address_unref(e_contact_editor_address->address);
-		e_contact_editor_address->address = NULL;
-	}
-#endif
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_address_new (/* XXX notyet const ECardDeliveryAddress *address*/)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_ADDRESS, NULL);
-#if notyet
-	g_object_set (widget,
-		      "address", address,
-		      NULL);
-#endif
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_property (GObject *object, guint prop_id,
-				       const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-	
-	switch (prop_id){
-	case PROP_ADDRESS:
-#if notyet
-		e_card_delivery_address_unref(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(g_value_get_pointer (value));
-		fill_in_info(e_contact_editor_address);
-#endif
-		break;
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"entry-street",
-			"entry-city",
-			"entry-ext",
-			"entry-po",
-			"entry-region",
-			"combo-country",
-			"entry-code",
-			"label-street",
-			"label-city",
-			"label-ext",
-			"label-po",
-			"label-region",
-			"label-country",
-			"label-code",
-			NULL
-		};
-		e_contact_editor_address->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
-							   e_contact_editor_address->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_LABEL (w)) {
-				gtk_widget_set_sensitive (w, e_contact_editor_address->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_property (GObject *object, guint prop_id,
-				       GValue *value, GParamSpec *pspec)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (prop_id) {
-	case PROP_ADDRESS:
-		extract_info(e_contact_editor_address);
-#if notyet
-		g_value_set_pointer (value, e_card_delivery_address_ref(e_contact_editor_address->address));
-#endif
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_address->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-#if notyet
-	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);
-	}
-#endif
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return g_strdup (gtk_entry_get_text(entry));
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-#if notyet
-	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");
-#endif
-}
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 893a2ea2f7..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* 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_TYPE_CONTACT_EDITOR_ADDRESS			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_ADDRESS, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_ADDRESS))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GtkDialog parent;
-	
-#if notyet
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-#endif
-
-	guint editable : 1;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(/* XXX not yet const ECardDeliveryAddress *name*/);
-GType      e_contact_editor_address_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
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 c37f4cc8b7..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * eab-contact-editor-phones.c
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-editor-fullname.h"
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.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_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_fullname_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_fullname_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_NAME,
-	PROP_EDITABLE
-};
-
-GType
-e_contact_editor_fullname_get_type (void)
-{
-	static GType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type) {
-		static const GTypeInfo contact_editor_fullname_info =  {
-			sizeof (EContactEditorFullnameClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_fullname_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorFullname),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_fullname_init,
-		};
-
-		contact_editor_fullname_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorFullname", &contact_editor_fullname_info, 0);
-	}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
-	object_class->set_property = e_contact_editor_fullname_set_property;
-	object_class->get_property = e_contact_editor_fullname_get_property;
-	object_class->dispose = e_contact_editor_fullname_dispose;
-
-	g_object_class_install_property (object_class, PROP_NAME, 
-					 g_param_spec_pointer ("name",
-							       _("Name"),
-							       /*_( */"XXX blurb" /*)*/,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	char *icon_path;
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_fullname),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_fullname), TRUE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL, NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "dialog-checkfullname");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png");
-	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_fullname), icon_path);
-	g_free (icon_path);
-}
-
-void
-e_contact_editor_fullname_dispose (GObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui) {
-		g_object_unref(e_contact_editor_fullname->gui);
-		e_contact_editor_fullname->gui = NULL;
-	}
-	
-	if (e_contact_editor_fullname->name) {
-		e_contact_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const EContactName *name)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_FULLNAME, NULL);
-	g_object_set (widget,
-		      "name", name,
-		      NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-	
-	switch (prop_id){
-	case PROP_NAME:
-		e_contact_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_contact_name_copy(g_value_get_pointer (value));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"combo-title",
-			"combo-suffix",
-			"entry-first",
-			"entry-middle",
-			"entry-last",
-			"label-title",
-			"label-suffix",
-			"label-first",
-			"label-middle",
-			"label-last",
-			NULL
-		};
-		e_contact_editor_fullname->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
-							   e_contact_editor_fullname->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_LABEL (w)) {
-				gtk_widget_set_sensitive (w, e_contact_editor_fullname->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_property (GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (prop_id) {
-	case PROP_NAME:
-		extract_info(e_contact_editor_fullname);
-		g_value_set_pointer (value, e_contact_name_copy(e_contact_editor_fullname->name));
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_fullname->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		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)
-			gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	EContactName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefixes);
-		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->suffixes);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return g_strdup (gtk_entry_get_text(entry));
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	EContactName *name = editor->name;
-	if (!name) {
-		name = e_contact_name_new();
-		editor->name = name;
-	}
-
-	name->prefixes   = 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->suffixes   = 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 0b254c789c..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* 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_TYPE_CONTACT_EDITOR_FULLNAME			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_FULLNAME, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GtkDialog parent;
-	
-	/* item specific fields */
-	EContactName *name;
-	GladeXML *gui;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const EContactName *name);
-GType      e_contact_editor_fullname_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list
deleted file mode 100644
index 58b2640de5..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-NONE:INT,OBJECT
-NONE:NONE
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 1391ccf1b0..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,2612 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-editor.h"
-
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-window.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/widgets/e-categories.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-text/e-entry.h>
-
-#include <e-util/e-categories-master-list-wombat.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "e-util/e-gui-utils.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-url-entry.h"
-#include "shell/evolution-shell-component-utils.h"
-
-#include "eab-contact-merging.h"
-
-#include "e-contact-editor-address.h"
-#include "e-contact-editor-fullname.h"
-#include "e-contact-editor-marshal.h"
-
-/* Signal IDs */
-enum {
-	CONTACT_ADDED,
-	CONTACT_MODIFIED,
-	CONTACT_DELETED,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *editor);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_dispose (GObject *object);
-
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void find_address_mailing (EContactEditor *editor);
-static void enable_writable_fields(EContactEditor *editor);
-static void set_editable(EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_field(EContactEditor *editor, GtkEntry *entry, const char *string);
-static void set_address_field(EContactEditor *editor, int result);
-static void set_phone_field(EContactEditor *editor, GtkWidget *entry, const char *phone_number);
-static void set_fields(EContactEditor *editor);
-static void command_state_changed (EContactEditor *ce);
-static void widget_changed (GtkWidget *widget, EContactEditor *editor);
-static void close_dialog (EContactEditor *ce);
-static void enable_widget (GtkWidget *widget, gboolean enabled);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_CONTACT,
-	PROP_IS_NEW_CONTACT,
-	PROP_EDITABLE,
-	PROP_CHANGED,
-	PROP_WRITABLE_FIELDS
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-static EContactField phones[] = {
-	E_CONTACT_PHONE_ASSISTANT,
-	E_CONTACT_PHONE_BUSINESS,
-	E_CONTACT_PHONE_BUSINESS_2,
-	E_CONTACT_PHONE_BUSINESS_FAX,
-	E_CONTACT_PHONE_CALLBACK,
-	E_CONTACT_PHONE_CAR,
-	E_CONTACT_PHONE_COMPANY,
-	E_CONTACT_PHONE_HOME,
-	E_CONTACT_PHONE_HOME_2,
-	E_CONTACT_PHONE_HOME_FAX,
-	E_CONTACT_PHONE_ISDN,
-	E_CONTACT_PHONE_MOBILE,
-	E_CONTACT_PHONE_OTHER,
-	E_CONTACT_PHONE_OTHER_FAX,
-	E_CONTACT_PHONE_PAGER,
-	E_CONTACT_PHONE_PRIMARY,
-	E_CONTACT_PHONE_RADIO,
-	E_CONTACT_PHONE_TELEX,
-	E_CONTACT_PHONE_TTYTDD,
-};
-
-static EContactField emails[] = {
-	E_CONTACT_EMAIL_1,
-	E_CONTACT_EMAIL_2,
-	E_CONTACT_EMAIL_3
-};
-
-static GSList *all_contact_editors = NULL;
-
-GType
-e_contact_editor_get_type (void)
-{
-	static GType contact_editor_type = 0;
-
-	if (!contact_editor_type) {
-		static const GTypeInfo contact_editor_info =  {
-			sizeof (EContactEditorClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditor),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_init,
-		};
-
-		contact_editor_type = g_type_register_static (GTK_TYPE_OBJECT, "EContactEditor", &contact_editor_info, 0);
-	}
-
-	return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  parent_class = g_type_class_ref (GTK_TYPE_OBJECT);
-
-  object_class->set_property = e_contact_editor_set_property;
-  object_class->get_property = e_contact_editor_get_property;
-  object_class->dispose = e_contact_editor_dispose;
-
-  g_object_class_install_property (object_class, PROP_BOOK, 
-				   g_param_spec_object ("book",
-							_("Book"),
-							/*_( */"XXX blurb" /*)*/,
-							E_TYPE_BOOK,
-							G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_CONTACT, 
-				   g_param_spec_object ("contact",
-							_("Contact"),
-							/*_( */"XXX blurb" /*)*/,
-							E_TYPE_CONTACT,
-							G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_IS_NEW_CONTACT, 
-				   g_param_spec_boolean ("is_new_contact",
-							 _("Is New Contact"),
-							 /*_( */"XXX blurb" /*)*/,
-							 FALSE,
-							 G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_WRITABLE_FIELDS, 
-				   g_param_spec_object ("writable_fields",
-							_("Writable Fields"),
-							/*_( */"XXX blurb" /*)*/,
-							E_TYPE_LIST,
-							G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_EDITABLE, 
-				   g_param_spec_boolean ("editable",
-							 _("Editable"),
-							 /*_( */"XXX blurb" /*)*/,
-							 FALSE,
-							 G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_CHANGED, 
-				   g_param_spec_boolean ("changed",
-							 _("Changed"),
-							 /*_( */"XXX blurb" /*)*/,
-							 FALSE,
-							 G_PARAM_READWRITE));
-
-  contact_editor_signals[CONTACT_ADDED] =
-	  g_signal_new ("contact_added",
-			G_OBJECT_CLASS_TYPE (object_class),
-			G_SIGNAL_RUN_FIRST,
-			G_STRUCT_OFFSET (EContactEditorClass, contact_added),
-			NULL, NULL,
-			e_contact_editor_marshal_NONE__INT_OBJECT,
-			G_TYPE_NONE, 2,
-			G_TYPE_INT, G_TYPE_OBJECT);
-
-  contact_editor_signals[CONTACT_MODIFIED] =
-	  g_signal_new ("contact_modified",
-			G_OBJECT_CLASS_TYPE (object_class),
-			G_SIGNAL_RUN_FIRST,
-			G_STRUCT_OFFSET (EContactEditorClass, contact_modified),
-			NULL, NULL,
-			e_contact_editor_marshal_NONE__INT_OBJECT,
-			G_TYPE_NONE, 2,
-			G_TYPE_INT, G_TYPE_OBJECT);
-
-  contact_editor_signals[CONTACT_DELETED] =
-	  g_signal_new ("contact_deleted",
-			G_OBJECT_CLASS_TYPE (object_class),
-			G_SIGNAL_RUN_FIRST,
-			G_STRUCT_OFFSET (EContactEditorClass, contact_deleted),
-			NULL, NULL,
-			e_contact_editor_marshal_NONE__INT_OBJECT,
-			G_TYPE_NONE, 2,
-			G_TYPE_INT, G_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  g_signal_new ("editor_closed",
-			G_OBJECT_CLASS_TYPE (object_class),
-			G_SIGNAL_RUN_FIRST,
-			G_STRUCT_OFFSET (EContactEditorClass, editor_closed),
-			NULL, NULL,
-			e_contact_editor_marshal_NONE__NONE,
-			G_TYPE_NONE, 0);
-}
-
-static void
-connect_arrow_button_signal (EContactEditor *editor, gchar *button_xml, GCallback func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	if (button && GTK_IS_BUTTON(button)) {
-		g_signal_connect(button, "button_press_event", func, editor);
-	}
-}
-
-static void
-connect_arrow_button_signals (EContactEditor *editor)
-{
-	connect_arrow_button_signal(editor, "button-phone1", G_CALLBACK (_phone_arrow_pressed));
-	connect_arrow_button_signal(editor, "button-phone2", G_CALLBACK (_phone_arrow_pressed));
-	connect_arrow_button_signal(editor, "button-phone3", G_CALLBACK (_phone_arrow_pressed));
-	connect_arrow_button_signal(editor, "button-phone4", G_CALLBACK (_phone_arrow_pressed));
-	connect_arrow_button_signal(editor, "button-address", G_CALLBACK (_address_arrow_pressed));
-	connect_arrow_button_signal(editor, "button-email1", G_CALLBACK (_email_arrow_pressed));
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	g_object_get (widget,
-		      "active", &wants_html,
-		      NULL);
-
-	e_contact_set (editor->contact, E_CONTACT_WANTS_HTML, GINT_TO_POINTER (wants_html));
-
-	widget_changed (widget, editor);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	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;
-
-	printf ("gtk_entry_get_text(entry) == %s\n", (char*)gtk_entry_get_text(entry));
-	e_contact_set(editor->contact, editor->phone_choice[which - 1], (char*)gtk_entry_get_text(entry));
-
-	widget_changed (widget, editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	e_contact_set (editor->contact, editor->email_choice, (char*)gtk_entry_get_text(entry));
-
-	widget_changed (widget, editor);
-}
-
-static void
-address_text_changed (GtkTextBuffer *buffer, EContactEditor *editor)
-{
-#if notyet
-	ECardAddrLabel *address;
-	GtkTextIter start_iter, end_iter;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	if (editor->address_mailing == editor->address_choice || editor->address_mailing == -1) {
-		GtkWidget *check;
-		
-		address->flags |= E_CARD_ADDR_DEFAULT;
-		
-		check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress");
-		if (check && GTK_IS_CHECK_BUTTON (check)) {
-			g_signal_handlers_block_matched (check,
-							 G_SIGNAL_MATCH_DATA,
-							 0, 0,
-							 NULL, NULL, editor);
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-			g_signal_handlers_unblock_matched (check,
-							   G_SIGNAL_MATCH_DATA,
-							   0, 0,
-							   NULL, NULL, editor);
-		}
-	}
-	
-	gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start_iter);
-	gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter);
-
-	address->data = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &start_iter, &end_iter, FALSE);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_unref(address);
-
-	widget_changed (NULL, editor);
-#endif
-}
-
-
-static void
-address_mailing_changed (GtkWidget *widget, EContactEditor *editor)
-{
-#if notyet
-	const ECardDeliveryAddress *curr;
-	ECardDeliveryAddress *address;
-	gboolean mailing_address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	mailing_address = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-	
-	/* Mark the current address as the mailing address */
-	curr = e_card_simple_get_delivery_address (editor->simple,
-						   editor->address_choice);
-
-	address = e_card_delivery_address_copy (curr);
-
-	if (!address)
-		address = e_card_delivery_address_new ();
-
-	if (mailing_address)
-		address->flags |= E_CARD_ADDR_DEFAULT;
-	else
-		address->flags &= ~E_CARD_ADDR_DEFAULT;
-
-	e_card_simple_set_delivery_address(editor->simple, editor->address_choice, address);
-	e_card_delivery_address_unref (address);
-
-	/* Unset the previous mailing address flag */
-	if (mailing_address && editor->address_mailing != -1) {
-		const ECardDeliveryAddress *curr;
-
-		curr = e_card_simple_get_delivery_address(editor->simple, 
-							  editor->address_mailing);
-		address = e_card_delivery_address_copy (curr);
-		address->flags &= ~E_CARD_ADDR_DEFAULT;
-		e_card_simple_set_delivery_address(editor->simple, 
-						   editor->address_mailing,
-						   address);
-		e_card_delivery_address_unref (address);
-	}
-
-	/* Remember the new mailing address */
-	if (mailing_address)
-		editor->address_mailing = editor->address_choice;
-	else
-		editor->address_mailing = -1;
-
-	widget_changed (widget, editor);
-#endif
-}
-
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const EContactName *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 EContactName *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;
-	EContactName *name = editor->name;
-	int i;
-	int style;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	filestring = g_strdup (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 = g_strdup (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);
-			if (u) strings = g_list_append(strings, u);
-		}
-	}
-
-	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);
-		gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	const char *string;
-
-	style = file_as_get_style(editor);
-
-	e_contact_name_free (editor->name);
-
-	string = gtk_entry_get_text (GTK_ENTRY(widget));
-
-	editor->name = e_contact_name_from_string(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 = g_strdup (gtk_entry_get_text(GTK_ENTRY(widget)));
-	
-	file_as_set_style(editor, style);
-
-	widget_changed (widget, editor);
-}
-
-static void
-field_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		g_signal_connect(widget, "changed",
-				 G_CALLBACK (phone_entry_changed), editor);
-}
-
-static void
-set_entry_changed_signal_email(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		g_signal_connect(widget, "changed",
-				 G_CALLBACK (email_entry_changed), editor);
-}
-
-static void
-widget_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->editable) {
-		g_warning ("non-editable contact editor has an editable field in it.");
-		return;
-	}
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_entry_changed_signal_field(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		g_signal_connect(widget, "changed",
-				 G_CALLBACK (field_changed), editor);
-}
-
-static void
-set_urlentry_changed_signal_field (EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && E_IS_URL_ENTRY(widget)) {
-		GtkWidget *entry = e_url_entry_get_entry (E_URL_ENTRY (widget));
-		g_signal_connect (entry, "changed",
-				  G_CALLBACK (field_changed), editor);
-	}
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-
-	set_entry_changed_signal_email(editor, "entry-email1");
-
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT_VIEW(widget)) {
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
-		g_signal_connect(buffer, "changed",
-				 G_CALLBACK (address_text_changed), editor);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		g_signal_connect (widget, "changed",
-				  G_CALLBACK (name_entry_changed), editor);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		g_signal_connect (widget, "changed",
-				  G_CALLBACK (company_entry_changed), editor);
-	}
-
-	set_urlentry_changed_signal_field (editor, "entry-web");
-	set_urlentry_changed_signal_field (editor, "entry-blog");
-	set_urlentry_changed_signal_field (editor, "entry-caluri");
-	set_urlentry_changed_signal_field (editor, "entry-fburl");
-
-	set_entry_changed_signal_field(editor, "entry-categories");
-	set_entry_changed_signal_field(editor, "entry-jobtitle");
-	set_entry_changed_signal_field(editor, "entry-file-as");
-	set_entry_changed_signal_field(editor, "entry-manager");
-	set_entry_changed_signal_field(editor, "entry-assistant");
-	set_entry_changed_signal_field(editor, "entry-office");
-	set_entry_changed_signal_field(editor, "entry-department");
-	set_entry_changed_signal_field(editor, "entry-profession");
-	set_entry_changed_signal_field(editor, "entry-nickname");
-	set_entry_changed_signal_field(editor, "entry-spouse");
-
-	widget = glade_xml_get_widget(editor->gui, "text-comments");
-	if (widget && GTK_IS_TEXT_VIEW(widget)) {
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
-		g_signal_connect (buffer, "changed",
-				  G_CALLBACK (widget_changed), editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		g_signal_connect (widget, "changed",
-				  G_CALLBACK (widget_changed), editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		g_signal_connect (widget, "changed",
-				  G_CALLBACK (widget_changed), editor);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GtkDialog *dialog = GTK_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-
-	g_object_set (dialog,
-		      "editable", editor->fullname_editable,
-		      NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gtk_dialog_run (dialog);
-	gtk_widget_hide (GTK_WIDGET (dialog));
-
-	if (editor->fullname_editable && result == GTK_RESPONSE_OK) {
-		EContactName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		g_object_get (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_contact_name_to_string(name);
-			gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-
-		e_contact_name_free(editor->name);
-		editor->name = name;
-
-		file_as_set_style(editor, style);
-	}
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-#if notyet
-	GtkDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GTK_DIALOG(e_contact_editor_address_new(address));
-	g_object_set (dialog,
-		      "editable", editor->address_editable[editor->address_choice],
-		      NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gtk_dialog_run (dialog);
-
-	gtk_widget_hide (GTK_WIDGET (dialog));
-
-	if (editor->address_editable[editor->address_choice] && result == GTK_RESPONSE_OK) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-		int saved_choice = editor->address_choice;
-
-		editor->address_choice = -1;
-
-		g_object_get (dialog,
-			       "address", &new_address,
-			       NULL);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_TEXT_VIEW(address_widget)) {
-			GtkTextBuffer *buffer;
-			char *string = e_card_delivery_address_to_string(new_address);
-
-			buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (address_widget));
-
-			gtk_text_buffer_set_text (buffer, string, strlen (string));
-
-			g_free(string);
-		}
-
-		editor->address_choice = saved_choice;
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_unref(new_address);
-
-		widget_changed (NULL, editor);
-	}
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-#endif
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories = NULL;
-	GtkDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	ECategoriesMasterList *ecml;
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = g_strdup (gtk_entry_get_text(GTK_ENTRY(entry)));
-	else if (editor->contact)
-		categories = e_contact_get (editor->contact, E_CONTACT_CATEGORIES);
-
-	dialog = GTK_DIALOG(e_categories_new(categories));
-
-	if (dialog == NULL) {
-		GtkWidget *uh_oh = gtk_message_dialog_new (NULL,
-							   0, GTK_MESSAGE_ERROR,
-							   GTK_RESPONSE_OK,
-							   _("Category editor not available."));
-		g_free (categories);
-		gtk_widget_show (uh_oh);
-		return;
-	}
-
-	ecml = e_categories_master_list_wombat_new ();
-	g_object_set (dialog,
-		       "header", _("This contact belongs to these categories:"),
-		       "ecml", ecml,
-		       NULL);
-	g_object_unref (ecml);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gtk_dialog_run (dialog);
-	g_free (categories);
-	if (result == GTK_RESPONSE_OK) {
-		g_object_get (dialog,
-			      "categories", &categories,
-			      NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			e_contact_set (editor->contact, E_CONTACT_CATEGORIES, categories);
-
-		g_free(categories);
-	}
-	gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-typedef struct {
-	EContactEditor *ce;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-contact_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	e_contact_set (ce->contact, E_CONTACT_UID, (char*)id);
-
-	g_signal_emit (ce, contact_editor_signals[CONTACT_ADDED], 0,
-		       status, ce->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		ce->is_new_contact = FALSE;
-
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	g_object_unref (ce);
-	g_free (ecs);
-}
-
-static void
-contact_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	g_signal_emit (ce, contact_editor_signals[CONTACT_MODIFIED], 0,
-		       status, ce->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	g_object_unref (ce);
-	g_free (ecs);
-}
-
-/* Emits the signal to request saving a contact */
-static void
-save_contact (EContactEditor *ce, gboolean should_close)
-{
-	extract_info (ce);
-
-	if (ce->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->ce = ce;
-		g_object_ref (ecs->ce);
-
-		ecs->should_close = should_close;
-
-		gtk_widget_set_sensitive (ce->app, FALSE);
-		ce->in_async_call = TRUE;
-
-		if (ce->is_new_contact)
-			eab_merging_book_add_contact (ce->book, ce->contact, (EBookIdCallback)contact_added_cb, ecs);
-		else
-			eab_merging_book_commit_contact (ce->book, ce->contact, (EBookCallback)contact_modified_cb, ecs);
-	}
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	if (ce->app != NULL) {
-		gtk_widget_destroy (ce->app);
-		ce->app = NULL;
-		g_signal_emit (ce, contact_editor_signals[EDITOR_CLOSED], 0);
-	}
-}
-
-static gboolean
-prompt_to_save_changes (EContactEditor *editor)
-{
-	if (!editor->changed)
-		return TRUE;
-
-	switch (eab_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case GTK_RESPONSE_YES:
-		save_contact (editor, FALSE);
-		return TRUE;
-	case GTK_RESPONSE_NO:
-		return TRUE;
-	case GTK_RESPONSE_CANCEL:
-	default:
-		return FALSE;
-	}
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_contact (ce, FALSE);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	if (!prompt_to_save_changes (ce))
-		return;
-
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	EContact *contact;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-
-	contact = ce->contact;
-	eab_contact_save(_("Save Contact as VCard"), contact, GTK_WINDOW (ce->app));
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-
-	eab_send_contact(ce->contact, EAB_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-
-	eab_send_contact(ce->contact, EAB_DISPOSITION_AS_TO);
-}
-
-gboolean
-e_contact_editor_confirm_delete (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-	gint result;
-
-	dialog = gtk_message_dialog_new (parent,
-					 0,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_NONE,
-#if notyet
-					 /* XXX we really need to handle the plural case here.. */
-					 (plural
-					  ? _("Are you sure you want\n"
-					      "to delete these contacts?"))
-#endif
-					  _("Are you sure you want\n"
-					    "to delete this contact?"));
-
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-				GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	result = gtk_dialog_run(GTK_DIALOG (dialog));
-
-	gtk_widget_destroy (dialog);
-
-	return (result == GTK_RESPONSE_ACCEPT);
-}
-
-static void
-contact_deleted_cb (EBook *book, EBookStatus status, EContactEditor *ce)
-{
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	g_signal_emit (ce, contact_editor_signals[CONTACT_DELETED], 0,
-		       status, ce->contact);
-
-	/* always close the dialog after we successfully delete a card */
-	if (status == E_BOOK_ERROR_OK)
-		close_dialog (ce);
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-	EContact *contact = ce->contact;
-
-	g_object_ref(contact);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		
-		if (!ce->is_new_contact && ce->book) {
-			gtk_widget_set_sensitive (ce->app, FALSE);
-			ce->in_async_call = TRUE;
-
-			e_book_async_remove_contact (ce->book, contact, (EBookCallback)contact_deleted_cb, ce);
-		}
-	}
-
-	g_object_unref(contact);
-}
-
-/* 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);
-
-	gtk_widget_show(e_contact_print_contact_dialog_new(ce->contact));
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-#endif
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_contact (ce, TRUE);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-#endif
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),
-	E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"),
-	E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-contact-editor.xml",
-			       "evolution-contact-editor", NULL);
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	/* if we're saving, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "alignment-htmlmail");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "entry-blog");
-		list = add_to_tab_order(list, gui, "button-fulladdr");
-		list = add_to_tab_order(list, gui, "text-address");
-		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;
-	char *icon_path;
-
-	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_contact_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = E_CONTACT_EMAIL_1;
-	e_contact_editor->phone_choice[0] = E_CONTACT_PHONE_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CONTACT_PHONE_HOME;
-	e_contact_editor->phone_choice[2] = E_CONTACT_PHONE_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CONTACT_PHONE_MOBILE;
-#if 0
-	e_contact_editor->address_choice = 0;
-	e_contact_editor->address_mailing = -1;
-#endif	
-
-	e_contact_editor->contact = NULL;
-	e_contact_editor->changed = FALSE;
-	e_contact_editor->in_async_call = FALSE;
-	e_contact_editor->editable = TRUE;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL, NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	connect_arrow_button_signals(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))
-		g_signal_connect (wants_html, "toggled",
-				  G_CALLBACK (wants_html_changed), e_contact_editor);
-
- 	widget = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-mailingaddress");
-	if (widget && GTK_IS_TOGGLE_BUTTON(widget))
-		g_signal_connect (widget, "toggled",
-				  G_CALLBACK (address_mailing_changed), e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (full_name_clicked), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (full_addr_clicked), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (categories_clicked), e_contact_editor);
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", _("Contact Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = bonobo_dock_get_client_area (gnome_app_get_dock (GNOME_APP(e_contact_editor->app)));
-
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		g_object_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_window_get_ui_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)),
-					   NULL);
-
-	create_ui (e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "entry-fullname");
-	if (widget)
-		gtk_widget_grab_focus (widget);
-
-	/* Connect to the deletion of the dialog */
-
-	g_signal_connect (e_contact_editor->app, "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-
-	/* set the icon */
-	icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL);
-	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path);
-	g_free (icon_path);
-}
-
-void
-e_contact_editor_dispose (GObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-
-	if (e_contact_editor->writable_fields) {
-		g_object_unref(e_contact_editor->writable_fields);
-		e_contact_editor->writable_fields = NULL;
-	}
-	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);
-		e_contact_editor->email_list = NULL;
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-		e_contact_editor->email_info = NULL;
-	}
-	if (e_contact_editor->email_popup) {
-		g_object_unref(e_contact_editor->email_popup);
-		e_contact_editor->email_popup = NULL;
-	}
-	
-	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);
-		e_contact_editor->phone_list = NULL;
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-		e_contact_editor->phone_info = NULL;
-	}
-	if (e_contact_editor->phone_popup) {
-		g_object_unref(e_contact_editor->phone_popup);
-		e_contact_editor->phone_popup = NULL;
-	}
-	
-	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);
-		e_contact_editor->address_list = NULL;
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-		e_contact_editor->address_info = NULL;
-	}
-	if (e_contact_editor->address_popup) {
-		g_object_unref(e_contact_editor->address_popup);
-		e_contact_editor->address_popup = NULL;
-	}
-	
-	if (e_contact_editor->contact) {
-		g_object_unref(e_contact_editor->contact);
-		e_contact_editor->contact = NULL;
-	}
-	
-	if (e_contact_editor->book) {
-		g_object_unref(e_contact_editor->book);
-		e_contact_editor->book = NULL;
-	}
-
-	if (e_contact_editor->name) {
-		e_contact_name_free(e_contact_editor->name);
-		e_contact_editor->name = NULL;
-	}
-
-	if (e_contact_editor->company) {
-		g_free (e_contact_editor->company);
-		e_contact_editor->company = NULL;
-	}
-
-	if (e_contact_editor->gui) {
-		g_object_unref(e_contact_editor->gui);
-		e_contact_editor->gui = NULL;
-	}
-}
-
-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_contact) ? "1" : "0", NULL);
-}
-
-static void
-supported_fields_cb (EBook *book, EBookStatus status,
-		     EList *fields, EContactEditor *ce)
-{
-	if (!g_slist_find (all_contact_editors, ce)) {
-		g_warning ("supported_fields_cb called for book that's still around, but contact editor that's been destroyed.");
-		return;
-	}
-
-	g_object_set (ce,
-			"writable_fields", fields,
-			NULL);
-
-	e_contact_editor_show (ce);
-
-	command_state_changed (ce);
-}
-
-static void
-contact_editor_destroy_notify (void *data,
-			       GObject *where_the_object_was)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	all_contact_editors = g_slist_remove (all_contact_editors, ce);
-}
-
-EContactEditor *
-e_contact_editor_new (EBook *book,
-		      EContact *contact,
-		      gboolean is_new_contact,
-		      gboolean editable)
-{
-	EContactEditor *ce;
-
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (E_IS_CONTACT (contact), NULL);
-
-	ce = g_object_new (E_TYPE_CONTACT_EDITOR, NULL);
-
-	all_contact_editors = g_slist_prepend (all_contact_editors, ce);
-	g_object_weak_ref (G_OBJECT (ce), contact_editor_destroy_notify, ce);
-
-	g_object_ref (ce);
-	gtk_object_sink (GTK_OBJECT (ce));
-
-	g_object_set (ce,
-		      "book", book,
-		      "contact", contact,
-		      "is_new_contact", is_new_contact,
-		      "editable", editable,
-		      NULL);
-
-	if (book)
-		e_book_async_get_supported_fields (book, (EBookFieldsCallback)supported_fields_cb, ce);
-
-	return ce;
-}
-
-static void
-e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (object);
-	
-	switch (prop_id){
-	case PROP_BOOK:
-		if (editor->book)
-			g_object_unref(editor->book);
-		editor->book = E_BOOK(g_value_get_object (value));
-		g_object_ref (editor->book);
-		/* XXX more here about editable/etc. */
-		break;
-	case PROP_CONTACT:
-		if (editor->contact)
-			g_object_unref(editor->contact);
-		editor->contact = e_contact_duplicate(E_CONTACT(g_value_get_object (value)));
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		break;
-
-	case PROP_IS_NEW_CONTACT:
-		editor->is_new_contact = g_value_get_boolean (value) ? TRUE : FALSE;
-		break;
-
-	case PROP_EDITABLE: {
-		gboolean new_value = g_value_get_boolean (value) ? TRUE : FALSE;
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-
-	case PROP_CHANGED: {
-		gboolean new_value = g_value_get_boolean (value) ? TRUE : FALSE;
-		gboolean changed = (editor->changed != new_value);
-
-		editor->changed = new_value;
-
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-	case PROP_WRITABLE_FIELDS:
-		if (editor->writable_fields)
-			g_object_unref(editor->writable_fields);
-		editor->writable_fields = g_value_get_object (value);
-		if (editor->writable_fields)
-			g_object_ref (editor->writable_fields);
-		else
-			editor->writable_fields = e_list_new(NULL, NULL, NULL);
-		enable_writable_fields (editor);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, e_contact_editor->book);
-		break;
-
-	case PROP_CONTACT:
-		extract_info(e_contact_editor);
-		g_value_set_object (value, e_contact_editor->contact);
-		break;
-
-	case PROP_IS_NEW_CONTACT:
-		g_value_set_boolean (value, e_contact_editor->is_new_contact ? TRUE : FALSE);
-		break;
-
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor->editable ? TRUE : FALSE);
-		break;
-
-	case PROP_CHANGED:
-		g_value_set_boolean (value, e_contact_editor->changed ? TRUE : FALSE);
-		break;
-
-	case PROP_WRITABLE_FIELDS:
-		if (e_contact_editor->writable_fields)
-			g_value_set_object (value, e_list_duplicate (e_contact_editor->writable_fields));
-		else
-			g_value_set_object (value, NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gboolean *push_in,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.x;
-	*y += button->allocation.y;
-
-	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;
-
-	*push_in = FALSE;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label)
-{
-	gint menu_item;
-
-	g_signal_stop_emission_by_name (widget, "button_press_event");
-
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor, widget);
-	if ( menu_item != -1 ) {
-		GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-		if (label_widget && GTK_IS_LABEL(label_widget)) {
-			g_object_set (label_widget,
-				      "label", _(g_list_nth_data(*list, menu_item)),
-				      NULL);
-		}
-	}
-	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)
-{
-	if (editor->phone_list == NULL) {
-		int i;
-
-		for (i = 0; i < G_N_ELEMENTS (phones); i ++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(e_contact_pretty_name (phones[i])));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			g_object_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-		g_object_ref (editor->phone_popup);
-		gtk_object_sink (GTK_OBJECT (editor->phone_popup));
-	}
-}
-
-static void
-e_contact_editor_build_email_ui (EContactEditor *editor)
-{
-	int i;
-
-	if (editor->email_list == NULL) {
-		for (i = 0; i < G_N_ELEMENTS (emails); i++)
-			editor->email_list = g_list_append(editor->email_list, g_strdup(e_contact_pretty_name (emails[i])));
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			g_object_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-		g_object_ref (editor->email_popup);
-		gtk_object_sink (GTK_OBJECT (editor->email_popup));
-	}
-}
-
-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 )
-			g_object_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-		g_object_ref (editor->address_popup);
-		gtk_object_sink (GTK_OBJECT (editor->address_popup));
-	}
-}
-
-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 < G_N_ELEMENTS (phones); i++) {
-		char *phone = e_contact_get (editor->contact, phones[i]);
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       phone && *phone);
-		g_free (phone);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label);
-	
-	if (result != -1) {
-		GtkWidget *w = glade_xml_get_widget (editor->gui, entry);
-		editor->phone_choice[which - 1] = phones[result];
-		set_fields (editor);
-		enable_widget (glade_xml_get_widget (editor->gui, label), TRUE);
-		enable_widget (w, 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 < G_N_ELEMENTS (emails); i++) {
-		char *string = e_contact_get (editor->contact, emails[i]);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		g_free (string);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1");
-	
-	if (result != -1) {
-		GtkWidget *entry = glade_xml_get_widget (editor->gui, "entry-email1");
-		editor->email_choice = result;
-
-		set_fields (editor);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-		enable_widget (entry, editor->editable);
-		enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-#if notyet
-	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);
-	}
-
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->address_editable[result]);
-		enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-mailingaddress"), editor->address_editable[result]);
-	}
-#endif
-}
-
-static void
-find_address_mailing (EContactEditor *editor)
-{
-#if notyet
-	const ECardDeliveryAddress *address;
-	int i;
-	
-	editor->address_mailing = -1;
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		address = e_card_simple_get_delivery_address(editor->simple, i);
-		if (address && (address->flags & E_CARD_ADDR_DEFAULT)) {
-			if (editor->address_mailing == -1) {
-				editor->address_mailing = i;
-			} else {
-				ECardDeliveryAddress *new;
-				
-				new = e_card_delivery_address_copy (address);
-				new->flags &= ~E_CARD_ADDR_DEFAULT;
-				e_card_simple_set_delivery_address(editor->simple, i, new);
-				e_card_delivery_address_unref (new);
-			}
-		}
-	}
-#endif
-}
-
-static void
-set_field(EContactEditor *editor, GtkEntry *entry, const char *string)
-{
-	const char *oldstring = gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring)) {
-		g_signal_handlers_block_matched (entry,
-						 G_SIGNAL_MATCH_DATA,
-						 0, 0, NULL, NULL, editor);
-		gtk_entry_set_text(entry, string);
-		g_signal_handlers_unblock_matched (entry,
-						   G_SIGNAL_MATCH_DATA,
-						   0, 0, NULL, NULL, editor);
-	}
-}
-
-static void
-set_phone_field(EContactEditor *editor, GtkWidget *entry, const char *phone_number)
-{
-	set_field(editor, GTK_ENTRY(entry), phone_number ? phone_number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-	GtkWidget *label_widget;
-	int i;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(editor, entry, e_contact_get_const(editor->contact, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(editor, entry, e_contact_get_const(editor->contact, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(editor, entry, e_contact_get_const(editor->contact, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(editor, entry, e_contact_get_const(editor->contact, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(editor, GTK_ENTRY(entry), e_contact_get_const(editor->contact, editor->email_choice));
-
-
-	e_contact_editor_build_address_ui (editor);
-
-#if notyet
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-
-		if (address && address->data && *address->data)
-			break;
-	}
-	if (i == E_CARD_SIMPLE_ADDRESS_ID_LAST)
-		i = 0;
-
-	label_widget = glade_xml_get_widget(editor->gui, "label-address");
-	if (label_widget && GTK_IS_LABEL(label_widget)) {
-		g_object_set (label_widget,
-			       "label", _(g_list_nth_data(editor->address_list, i)),
-			       NULL);
-	}
-
-	set_address_field(editor, i);
-#endif
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-#if notyet
-	GtkWidget *text, *check;
-	
-	text = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (text && GTK_IS_TEXT_VIEW(text)) {
-		GtkTextBuffer *buffer;
-		GtkTextIter start_iter, end_iter;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
-
-		gtk_text_buffer_get_start_iter (buffer, &start_iter);
-		gtk_text_buffer_get_end_iter (buffer, &end_iter);
-
-		gtk_text_buffer_delete (buffer, &start_iter, &end_iter);
-
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data)
-			gtk_text_buffer_insert (buffer, &start_iter, address->data, strlen (address->data));
-
-		check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress");
-		if (check && GTK_IS_CHECK_BUTTON (check)) {
-			if (address && address->data)
-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), 
-							      address->flags & E_CARD_ADDR_DEFAULT);
-			else
-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
-		}
-		
-		editor->address_choice = result;
-	}
-#endif
-}
-
-static struct {
-	char *id;
-	EContactField field;
-} field_mapping [] = {
-	{ "entry-fullname", E_CONTACT_FULL_NAME },
-	{ "entry-web", E_CONTACT_HOMEPAGE_URL },
-	{ "entry-blog", E_CONTACT_BLOG_URL },
-	{ "entry-company", E_CONTACT_ORG },
-	{ "entry-department", E_CONTACT_ORG_UNIT },
-	{ "entry-office", E_CONTACT_OFFICE },
-	{ "entry-jobtitle", E_CONTACT_TITLE },
-	{ "entry-profession", E_CONTACT_ROLE },
-	{ "entry-manager", E_CONTACT_MANAGER },
-	{ "entry-assistant", E_CONTACT_ASSISTANT },
-	{ "entry-nickname", E_CONTACT_NICKNAME },
-	{ "entry-spouse", E_CONTACT_SPOUSE },
-	{ "text-comments", E_CONTACT_NOTE },
-	{ "entry-categories", E_CONTACT_CATEGORIES },
-	{ "entry-caluri", E_CONTACT_CALENDAR_URI },
-	{ "entry-fburl", E_CONTACT_FREEBUSY_URL },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-
-	if (!widget)
-		return;
-
-	if (E_IS_URL_ENTRY (widget))
-		widget = e_url_entry_get_entry (E_URL_ENTRY (widget));
-
-	if (GTK_IS_TEXT_VIEW (widget)) {
-		if (value)
-			gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)),
-						  value, strlen (value));
-	}
-	else if (GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value)
-			gtk_editable_insert_text(editable, value, strlen(value), &position);
-	}
-}
-
-static void
-disable_widget_foreach (char *key, GtkWidget *widget, gpointer closure)
-{
-	enable_widget (widget, FALSE);
-}
-
-static struct {
-	char *widget_name;
-	EContactField field_id;
-	gboolean desensitize_for_read_only;
-} widget_field_mappings[] = {
-	{ "entry-web", E_CONTACT_HOMEPAGE_URL, TRUE },
-	{ "accellabel-web", E_CONTACT_HOMEPAGE_URL },
-
-	{ "entry-blog", E_CONTACT_BLOG_URL, TRUE },
-	{ "accellabel-blog", E_CONTACT_BLOG_URL },
-
-	{ "entry-jobtitle", E_CONTACT_TITLE, TRUE },
-	{ "label-jobtitle", E_CONTACT_TITLE },
-
-	{ "entry-company", E_CONTACT_ORG, TRUE },
-	{ "label-company", E_CONTACT_ORG },
-
-	{ "combo-file-as", E_CONTACT_FILE_AS, TRUE },
-	{ "entry-file-as", E_CONTACT_FILE_AS, TRUE },
-	{ "accellabel-fileas", E_CONTACT_FILE_AS },
-
-	{ "label-department", E_CONTACT_ORG_UNIT },
-	{ "entry-department", E_CONTACT_ORG_UNIT, TRUE },
-
-	{ "label-office", E_CONTACT_OFFICE },
-	{ "entry-office", E_CONTACT_OFFICE, TRUE },
-
-	{ "label-profession", E_CONTACT_ROLE },
-	{ "entry-profession", E_CONTACT_ROLE, TRUE },
-
-	{ "label-manager", E_CONTACT_MANAGER },
-	{ "entry-manager", E_CONTACT_MANAGER, TRUE },
-
-	{ "label-assistant", E_CONTACT_ASSISTANT },
-	{ "entry-assistant", E_CONTACT_ASSISTANT, TRUE },
-
-	{ "label-nickname", E_CONTACT_NICKNAME },
-	{ "entry-nickname", E_CONTACT_NICKNAME, TRUE },
-
-	{ "label-spouse", E_CONTACT_SPOUSE },
-	{ "entry-spouse", E_CONTACT_SPOUSE, TRUE },
-
-	{ "label-birthday", E_CONTACT_BIRTH_DATE },
-	{ "dateedit-birthday", E_CONTACT_BIRTH_DATE, TRUE },
-
-	{ "label-anniversary", E_CONTACT_ANNIVERSARY },
-	{ "dateedit-anniversary", E_CONTACT_ANNIVERSARY, TRUE },
-
-	{ "label-comments", E_CONTACT_NOTE },
-	{ "text-comments", E_CONTACT_NOTE, TRUE },
-
-	{ "entry-fullname", E_CONTACT_FULL_NAME, TRUE },
-
-	{ "button-categories", E_CONTACT_CATEGORIES, TRUE },
-	{ "entry-categories", E_CONTACT_CATEGORIES, TRUE },
-
-	{ "label-caluri", E_CONTACT_CALENDAR_URI },
-	{ "entry-caluri", E_CONTACT_CALENDAR_URI, TRUE },
-
-	{ "label-fburl", E_CONTACT_FREEBUSY_URL },
-	{ "entry-fburl", E_CONTACT_FREEBUSY_URL, 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;
-	char *widget_name;
-
-	if (!fields)
-		return;
-
-	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 < G_N_ELEMENTS (phones); i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_contact_field_name(phones[i]),
-				     editor->phone_info[i].widget);
-	e_contact_editor_build_email_ui (editor);
-	for (i = 0; i < G_N_ELEMENTS (emails); i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_contact_field_name(phones[i]),
-				     editor->email_info[i].widget);
-#if notyet
-	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);
-#endif
-
-	/* then disable them all */
-	g_hash_table_foreach (dropdown_hash, (GHFunc)disable_widget_foreach, NULL);
-
-	/* disable the label widgets for the dropdowns (4 phone, 1
-           email and the toggle button, and 1 address and one for
-           the full address button */
-	for (i = 0; i < 4; i ++) {
-		widget_name = g_strdup_printf ("label-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-		widget_name = g_strdup_printf ("entry-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-	}
-	enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-mailingaddress"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "label-address"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "text-address"), FALSE);
-
-	editor->fullname_editable = 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);
-		int i;
-
-		if (widget) {
-			enable_widget (widget, TRUE);
-		}
-		else {
-			/* if it's not a field that's handled by the
-                           dropdown items, add it to the has to be
-                           used in the second step */
-			g_hash_table_insert (supported_hash, field, field);
-		}
-
-#if notyet
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_address_to_field(i)))) {
-				editor->address_editable [i] = TRUE;
-			}
-		}
-#endif
-
-		/* 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_contact_field_name (editor->email_choice))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-		}
-		else if (!strcmp (field, e_contact_field_name (editor->address_choice))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-mailingaddress"), editor->editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-		}
-		else for (i = 0; i < 4; i ++) {
-			if (!strcmp (field, e_contact_field_name (editor->phone_choice[i]))) {
-				widget_name = g_strdup_printf ("label-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), TRUE);
-				g_free (widget_name);
-				widget_name = g_strdup_printf ("entry-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), editor->editable);
-				g_free (widget_name);
-			}
-		}
-	}
-
-	/* handle the label next to the dropdown widgets */
-
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		gboolean enabled;
-		GtkWidget *w;
-		const char *field;
-
-		w = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-		if (!w) {
-			g_warning (_("Could not find widget for a field: `%s'"),
-				   widget_field_mappings[i].widget_name);
-			continue;
-		}
-		field = e_contact_field_name (widget_field_mappings[i].field_id);
-
-		enabled = (g_hash_table_lookup (supported_hash, field) != NULL);
-
-		if (widget_field_mappings[i].desensitize_for_read_only && !editor->editable) {
-			enabled = FALSE;
-		}
-
-		enable_widget (w, enabled);
-	}
-
-	editor->fullname_editable = (g_hash_table_lookup (supported_hash, "full_name") != NULL);
-
-	g_hash_table_destroy (dropdown_hash);
-	g_hash_table_destroy (supported_hash);
-}
-
-static void
-set_editable (EContactEditor *editor)
-{
-	int i;
-	char *entry;
-	/* set the sensitivity of all the non-dropdown entry/texts/dateedits */
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		if (widget_field_mappings[i].desensitize_for_read_only) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-			enable_widget (widget, editor->editable);
-		}
-	}
-
-	/* handle the phone dropdown entries */
-	for (i = 0; i < 4; i ++) {
-		entry = g_strdup_printf ("entry-phone%d", i+1);
-
-		enable_widget (glade_xml_get_widget(editor->gui, entry),
-			       editor->editable);
-
-		g_free (entry);
-	}
-
-	/* handle the email dropdown entry */
-	entry = "entry-email1";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-	enable_widget (glade_xml_get_widget(editor->gui, "checkbutton-htmlmail"),
-		       editor->editable);
-
-	/* handle the address dropdown entry */
-	entry = "text-address";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	EContact *contact = editor->contact;
-	if (contact) {
-		char *file_as;
-		EContactName *name;
-		EContactDate *anniversary;
-		EContactDate *bday;
-		int i;
-		GtkWidget *widget;
-		gboolean wants_html;
-
-		g_object_get (contact,
-			      "file_as",          &file_as,
-			      "name",             &name,
-			      "anniversary",      &anniversary,
-			      "birth_date",       &bday,
-			      "wants_html",       &wants_html,
-			      NULL);
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			char *string = e_contact_get (contact, field_mapping[i].field);
-			fill_in_field(editor, field_mapping[i].id, string);
-			g_free (string);
-		}
-
-		find_address_mailing (editor);
-		
-		widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-		if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-			g_object_set (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);
-
-		g_free (file_as);
-		if (editor->name)
-			e_contact_name_free(editor->name);
-		editor->name = 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);
-		}
-
-		e_contact_date_free (anniversary);
-		e_contact_date_free (bday);
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, EContact *contact, char *editable_id, EContactField field)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	char *string = NULL;
-
-	if (!widget)
-		return;
-
-	if (E_IS_URL_ENTRY (widget))
-		widget = e_url_entry_get_entry (E_URL_ENTRY (widget));
-
-	if (GTK_IS_EDITABLE (widget))
-		string = gtk_editable_get_chars(GTK_EDITABLE (widget), 0, -1);
-	else if (GTK_IS_TEXT_VIEW (widget)) {
-		GtkTextIter start, end;
-		GtkTextBuffer *buffer;
-
-		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
-		gtk_text_buffer_get_start_iter (buffer, &start);
-		gtk_text_buffer_get_end_iter (buffer, &end);
-
-		string = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-	}
-
-	if (string && *string)
-		e_contact_set (contact, field, string);
-	else
-		e_contact_set (contact, field, NULL);
-
-	if (string) g_free(string);
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	EContact *contact = editor->contact;
-	if (contact) {
-		EContactDate anniversary;
-		EContactDate bday;
-		int i;
-		GtkWidget *widget;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				e_contact_set (contact, E_CONTACT_FILE_AS, string);
-
-			g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, contact, field_mapping[i].id, field_mapping[i].field);
-		}
-
-		if (editor->name)
-			e_contact_set (contact, E_CONTACT_NAME, editor->name);
-
-		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); */
-				e_contact_set (contact, E_CONTACT_ANNIVERSARY, &anniversary);
-			} else
-				e_contact_set (contact, E_CONTACT_ANNIVERSARY, 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); */
-				e_contact_set (contact, E_CONTACT_BIRTH_DATE, &bday);
-			} else
-				e_contact_set (contact, E_CONTACT_BIRTH_DATE, NULL);
-		}
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_raise (EContactEditor *editor)
-{
-	/* FIXME: perhaps we should raise at realize time */
-	if (GTK_WIDGET (editor->app)->window)
-		gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
-
-/**
- * e_contact_editor_show:
- * @ce: The %EContactEditor object.
- *
- * Shows the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_show (EContactEditor *ce)
-{
-	gtk_widget_show (ce->app);
-}
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	GtkWidget *widget = e_date_edit_new ();
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
-					   TRUE);
-	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
-	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
-	gtk_widget_show (widget);
-	return widget;
-}
-
-GtkWidget *
-e_contact_editor_create_web(gchar *name,
-			    gchar *string1, gchar *string2,
-			    gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_web(gchar *name,
-			    gchar *string1, gchar *string2,
-			    gint int1, gint int2)
-{
-	GtkWidget *widget = e_url_entry_new ();
-	gtk_widget_show (widget);
-	return widget;
-}
-
-static void
-enable_widget (GtkWidget *widget, gboolean enabled)
-{
-	if (GTK_IS_ENTRY (widget)) {
-		gtk_editable_set_editable (GTK_EDITABLE (widget), enabled);
-	}
-	else if (GTK_IS_TEXT_VIEW (widget)) {
-		gtk_text_view_set_editable (GTK_TEXT_VIEW (widget), enabled);
-	}
-	else if (GTK_IS_COMBO (widget)) {
-		gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (widget)->entry),
-					   enabled);
-		gtk_widget_set_sensitive (GTK_COMBO (widget)->button, enabled);
-	}
-	else if (E_IS_URL_ENTRY (widget)) {
-		GtkWidget *e = e_url_entry_get_entry (E_URL_ENTRY (widget));
-		gtk_editable_set_editable (GTK_EDITABLE (e), enabled);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		e_date_edit_set_editable (E_DATE_EDIT (widget), enabled);
-	}
-	else
-		gtk_widget_set_sensitive (widget, enabled);
-}
-
-
-gboolean
-e_contact_editor_request_close_all (void)
-{
-	GSList *p;
-	GSList *pnext;
-	gboolean retval;
-
-	retval = TRUE;
-	for (p = all_contact_editors; p != NULL; p = pnext) {
-		pnext = p->next;
-
-		e_contact_editor_raise (E_CONTACT_EDITOR (p->data));
-		if (! prompt_to_save_changes (E_CONTACT_EDITOR (p->data))) {
-			retval = FALSE;
-			break;
-		}
-
-		close_dialog (E_CONTACT_EDITOR (p->data));
-	}
-
-	return retval;
-}
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 27baa9f0fc..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* 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_TYPE_CONTACT_EDITOR			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	EBook *book;
-	EContact *contact;
-
-	/* 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;
-
-	EContactName *name;
-	char *company;
-
-	EContactField email_choice;
-	EContactField phone_choice[4];
-	EContactField address_choice;
-	EContactField address_mailing;
-	
-	/* Whether we are editing a new contact or an existing one */
-	guint is_new_contact : 1;
-
-	/* Whether the contact has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether the fullname will accept modifications */
-	guint fullname_editable : 1;
-
-#if notyet
-	/* Whether each of the addresses are editable */
-	gboolean address_editable[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-#endif
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	EList *writable_fields;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* contact_added)    (EContactEditor *ce, EBookStatus status, EContact *contact);
-	void (* contact_modified) (EContactEditor *ce, EBookStatus status, EContact *contact);
-	void (* contact_deleted)  (EContactEditor *ce, EBookStatus status, EContact *contact);
-	void (* editor_closed)    (EContactEditor *ce);
-};
-
-EContactEditor *e_contact_editor_new                (EBook          *book,
-						     EContact       *contact,
-						     gboolean        is_new_contact,
-						     gboolean        editable);
-GType           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);
-
-gboolean        e_contact_editor_request_close_all  (void);
-
-G_END_DECLS
-
-#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 0f59c1145f..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/util/eab-book-util.h>
-#include "e-contact-editor.h"
-#include "e-contact-quick-add.h"
-#include "eab-contact-merging.h"
-
-typedef struct _QuickAdd QuickAdd;
-struct _QuickAdd {
-	gchar *name;
-	gchar *email;
-	EContact *contact;
-
-	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->contact = e_contact_new ();
-	qa->refs = 1;
-	return qa;
-}
-
-static void
-quick_add_ref (QuickAdd *qa)
-{
-	if (qa) {
-		++qa->refs;
-	}
-}
-
-static void
-quick_add_unref (QuickAdd *qa)
-{
-	if (qa) {
-		--qa->refs;
-		if (qa->refs == 0) {
-			g_free (qa->name);
-			g_free (qa->email);
-			g_object_unref (qa->contact);
-			g_free (qa);
-		}
-	}
-}
-
-static void
-quick_add_set_name (QuickAdd *qa, const gchar *name)
-{
-#if notyet
-	EContactName *card_name;
-
-	if (name == qa->name)
-		return;
-
-	g_free (qa->name);
-
-	card_name = e_card_name_from_string (name);
-	qa->name = e_card_name_to_string (card_name);
-
-	g_object_set (qa->card,
-			"full_name", qa->name,
-			NULL);
-
-	e_card_name_unref (card_name);
-#endif
-}
-
-static void
-quick_add_set_email (QuickAdd *qa, const gchar *email)
-{
-	if (email == qa->email)
-		return;
-
-	g_free (qa->email);
-	qa->email = g_strdup (email);
-
-	e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (char*)email);
-}
-
-static void
-merge_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (status == E_BOOK_ERROR_OK) {
-		eab_merging_book_add_contact (book, qa->contact, NULL, NULL);
-		if (qa->cb)
-			qa->cb (qa->contact, qa->closure);
-		g_object_unref (book);
-	} else {
-		/* Something went wrong. */
-		if (book)
-			g_object_unref (book);
-		if (qa->cb)
-			qa->cb (NULL, qa->closure);
-	}
-	
-	quick_add_unref (qa);
-}
-
-static void
-quick_add_merge_contact (QuickAdd *qa)
-{
-	quick_add_ref (qa);
-
-	addressbook_load_default_book (merge_cb, qa);
-}
-
-
-/*
- * Raise a contact editor with all fields editable, and hook up all signals accordingly.
- */
-
-static void
-contact_added_cb (EContactEditor *ce, EBookStatus status, EContact *contact, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (ce), "quick_add");
-
-	if (qa) {
-
-		if (qa->cb)
-			qa->cb (qa->contact, qa->closure);
-	
-		/* We don't need to unref qa because we set_data_full below */
-		g_object_set_data (G_OBJECT (ce), "quick_add", NULL);
-	}
-}
-
-static void
-editor_closed_cb (GtkWidget *w, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) g_object_get_data (G_OBJECT (w), "quick_add");
-
-	if (qa)
-		/* We don't need to unref qa because we set_data_full below */
-		g_object_set_data (G_OBJECT (w), "quick_add", NULL);
-
-	g_object_unref (w);
-}
-
-static void
-ce_have_book (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (status != E_BOOK_ERROR_OK) {
-		if (book)
-			g_object_unref (book);
-		g_warning ("Couldn't open local address book.");
-		quick_add_unref (qa);
-	} else {
-		EContactEditor *contact_editor = e_contact_editor_new (book, qa->contact, TRUE, TRUE /* XXX */);
-
-		/* mark it as changed so the Save buttons are enabled when we bring up the dialog. */
-		g_object_set (contact_editor,
-				"changed", TRUE,
-				NULL);
-
-		/* We pass this via object data, so that we don't get a dangling pointer referenced if both
-		   the "contact_added" and "editor_closed" get emitted.  (Which, based on a backtrace in bugzilla,
-		   I think can happen and cause a crash. */
-		g_object_set_data_full (G_OBJECT (contact_editor), "quick_add", qa,
-					(GDestroyNotify) quick_add_unref);
-
-		g_signal_connect (contact_editor,
-				  "contact_added",
-				  G_CALLBACK (contact_added_cb),
-				  NULL);
-		g_signal_connect (contact_editor,
-				  "editor_closed",
-				  G_CALLBACK (editor_closed_cb),
-				  NULL);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-edit_contact (QuickAdd *qa)
-{
-	addressbook_load_default_book (ce_have_book, qa);
-}
-
-#define QUICK_ADD_RESPONSE_EDIT_FULL 2
-
-static void
-clicked_cb (GtkWidget *w, gint button, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	/* Get data out of entries. */
-	if (button == GTK_RESPONSE_OK || button == QUICK_ADD_RESPONSE_EDIT_FULL) {
-		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 = tmp;
-		}
-
-		if (qa->email_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->email_entry), 0, -1);
-			email = 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 == GTK_RESPONSE_OK) {
-
-		/* OK */
-		quick_add_merge_contact (qa);
-
-	} else if (button == QUICK_ADD_RESPONSE_EDIT_FULL) {
-		
-		/* EDIT FULL */
-		edit_contact (qa);
-
-	} else {
-		/* CANCEL */
-		quick_add_unref (qa);
-	}
-
-}
-
-static GtkWidget *
-build_quick_add_dialog (QuickAdd *qa)
-{
-	GtkWidget *dialog;
-	GtkTable *table;
-	const gint xpad=6, ypad=6;
-
-	g_return_val_if_fail (qa != NULL, NULL);
-
-	dialog = gtk_dialog_new_with_buttons (_("Contact Quick-Add"),
-					      NULL, /* XXX */
-					      (GtkDialogFlags) 0,
-					      _("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
-					        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
-
-	g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
-
-	qa->name_entry = gtk_entry_new ();
-	if (qa->name)
-		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), qa->name);
-
-
-	qa->email_entry = gtk_entry_new ();
-	if (qa->email)
-		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), qa->email);
-
-	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
-
-	gtk_table_attach (table, gtk_label_new_with_mnemonic (_("_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_with_mnemonic (_("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_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
-					6);
-
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox),6);
-
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (table),
-			    TRUE, TRUE, 6);
-	gtk_widget_show_all (GTK_WIDGET (table));
-			  
-	
-	return dialog;
-}
-
-void
-e_contact_quick_add (const gchar *in_name, const gchar *email,
-		     EContactQuickAddCallback cb, gpointer closure)
-{
-	QuickAdd *qa;
-	GtkWidget *dialog;
-	gchar *name = NULL;
-	gint len;
-
-	/* We need to have *something* to work with. */
-	if (in_name == NULL && email == NULL) {
-		if (cb)
-			cb (NULL, closure);
-		return;
-	}
-
-	if (in_name) {
-		name = g_strdup (in_name);
-
-		/* Remove extra whitespace and the quotes some mailers put around names. */
-		g_strstrip (name);
-		len = strlen (name);
-		if ((name[0] == '\'' && name[len-1] == '\'') || (name[0] == '"' && name[len-1] == '"')) {
-			name[0] = ' ';
-			name[len-1] = ' ';
-		}
-		g_strstrip (name);
-	}
-
-	qa = quick_add_new ();
-	qa->cb = cb;
-	qa->closure = closure;
-	if (name)
-		quick_add_set_name (qa, name);
-	if (email)
-		quick_add_set_email (qa, email);
-
-	dialog = build_quick_add_dialog (qa);
-	gtk_widget_show_all (dialog);
-
-	g_free (name);
-}
-
-void
-e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure)
-{
-	gchar *name=NULL, *email=NULL;
-	const gchar *last_at, *s;
-	gboolean in_quote;
-
-	if (text == NULL) {
-		e_contact_quick_add (NULL, NULL, cb, closure);
-		return;
-	}
-
-	/* Look for things that look like e-mail addresses embedded in text */
-	in_quote = FALSE;
-	last_at = NULL;
-	for (s = text; *s; ++s) {
-		if (*s == '@' && !in_quote)
-			last_at = s;
-		else if (*s == '"')
-			in_quote = !in_quote;
-	}
-
-	
-	if (last_at == NULL) {
-		/* No at sign, so we treat it all as the name */
-		name = g_strdup (text);
-	} else {
-		gboolean bad_char = FALSE;
-		
-		/* walk backwards to whitespace or a < or a quote... */
-		while (last_at >= text && !bad_char
-		       && !(isspace ((gint) *last_at) || *last_at == '<' || *last_at == '"')) {
-			/* Check for some stuff that can't appear in a legal e-mail address. */
-			if (*last_at == '['
-			    || *last_at == ']'
-			    || *last_at == '('
-			    || *last_at == ')')
-				bad_char = TRUE;
-			--last_at;
-		}
-		if (last_at < text)
-			last_at = text;
-
-		/* ...and then split the text there */
-		if (!bad_char) {
-			if (text < last_at)
-				name = g_strndup (text, last_at-text);
-			email = g_strdup (last_at);
-		}
-	}
-
-	/* If all else has failed, make it the name. */
-	if (name == NULL && email == NULL) 
-		name = g_strdup (text);
-		
-
-
-	/* Clean up email, remove bracketing <>s */
-	if (email && *email) {
-		gboolean changed = FALSE;
-		g_strstrip (email);
-		if (*email == '<') {
-			*email = ' ';
-			changed = TRUE;
-		}
-		if (email[strlen (email)-1] == '>') {
-			email[strlen (email)-1] = ' ';
-			changed = TRUE;
-		}
-		if (changed)
-			g_strstrip (email);
-	}
-	
-
-	e_contact_quick_add (name, email, cb, closure);
-	g_free (name);
-	g_free (email);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
deleted file mode 100644
index a969211915..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_CONTACT_QUICK_ADD_H__
-#define __E_CONTACT_QUICK_ADD_H__
-
-#include <libebook/e-contact.h>
-
-typedef void (*EContactQuickAddCallback) (EContact *new_contact, 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/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index c7767b9751..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,446 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-checkaddress">
-  <property name="title" translatable="yes">Full Address</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox-container">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-checkaddress">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">4</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-street">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Address:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-street</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-city">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Ci_ty:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-city</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-city">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-ext">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-po">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_PO Box:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-po</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-ext">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Address _2:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-ext</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-po">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-street">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-region">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_State/Province:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-region</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-region">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-country">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-country">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget2">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-code">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">3</property>
-	      <property name="right_attach">4</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-code">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_ZIP Code:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-code</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-country">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Countr_y:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-country</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index 9e170c93d0..0000000000
--- a/addressbook/gui/contact-editor/fullname.glade
+++ /dev/null
@@ -1,674 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-checkfullname">
-  <property name="title" translatable="yes">Full Name</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox-container">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table-checkfullname">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-title">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-title">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget2">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget4">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Mr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget6">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget7">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Mrs.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget8">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget9">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Ms.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget10">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Miss</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget12">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget13">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Dr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget14">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget15">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCombo" id="combo-suffix">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="entry-suffix">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="convertwidget16">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget17">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget18">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget19">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget20">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Sr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget21">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget22">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Jr.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget23">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget24">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">I</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget25">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget26">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">II</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget27">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget28">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">III</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget29">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget30">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Esq.</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkListItem" id="convertwidget31">
-		      <property name="visible">True</property>
-
-		      <child>
-			<widget class="GtkLabel" id="convertwidget32">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-first">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-middle">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry-last">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-first">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_First:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-first</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-title">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Title:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-title</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-middle">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Middle:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-middle</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-last">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Last:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-last</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-suffix">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Suffix:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">entry-suffix</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index 4a8c111563..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-#include "ebook/e-card.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--;
-	g_object_unref (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;
-
-	gnome_program_init("Contact Editor Test", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
-
-	glade_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (NULL, e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, FALSE);
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (NULL, e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, FALSE);
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (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 f151930645..0000000000
--- a/addressbook/gui/contact-list-editor/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.pure
-e-contact-list-editor-marshal.c
-e-contact-list-editor-marshal.h
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
deleted file mode 100644
index 43abc3ff47..0000000000
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_builddir)/shell				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libecontactlisteditor.la
-
-libecontactlisteditor_la_SOURCES = 		\
-	$(MARSHAL_GENERATED)			\
-	e-contact-list-editor.c			\
-	e-contact-list-editor.h			\
-	e-contact-list-model.c			\
-	e-contact-list-model.h
-
-MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA  = contact-list-editor.glade
-etspec_DATA = e-contact-list-editor.etspec
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(glade_DATA)	\
-	     $(etspec_DATA)	\
-	     e-contact-list-editor-marshal.list
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 002e697105..0000000000
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-<requires lib="bonobo"/>
-
-<widget class="GnomeApp" id="contact list editor">
-  <property name="title" translatable="yes">contact-list-editor</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">426</property>
-  <property name="default_height">304</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="enable_layout_config">True</property>
-
-  <child internal-child="dock">
-    <widget class="BonoboDock" id="dock1">
-      <property name="visible">True</property>
-      <property name="allow_floating">True</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox8">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox6">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label10">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_List name:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">list-name-entry</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="list-name-entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="has_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="Custom" id="list-image">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">evolution-contacts-plain.png</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Sat, 23 Jun 2001 05:59:21 GMT</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame3">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox7">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox9">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label11">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Type an email address or drag a contact into the list below:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="email-entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="contact-list-table">
-			  <property name="visible">True</property>
-			  <property name="creation_function">e_contact_list_editor_create_table</property>
-			  <property name="string1"></property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Sat, 23 Jun 2001 06:00:16 GMT</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="visible-addrs-checkbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Hide addresses when sending mail to this list</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox10">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label12">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">
-</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVButtonBox" id="vbuttonbox4">
-			  <property name="visible">True</property>
-			  <property name="layout_style">GTK_BUTTONBOX_START</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkButton" id="add-email-button">
-			      <property name="visible">True</property>
-			      <property name="can_default">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-add</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="remove-button">
-			      <property name="visible">True</property>
-			      <property name="can_default">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-remove</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Members</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">True</property>
-      <property name="fill">True</property>
-    </packing>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list b/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
deleted file mode 100644
index 8d94a0bf3b..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
+++ /dev/null
@@ -1,4 +0,0 @@
-INT:OBJECT
-NONE:INT,OBJECT
-NONE:INT,OBJECT
-NONE:NONE
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 a475d15cd6..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,1297 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-list-editor.h"
-
-#include <string.h>
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-window.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include "shell/evolution-shell-component-utils.h"
-
-#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "addressbook/util/eab-book-util.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-list-model.h"
-#include "e-contact-list-editor-marshal.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_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_list_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_list_editor_dispose (GObject *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 gboolean image_drag_motion_cb (GtkWidget *widget,
-				      GdkDragContext *context,
-				      gint x, gint y, guint time, EContactListEditor *editor);
-static gboolean image_drag_drop_cb (GtkWidget *widget,
-				    GdkDragContext *context,
-				    gint x, gint y, guint time, EContactListEditor *editor);
-static void image_drag_data_received_cb (GtkWidget *widget,
-					 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,
-	DND_TARGET_TYPE_URI_LIST
-};
-#define VCARD_TYPE "text/x-vcard"
-#define URI_LIST_TYPE "text/uri-list"
-
-static GtkTargetEntry list_drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]);
-
-static GtkTargetEntry image_drag_types[] = {
-	{ URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST },
-};
-static const int num_image_drag_types = sizeof (image_drag_types) / sizeof (image_drag_types[0]);
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_CONTACT,
-	PROP_IS_NEW_LIST,
-	PROP_EDITABLE
-};
-
-static GSList *all_contact_list_editors = NULL;
-
-GType
-e_contact_list_editor_get_type (void)
-{
-	static GType cle_type = 0;
-
-	if (!cle_type) {
-		static const GTypeInfo cle_info =  {
-			sizeof (EContactListEditorClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_list_editor_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactListEditor),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_list_editor_init,
-		};
-
-		cle_type = g_type_register_static (GTK_TYPE_OBJECT, "EContactListEditor", &cle_info, 0);
-	}
-
-	return cle_type;
-}
-
-
-static void
-e_contact_list_editor_class_init (EContactListEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (GTK_TYPE_OBJECT);
-
-	object_class->set_property = e_contact_list_editor_set_property;
-	object_class->get_property = e_contact_list_editor_get_property;
-	/* object_class->dispose = e_contact_list_editor_dispose;*/
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_CONTACT, 
-					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_CONTACT,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_IS_NEW_LIST, 
-					 g_param_spec_boolean ("is_new_list",
-							       _("Is New List"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	contact_list_editor_signals[LIST_ADDED] =
-		g_signal_new ("list_added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EContactListEditorClass, list_added),
-			      NULL, NULL,
-			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	contact_list_editor_signals[LIST_MODIFIED] =
-		g_signal_new ("list_modified",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EContactListEditorClass, list_modified),
-			      NULL, NULL,
-			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	contact_list_editor_signals[LIST_DELETED] =
-		g_signal_new ("list_deleted",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EContactListEditorClass, list_deleted),
-			      NULL, NULL,
-			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_INT, G_TYPE_OBJECT);
-
-	contact_list_editor_signals[EDITOR_CLOSED] =
-		g_signal_new ("editor_closed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EContactListEditorClass, editor_closed),
-			      NULL, NULL,
-			      e_contact_list_editor_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-e_contact_list_editor_init (EContactListEditor *editor)
-{
-	GladeXML *gui;
-	GtkWidget *bonobo_win;
-	BonoboUIContainer *container;
-	char *icon_path;
-	GdkPixbuf *pixbuf;
-
-	editor->image_buf = NULL;
-	editor->contact = NULL;
-	editor->changed = FALSE;
-	editor->editable = TRUE;
-	editor->in_async_call = FALSE;
-	editor->is_new_list = FALSE;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL, 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 = g_object_get_data (G_OBJECT(editor->table), "model");
-
-	/* XXX need this for libglade-2 it seems */
-	gtk_widget_show (editor->table);
-
-	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->list_image = glade_xml_get_widget (gui, "list-image");
-	if (GTK_IS_ALIGNMENT (editor->list_image)) {
-		/* deal with the e_create_image_widget code, that wraps the image in an alignment */
-		editor->list_image = GTK_BIN (editor->list_image)->child;
-	}
-	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
-
-	pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (editor->list_image));
-	editor->list_image_width = gdk_pixbuf_get_width (pixbuf);
-	editor->list_image_height = gdk_pixbuf_get_height (pixbuf);
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-list-editor", _("Contact List Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = bonobo_dock_get_client_area (gnome_app_get_dock (GNOME_APP (editor->app)));
-
-		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_window_get_ui_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)), NULL);
-
-	create_ui (editor);
-
-	/* connect signals */
-	g_signal_connect (editor->add_button,
-			  "clicked", G_CALLBACK(add_email_cb), editor);
-	g_signal_connect (editor->email_entry,
-			  "activate", G_CALLBACK(add_email_cb), editor);
-	g_signal_connect (editor->remove_button,
-			  "clicked", G_CALLBACK(remove_entry_cb), editor);
-	g_signal_connect (editor->list_name_entry,
-			  "changed", G_CALLBACK(list_name_changed_cb), editor);
-	g_signal_connect (editor->visible_addrs_checkbutton,
-			  "toggled", G_CALLBACK(visible_addrs_toggled_cb), editor);
-
-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			       0, list_drag_types, num_list_drag_types, GDK_ACTION_LINK);
-
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_motion", G_CALLBACK(table_drag_motion_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_drop", G_CALLBACK (table_drag_drop_cb), editor);
-	g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			  "table_drag_data_received", G_CALLBACK(table_drag_data_received_cb), editor);
-
-	gtk_drag_dest_set (editor->list_image, 0, image_drag_types, num_image_drag_types, GDK_ACTION_COPY);
-	g_signal_connect (editor->list_image,
-			  "drag_motion", G_CALLBACK (image_drag_motion_cb), editor);
-	g_signal_connect (editor->list_image,
-			  "drag_drop", G_CALLBACK (image_drag_drop_cb), editor);
-	g_signal_connect (editor->list_image,
-			  "drag_data_received", G_CALLBACK (image_drag_data_received_cb), editor);
-
-	command_state_changed (editor);
-
-	/* Connect to the deletion of the dialog */
-
-	g_signal_connect (editor->app, "delete_event",
-			  G_CALLBACK (app_delete_event_cb), editor);
-
-	/* set the icon */
-	icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "contact-list-16.png", NULL);
-	gnome_window_icon_set_from_file (GTK_WINDOW (editor->app), icon_path);
-	g_free (icon_path);
-}
-
-static void
-e_contact_list_editor_dispose (GObject *object)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (object);
-
-	if (cle->image_buf) {
-		g_free (cle->image_buf);
-		cle->image_buf = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-typedef struct {
-	EContactListEditor *cle;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-list_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	e_contact_set (cle->contact, E_CONTACT_UID, (char*)id);
-
-	g_signal_emit (cle, contact_list_editor_signals[LIST_ADDED], 0,
-		       status, cle->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		cle->is_new_list = FALSE;
-
-		if (should_close)
-			close_dialog (cle);
-		else
-			command_state_changed (cle);
-	}
-
-	g_object_unref (cle);
-	g_free (ecs);
-}
-
-static void
-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	g_signal_emit (cle, contact_list_editor_signals[LIST_MODIFIED], 0,
-		       status, cle->contact);
-
-	if (status == E_BOOK_ERROR_OK) {
-		if (should_close)
-			close_dialog (cle);
-	}
-
-	g_object_unref (cle); /* release ref held for ebook callback */
-	g_free (ecs);
-}
-
-static void
-save_contact (EContactListEditor *cle, gboolean should_close)
-{
-	extract_info (cle);
-
-	if (cle->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->cle = cle;
-		g_object_ref (cle);
-		ecs->should_close = should_close;
-
-		if (cle->app)
-			gtk_widget_set_sensitive (cle->app, FALSE);
-		cle->in_async_call = TRUE;
-
-		if (cle->is_new_list)
-			e_book_async_add_contact (cle->book, cle->contact, (EBookIdCallback)list_added_cb, ecs);
-		else
-			e_book_async_commit_contact (cle->book, cle->contact, (EBookCallback)list_modified_cb, ecs);
-
-		cle->changed = FALSE;
-	}
-}
-
-static gboolean
-is_named (EContactListEditor *editor)
-{
-	char *string = gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-	gboolean named = FALSE;
-
-	if (string && *string) {
-		named = TRUE;
-	}
-
-	g_free (string);
-
-	return named;
-}
-
-static gboolean
-prompt_to_save_changes (EContactListEditor *editor)
-{
-	if (!editor->changed || !is_named (editor))
-		return TRUE;
-
-	switch (eab_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case GTK_RESPONSE_YES:
-		save_contact (editor, FALSE);
-		return TRUE;
-	case GTK_RESPONSE_NO:
-		return TRUE;
-	case GTK_RESPONSE_CANCEL:
-	default:
-		return FALSE;
-	}
-}
-
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	if (!prompt_to_save_changes (cle))
-		return;
-
-	close_dialog (cle);
-}
-
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	save_contact (cle, FALSE);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	eab_contact_save(_("Save List as VCard"), cle->contact, GTK_WINDOW (cle->app));
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	eab_send_contact(cle->contact, EAB_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	eab_send_contact(cle->contact, EAB_DISPOSITION_AS_TO);
-}
-
-static void
-tb_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	save_contact (cle, TRUE);
-}
-
-static void
-list_deleted_cb (EBook *book, EBookStatus status, EContactListEditor *cle)
-{
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	g_signal_emit (cle, contact_list_editor_signals[LIST_DELETED], 0,
-		       status, cle->contact);
-
-	/* always close the dialog after we successfully delete a list */
-	if (status == E_BOOK_ERROR_OK)
-		close_dialog (cle);
-
-	g_object_unref (cle); /* release reference held for callback */
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	EContact *contact = cle->contact;
-
-	g_object_ref (contact);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(cle->app))) {
-
-		extract_info (cle);
-		
-		if (!cle->is_new_list) {
-			gtk_widget_set_sensitive (cle->app, FALSE);
-			cle->in_async_call = TRUE;
-			
-			g_object_ref (cle); /* hold reference for callback */
-			e_book_async_remove_contact (cle->book, contact, (EBookCallback)list_deleted_cb, cle);
-		}
-	}
-
-	g_object_unref (contact);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactListEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveAs", "save-as-16.png"),
-
-	E_PIXMAP ("/commands/ContactListEditorDelete", "evolution-trash-mini.png"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactListEditorPrint", "print.xpm"),
-	E_PIXMAP ("/commands/ContactListEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactListEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-create_ui (EContactListEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-contact-list-editor.xml",
-			       "evolution-contact-list-editor", NULL);
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-static void
-contact_list_editor_destroy_notify (gpointer data,
-				    GObject *where_the_object_was)
-{
-	EContactListEditor *ce = E_CONTACT_LIST_EDITOR (data);
-
-	all_contact_list_editors = g_slist_remove (all_contact_list_editors, ce);
-}
-
-EContactListEditor *
-e_contact_list_editor_new (EBook *book,
-			   EContact *list_contact,
-			   gboolean is_new_list,
-			   gboolean editable)
-{
-	EContactListEditor *ce = g_object_new (E_TYPE_CONTACT_LIST_EDITOR, NULL);
-
-	all_contact_list_editors = g_slist_prepend (all_contact_list_editors, ce);
-	g_object_weak_ref (G_OBJECT (ce), contact_list_editor_destroy_notify, ce);
-
-	g_object_ref (ce);
-	gtk_object_sink (GTK_OBJECT (ce));
-
-	g_object_set (ce,
-		      "book", book,
-		      "contact", list_contact,
-		      "is_new_list", is_new_list,
-		      "editable", editable,
-		      NULL);
-
-	return ce;
-}
-
-static void
-e_contact_list_editor_set_property (GObject *object, guint prop_id,
-				    const GValue *value, GParamSpec *pspec)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-	
-	switch (prop_id){
-	case PROP_BOOK:
-		if (editor->book)
-			g_object_unref (editor->book);
-		editor->book = E_BOOK(g_value_get_object (value));
-		g_object_ref (editor->book);
-		/* XXX more here about editable/etc. */
-		break;
-	case PROP_CONTACT:
-		if (editor->contact)
-			g_object_unref (editor->contact);
-		editor->contact = e_contact_duplicate(E_CONTACT(g_value_get_object (value)));
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		command_state_changed (editor);
-		break;
-	case PROP_IS_NEW_LIST: {
-		gboolean new_value = g_value_get_boolean (value);
-		gboolean changed = (editor->is_new_list != new_value);
-
-		editor->is_new_list = new_value;
-		
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-	case PROP_EDITABLE: {
-		gboolean new_value = g_value_get_boolean (value);
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_list_editor_get_property (GObject *object, guint prop_id,
-				    GValue *value, GParamSpec *pspec)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, editor->book);
-		break;
-
-	case PROP_CONTACT:
-		extract_info(editor);
-		g_value_set_object (value, editor->contact);
-		break;
-
-	case PROP_IS_NEW_LIST:
-		g_value_set_boolean (value, editor->is_new_list);
-		break;
-
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, editor->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		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);
-}
-
-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_from_spec_file (model,
-				      NULL,
-				      EVOLUTION_ETSPECDIR "/e-contact-list-editor.etspec",
-				      NULL);
-
-	g_object_set_data(G_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-add_email_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
-	const char *text = gtk_entry_get_text (GTK_ENTRY(editor->email_entry));
-
-	if (text && *text) {
-		e_contact_list_model_add_email (E_CONTACT_LIST_MODEL(editor->model), text);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-	}
-
-	gtk_entry_set_text (GTK_ENTRY(editor->email_entry), "");
-
-	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);
-	editor->changed = TRUE;
-	command_state_changed (editor);
-}
-
-static void
-list_name_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	editor->changed = TRUE;
-	command_state_changed (editor);
-}
-
-static void
-visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	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;
-
-	g_signal_emit (cle, contact_list_editor_signals[EDITOR_CLOSED], 0);
-}
-
-/* Callback used when the editor is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (data);
-
-	/* if we're in an async call, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static gboolean
-table_drag_motion_cb (ETable *table, int row, int col,
-		      GdkDragContext *context,
-		      gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (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)
-		return FALSE;
-
-
-	gtk_drag_get_data (GTK_WIDGET (table), context,
-			   GDK_POINTER_TO_ATOM (context->targets->data),
-			   time);
-	return TRUE;
-}
-
-static void
-table_drag_data_received_cb (ETable *table, int row, int col,
-			     GdkDragContext *context,
-			     gint x, gint y,
-			     GtkSelectionData *selection_data,
-			     guint info, guint time, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
-	char *target_type;
-	gboolean changed = FALSE;
-	gboolean handled = FALSE;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	if (!strcmp (target_type, VCARD_TYPE)) {
-
-		GList *contact_list = eab_contact_list_from_string (selection_data->data);
-		GList *c;
-
-		if (contact_list)
-			handled = TRUE;
-
-		for (c = contact_list; c; c = c->next) {
-			EContact *contact = c->data;
-
-			if (!e_contact_get (contact, E_CONTACT_IS_LIST)) {
-				e_contact_list_model_add_contact (E_CONTACT_LIST_MODEL (editor->model),
-								  contact);
-
-				changed = TRUE;
-			}
-		}
-		g_list_foreach (contact_list, (GFunc)g_object_unref, NULL);
-		g_list_free (contact_list);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-
-		if (changed) {
-			editor->changed = TRUE;
-			command_state_changed (editor);
-		}
-	}
-
-	gtk_drag_finish (context, handled, FALSE, time);
-}
-
-static gboolean
-set_image_from_data (EContactListEditor *editor,
-		     char *data, int length)
-{
-	gboolean rv = FALSE;
-	GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
-	GdkPixbuf *pixbuf;
-
-	gdk_pixbuf_loader_write (loader, data, length, NULL);
-
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	if (pixbuf)
-		gdk_pixbuf_ref (pixbuf);
-	gdk_pixbuf_loader_close (loader, NULL);
-	g_object_unref (loader);
-
-	if (pixbuf) {
-		GdkPixbuf *scaled;
-		GdkPixbuf *composite;
-
-		float scale;
-		int new_height, new_width;
-
-		new_height = gdk_pixbuf_get_height (pixbuf);
-		new_width = gdk_pixbuf_get_width (pixbuf);
-
-		printf ("new dimensions = (%d,%d)\n", new_width, new_height);
-
-		if (editor->list_image_height < new_height
-		    || editor->list_image_width < new_width) {
-			/* we need to scale down */
-			printf ("we need to scale down\n");
-			if (new_height > new_width)
-				scale = (float)editor->list_image_height / new_height;
-			else
-				scale = (float)editor->list_image_width / new_width;
-		}
-		else {
-			/* we need to scale up */
-			printf ("we need to scale up\n");
-			if (new_height > new_width)
-				scale = (float)new_height / editor->list_image_height;
-			else
-				scale = (float)new_width / editor->list_image_width;
-		}
-
-		printf ("scale = %g\n", scale);
-
-		new_width *= scale;
-		new_height *= scale;
-		new_width = MIN (new_width, editor->list_image_width);
-		new_height = MIN (new_height, editor->list_image_height);
-
-		printf ("new scaled dimensions = (%d,%d)\n", new_width, new_height);
-
-		scaled = gdk_pixbuf_scale_simple (pixbuf,
-						  new_width, new_height,
-						  GDK_INTERP_BILINEAR);
-
-		composite = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, gdk_pixbuf_get_bits_per_sample (pixbuf),
-					    editor->list_image_width, editor->list_image_height);
-
-		gdk_pixbuf_fill (composite, 0x00000000);
-
-		gdk_pixbuf_copy_area (scaled, 0, 0, new_width, new_height,
-				      composite,
-				      editor->list_image_width / 2 - new_width / 2,
-				      editor->list_image_height / 2 - new_height / 2);
-
-		gtk_image_set_from_pixbuf (GTK_IMAGE (editor->list_image), composite);
-		gdk_pixbuf_unref (pixbuf);
-		gdk_pixbuf_unref (scaled);
-		gdk_pixbuf_unref (composite);
-
-		rv = TRUE;
-	}
-
-	return rv;
-}
-
-static gboolean
-image_drag_motion_cb (GtkWidget *widget,
-		      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 (GDK_POINTER_TO_ATOM (p->data));
-		if (!strcmp (possible_type, URI_LIST_TYPE)) {
-			g_free (possible_type);
-			gdk_drag_status (context, GDK_ACTION_COPY, time);
-			return TRUE;
-		}
-
-		g_free (possible_type);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-image_drag_drop_cb (GtkWidget *widget,
-		    GdkDragContext *context,
-		    gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	if (context->targets == NULL)
-		return FALSE;
-
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
-		if (!strcmp (possible_type, URI_LIST_TYPE)) {
-			g_free (possible_type);
-			gtk_drag_get_data (widget, context,
-					   GDK_POINTER_TO_ATOM (p->data),
-					   time);
-			return TRUE;
-		}
-
-		g_free (possible_type);
-	}
-
-	return FALSE;
-}
-
-static void
-image_drag_data_received_cb (GtkWidget *widget,
-			     GdkDragContext *context,
-			     gint x, gint y,
-			     GtkSelectionData *selection_data,
-			     guint info, guint time, EContactListEditor *editor)
-{
-	char *target_type;
-	gboolean changed = FALSE;
-	gboolean handled = FALSE;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	printf ("target_type == %s\n", target_type);
-
-	if (!strcmp (target_type, URI_LIST_TYPE)) {
-		GnomeVFSResult result;
-		GnomeVFSHandle *handle;
-		char *uri;
-		char *nl = strstr (selection_data->data, "\r\n");
-		char *buf = NULL;
-		GnomeVFSFileInfo info;
-
-		if (nl)
-			uri = g_strndup (selection_data->data, nl - (char*)selection_data->data);
-		else
-			uri = g_strdup (selection_data->data);
-
-		printf ("uri == %s\n", uri);
-
-		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-		if (result == GNOME_VFS_OK) {
-			result = gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_DEFAULT);
-			if (result == GNOME_VFS_OK) {
-				GnomeVFSFileSize num_left;
-				GnomeVFSFileSize num_read;
-				GnomeVFSFileSize total_read;
-
-				printf ("file size = %d\n", (int)info.size);
-				buf = g_malloc (info.size);
-
-				num_left = info.size;
-				total_read = 0;
-
-				while ((result = gnome_vfs_read (handle, buf + total_read, num_left, &num_read)) == GNOME_VFS_OK) {
-					num_left -= num_read;
-					total_read += num_read;
-				}
-
-				printf ("read %d bytes\n", (int)total_read);
-				if (set_image_from_data (editor, buf, total_read)) {
-					changed = TRUE;
-					handled = TRUE;
-					g_free (editor->image_buf);
-					editor->image_buf = buf;
-					editor->image_buf_size = total_read;
-				}
-				else {
-					/* XXX we should pop up a
-					   warning dialog here */
-					g_free (buf);
-				}
-			}
-
-			gnome_vfs_close (handle);
-		}
-		else {
-			printf ("gnome_vfs_open failed (%s)\n", gnome_vfs_result_to_string (result));
-		}
-
-		g_free (uri);
-
-		if (changed) {
-			editor->changed = TRUE;
-			command_state_changed (editor);
-		}
-	}
-
-	gtk_drag_finish (context, handled, FALSE, time);
-}
-
-static void
-command_state_changed (EContactListEditor *editor)
-{
-	gboolean named = is_named (editor);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSaveClose",
-				      "sensitive",
-				      editor->changed && named && editor->editable ? "1" : "0", NULL);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSave",
-				      "sensitive",
-				      editor->changed && named && 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)
-{
-	EContact *contact = editor->contact;
-	if (contact) {
-		int i;
-		GList *email_list;
-		char *string = gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-
-		if (string && *string) {
-			e_contact_set (contact, E_CONTACT_FILE_AS, string);
-			e_contact_set (contact, E_CONTACT_FULL_NAME, string);
-		}
-
-		g_free (string);
-
-		e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
-		e_contact_set (contact, E_CONTACT_LIST_SHOW_ADDRESSES,
-			       GINT_TO_POINTER (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton))));
-
-		email_list = NULL;
-		/* then refill it from the contact list model */
-		for (i = 0; i < e_table_model_row_count (editor->model); i ++) {
-			const EABDestination *dest = e_contact_list_model_get_destination (E_CONTACT_LIST_MODEL (editor->model), i);
-			gchar *dest_xml = eab_destination_export (dest);
-			if (dest_xml)
-				email_list = g_list_append (email_list, dest_xml);
-		}
-
-		e_contact_set (contact, E_CONTACT_EMAIL, email_list);
-
-		/* XXX free email_list? */
-
-		if (editor->image_buf) {
-			EContactPhoto photo;
-
-			photo.data = editor->image_buf;
-			photo.length = editor->image_buf_size;
-
-			e_contact_set (contact, E_CONTACT_LOGO, &photo);
-		}
-		g_object_unref (email_list);
-	}
-}
-
-static void
-fill_in_info(EContactListEditor *editor)
-{
-	if (editor->contact) {
-		EContactPhoto *photo;
-		char *file_as;
-		gboolean show_addresses = FALSE;
-		gboolean is_evolution_list = FALSE;
-		GList *email_list;
-		GList *iter;
-
-		file_as = e_contact_get_const (editor->contact, E_CONTACT_FILE_AS);
-		email_list = e_contact_get (editor->contact, E_CONTACT_EMAIL);
-		is_evolution_list = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_IS_LIST));
-		show_addresses = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_LIST_SHOW_ADDRESSES));
-
-		gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
-		if (file_as) {
-			int position = 0;
-			gtk_editable_insert_text (GTK_EDITABLE (editor->list_name_entry), file_as, strlen (file_as), &position);
-			g_free (file_as);
-		}
-
-		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));
-
-		for (iter = email_list; iter; iter = iter->next) {
-			char *dest_xml = iter->data;
-			EABDestination *dest;
-
-			/* g_message ("incoming xml: [%s]", dest_xml); */
-			dest = eab_destination_import (dest_xml);
-
-			if (dest != NULL) {
-				e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL (editor->model), dest);
-			}
-		}
-
-		/* XXX free email_list */
-
-		photo = e_contact_get (editor->contact, E_CONTACT_LOGO);
-		if (photo) {
-			set_image_from_data (editor, photo->data, photo->length);
-			e_contact_photo_free (photo);
-		}
-		g_object_unref (email_list);
-	}
-}
-
-
-gboolean
-e_contact_list_editor_request_close_all (void)
-{
-	GSList *p;
-	GSList *pnext;
-	gboolean retval;
-
-	retval = TRUE;
-	for (p = all_contact_list_editors; p != NULL; p = pnext) {
-		pnext = p->next;
-
-		e_contact_list_editor_raise (E_CONTACT_LIST_EDITOR (p->data));
-		if (! prompt_to_save_changes (E_CONTACT_LIST_EDITOR (p->data))) {
-			retval = FALSE;
-			break;
-		}
-
-		close_dialog (E_CONTACT_LIST_EDITOR (p->data));
-	}
-
-	return retval;
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
deleted file mode 100644
index 6d5f4f2514..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
+++ /dev/null
@@ -1,7 +0,0 @@
-<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>
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 52e78a6a23..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_LIST_EDITOR_H__
-#define __E_CONTACT_LIST_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CONTACT_LIST_EDITOR	   (e_contact_list_editor_get_type ())
-#define E_CONTACT_LIST_EDITOR(obj)	   (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditor))
-#define E_CONTACT_LIST_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorClass))
-#define E_IS_CONTACT_LIST_EDITOR(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_LIST_EDITOR))
-#define E_IS_CONTACT_LIST_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_LIST_EDITOR))
-
-
-typedef struct _EContactListEditor       EContactListEditor;
-typedef struct _EContactListEditorClass  EContactListEditorClass;
-
-struct _EContactListEditor
-{
-	GtkObject object;
-
-	/* item specific fields */
-	EBook *book;
-	EContact *contact;
-
-	/* 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 *list_image_button;
-	GtkWidget *visible_addrs_checkbutton;
-	GtkWidget *list_image;
-	int list_image_width;
-	int list_image_height;
-
-	char *image_buf;
-	int   image_buf_size;
-
-	/* Whether we are editing a new contact or an existing one */
-	guint is_new_list : 1;
-
-	/* Whether the contact has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-};
-
-struct _EContactListEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* list_added)    (EContactListEditor *cle, EBookStatus status, EContact *contact);
-	void (* list_modified) (EContactListEditor *cle, EBookStatus status, EContact *contact);
-	void (* list_deleted)  (EContactListEditor *cle, EBookStatus status, EContact *contact);
-	void (* editor_closed) (EContactListEditor *cle);
-};
-
-EContactListEditor *e_contact_list_editor_new                (EBook *book,
-							      EContact *list_contact,
-							      gboolean is_new_list,
-							      gboolean editable);
-GType               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);
-
-gboolean            e_contact_list_editor_request_close_all  (void);
-
-G_END_DECLS
-
-
-#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 c7fd626372..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <string.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 *) eab_destination_get_textrep (model->data[row], TRUE);
-}
-
-/* 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 TRUE;
-}
-
-/* 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;
-
-	if (model->data != NULL) {
-		for (i = 0; i < model->data_count; i ++) {
-			g_object_unref (model->data[i]);
-		}
-		g_free (model->data);
-		model->data = NULL;
-	}
-
-	model->data_count = 0;
-	model->data_alloc = 0;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (o);
-}
-
-static void
-e_contact_list_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = g_type_class_ref (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 (EABDestination*, model->data_alloc);
-}
-
-GType
-e_contact_list_model_get_type (void)
-{
-	static GType cle_type = 0;
-
-	if (!cle_type) {
-		static const GTypeInfo cle_info =  {
-			sizeof (EContactListModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_list_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactListModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_list_model_init,
-		};
-
-		cle_type = g_type_register_static (E_TABLE_MODEL_TYPE, "EContactListModel", &cle_info, 0);
-	}
-
-	return cle_type;
-}
-
-void
-e_contact_list_model_construct (EContactListModel *model)
-{
-}
-
-ETableModel *
-e_contact_list_model_new ()
-{
-	EContactListModel *model;
-
-	model = g_object_new (E_TYPE_CONTACT_LIST_MODEL, NULL);
-
-	e_contact_list_model_construct (model);
-
-	return E_TABLE_MODEL(model);
-}
-
-void
-e_contact_list_model_add_destination (EContactListModel *model, EABDestination *dest)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (model->data_count + 1 >= model->data_alloc) {
-		model->data_alloc *= 2;
-		model->data = g_renew (EABDestination*, model->data, model->data_alloc);
-	}
-
-	model->data[model->data_count ++] = dest;
-	g_object_ref (dest);
-
-	e_table_model_row_inserted (E_TABLE_MODEL (model), model->data_count - 1);
-}
-
-void
-e_contact_list_model_add_email (EContactListModel *model,
-				const char *email)
-{
-	EABDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (email != NULL);
-
-	new_dest = eab_destination_new ();
-	eab_destination_set_email (new_dest, email);
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_add_contact (EContactListModel *model,
-				  EContact *contact)
-{
-	EABDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_CONTACT (contact));
-
-	new_dest = eab_destination_new ();
-	eab_destination_set_contact (new_dest, contact, 0); /* Hard-wired for default e-mail */
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_remove_row (EContactListModel *model, int row)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (0 <= row && row < model->data_count);
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	g_object_unref (model->data[row]);
-	memmove (model->data + row, model->data + row + 1, sizeof (EABDestination*) * (model->data_count - row - 1));
-	model->data_count --;
-
-	e_table_model_row_deleted (E_TABLE_MODEL (model), row);
-}
-
-void
-e_contact_list_model_remove_all (EContactListModel *model)
-{
-	int i;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	for (i = 0; i < model->data_count; i ++) {
-		g_object_unref (model->data[i]);
-		model->data[i] = NULL;
-	}
-
-	model->data_count = 0;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-const EABDestination *
-e_contact_list_model_get_destination (EContactListModel *model, int row)
-{
-	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= row && row < model->data_count, NULL);
-
-	return model->data[row];
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
deleted file mode 100644
index 504f31b9d8..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ /dev/null
@@ -1,51 +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 <gtk/gtk.h>
-#include <gal/e-table/e-table-model.h>
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-#include "addressbook/util/eab-destination.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_CONTACT_LIST_MODEL        (e_contact_list_model_get_type ())
-#define E_CONTACT_LIST_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_CONTACT_LIST_MODEL, EContactListModel))
-#define E_CONTACT_LIST_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_CONTACT_LIST_MODEL, EContactListModelClass))
-#define E_IS_CONTACT_LIST_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_CONTACT_LIST_MODEL))
-#define E_IS_CONTACT_LIST_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_CONTACT_LIST_MODEL))
-
-typedef struct _EContactListModel EContactListModel;
-typedef struct _EContactListModelClass EContactListModelClass;
-
-struct _EContactListModel {
-	ETableModel parent;
-
-	EABDestination **data;
-	int data_count;
-	int data_alloc;
-};
-
-
-struct _EContactListModelClass {
-	ETableModelClass parent_class;
-};
-
-
-GType      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, EABDestination *dest);
-void         e_contact_list_model_add_email       (EContactListModel *model, const char *email);
-void         e_contact_list_model_add_contact     (EContactListModel *model, EContact *contact);
-
-void	     e_contact_list_model_remove_row (EContactListModel *model, int row);
-void         e_contact_list_model_remove_all (EContactListModel *model);
-
-const EABDestination *e_contact_list_model_get_destination (EContactListModel *model, int row);
-
-G_END_DECLS
-
-#endif /* _E_CONTACT_LIST_MODEL_H_ */
diff --git a/addressbook/gui/merging/.cvsignore b/addressbook/gui/merging/.cvsignore
deleted file mode 100644
index b6fa83ca4c..0000000000
--- a/addressbook/gui/merging/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-*.gladep
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index f1d589ad00..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"eab-contact-merging\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libeabbookmerging.la
-
-libeabbookmerging_la_SOURCES =			\
-	eab-contact-compare.c			\
-	eab-contact-compare.h			\
-	eab-contact-merging.c			\
-	eab-contact-merging.h
-
-
-glade_DATA = eab-contact-duplicate-detected.glade				\
-	     eab-contact-commit-duplicate-detected.glade
-
-EXTRA_DIST = 			\
-	 $(glade_DATA)
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
deleted file mode 100644
index 789c465d92..0000000000
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-duplicate-contact">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Duplicate Contact Detected</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-add</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="Custom" id="custom-old-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:54:20 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The changed email or name of this contact already
-exists in this folder.  Would you like to add it anyway?</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Conflicting Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Changed Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="custom-new-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:53:42 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment1">
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">0</property>
-
-	      <child>
-		<widget class="Custom" id="custom2">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">malehead.png</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
deleted file mode 100644
index 409b1bce81..0000000000
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ /dev/null
@@ -1,736 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-contact-compare.c
- *
- * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include "util/eab-book-util.h"
-#include "eab-contact-compare.h"
-
-/* This is an "optimistic" combiner: the best of the two outcomes is
-   selected. */
-static EABContactMatchType
-combine_comparisons (EABContactMatchType prev,
-		     EABContactMatchType new_info)
-{
-	if (new_info == EAB_CONTACT_MATCH_NOT_APPLICABLE)
-		return prev;
-	return (EABContactMatchType) MAX ((gint) prev, (gint) new_info);
-}
-
-
-/*** Name comparisons ***/
-
-/* This *so* doesn't belong here... at least not implemented in a
-   sucky way like this.  But it can be fixed later. */
-
-/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
-	{ "jon", "john" },   /* Ah, the hacker's perogative */
-	{ "joseph", "joe" },
-	{ "robert", "bob" },
-	{ "gene", "jean" },
-	{ "jesse", "jessie" },
-	{ "ian", "iain" },
-	{ "richard", "dick" },
-	{ "william", "bill" },
-	{ "william", "will" },
-	{ "anthony", "tony" },
-	{ "michael", "mike" },
-	{ "eric", "erik" },
-	{ "elizabeth", "liz" },
-	{ "jeff", "geoff" },
-	{ "jeff", "geoffrey" },
-	{ "tom", "thomas" },
-	{ "dave", "david" },
-	{ "jim", "james" },
-	{ "abigal", "abby" },
-	{ "amanda", "amy" },
-	{ "amanda", "manda" },
-	{ "jennifer", "jenny" },
-	{ "christopher", "chris" },
-	{ "rebecca", "becca" },
-	{ "rebecca", "becky" },
-	{ "anderson", "andersen" },
-	{ "johnson", "johnsen" },
-	/* We could go on and on... */
-	/* We should add soundex here. */
-	{ NULL, NULL }
-};
-
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint len;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	/* If we are in 'strict' mode, b must match the beginning of a.
-	   So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.
-
-	   If strict is FALSE, it is sufficient for the strings to share
-	   some leading characters.  In this case, "Robert" and "Robbie"
-	   would match, as would "Dave" and "Dan". */
-	
-	if (strict) {
-		len = g_utf8_strlen (b, -1);
-	} else {
-		len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));
-	}
-
-	return !e_utf8_casefold_collate_len (a, b, len);
-}
-
-static gboolean
-name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint i;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	if (name_fragment_match (a, b, strict))
-		return TRUE;
-
-	/* Check for nicknames.  Yes, the linear search blows. */
-	for (i=0; name_synonyms[i][0]; ++i) {
-
-		if (!e_utf8_casefold_collate (name_synonyms[i][0], a)
-		    && !e_utf8_casefold_collate (name_synonyms[i][1], b))
-			return TRUE;
-		
-		if (!e_utf8_casefold_collate (name_synonyms[i][0], b)
-		    && !e_utf8_casefold_collate (name_synonyms[i][1], a))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-EABContactMatchType
-eab_contact_compare_name_to_string (EContact *contact, const gchar *str)
-{
-	return eab_contact_compare_name_to_string_full (contact, str, FALSE, NULL, NULL, NULL);
-}
-
-EABContactMatchType
-eab_contact_compare_name_to_string_full (EContact *contact, const gchar *str, gboolean allow_partial_matches,
-					 gint *matched_parts_out, EABContactMatchPart *first_matched_part_out, gint *matched_character_count_out)
-{
-	gchar **namev, **givenv = NULL, **addv = NULL, **familyv = NULL;
-
-	gint matched_parts = EAB_CONTACT_MATCH_PART_NONE;
-	EABContactMatchPart first_matched_part = EAB_CONTACT_MATCH_PART_NONE;
-	EABContactMatchPart this_part_match = EAB_CONTACT_MATCH_PART_NOT_APPLICABLE;
-	EABContactMatchType match_type;
-	EContactName *contact_name;
-
-	gint match_count = 0, matched_character_count = 0, fragment_count;
-	gint i, j;
-	gchar *str_cpy, *s;
-
-	g_return_val_if_fail (E_IS_CONTACT (contact), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	if (!e_contact_get_const (contact, E_CONTACT_FULL_NAME))
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	if (str == NULL)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	str_cpy = s = g_strdup (str);
-	while (*s) {
-		if (*s == ',' || *s == '"')
-			*s = ' ';
-		++s;
-	}
-	namev   = g_strsplit (str_cpy, " ", 0);
-	g_free (str_cpy);
-
-	contact_name = e_contact_get (contact, E_CONTACT_NAME);
-
-	if (contact_name->given)
-		givenv = g_strsplit (contact_name->given, " ", 0);
-	if (contact_name->additional)
-		addv = g_strsplit (contact_name->additional, " ", 0);
-	if (contact_name->family)
-		familyv = g_strsplit (contact_name->family, " ", 0);
-
-	e_contact_name_free (contact_name);
-
-	fragment_count = 0;
-	for (i = 0; givenv && givenv[i]; ++i)
-		++fragment_count;
-	for (i = 0; addv && addv[i]; ++i)
-		++fragment_count;
-	for (i = 0; familyv && familyv[i]; ++i)
-		++fragment_count;
-	
-	for (i = 0; namev[i] && this_part_match != EAB_CONTACT_MATCH_PART_NONE; ++i) {
-
-		if (*namev[i]) {
-
-			this_part_match = EAB_CONTACT_MATCH_PART_NONE;
-
-			/* When we are allowing partials, we are strict about the matches we allow.
-			   Does this make sense?  Not really, but it does the right thing for the purposes
-			   of completion. */
-
-			if (givenv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; givenv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (givenv[j], namev[i], allow_partial_matches)) {
-
-						this_part_match = EAB_CONTACT_MATCH_PART_GIVEN_NAME;
-
-						/* We remove a piece of a name once it has been matched against, so
-						   that "john john" won't match "john doe". */
-						g_free (givenv[j]);
-						givenv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (addv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; addv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (addv[j], namev[i], allow_partial_matches)) {
-						
-						this_part_match = EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME;
-
-						g_free (addv[j]);
-						addv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (familyv && this_part_match == EAB_CONTACT_MATCH_PART_NONE) {
-				for (j = 0; familyv[j]; ++j) {
-					if (allow_partial_matches ? name_fragment_match_with_synonyms (familyv[j], namev[i], allow_partial_matches)
-					    : !e_utf8_casefold_collate (familyv[j], namev[i])) {
-
-						this_part_match = EAB_CONTACT_MATCH_PART_FAMILY_NAME;
-
-						g_free (familyv[j]);
-						familyv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (this_part_match != EAB_CONTACT_MATCH_PART_NONE) {
-				++match_count;
-				matched_character_count += g_utf8_strlen (namev[i], -1);
-				matched_parts |= this_part_match;
-				if (first_matched_part == EAB_CONTACT_MATCH_PART_NONE)
-					first_matched_part = this_part_match;
-			}
-		}
-	}
-
-	match_type = EAB_CONTACT_MATCH_NONE;
-
-	if (this_part_match != EAB_CONTACT_MATCH_PART_NONE) {
-
-		if (match_count > 0)
-			match_type = EAB_CONTACT_MATCH_VAGUE;
-		
-		if (fragment_count == match_count) {
-
-			match_type = EAB_CONTACT_MATCH_EXACT;
-
-		} else if (fragment_count == match_count + 1) {
-
-			match_type = EAB_CONTACT_MATCH_PARTIAL;
-
-		}
-	}
-
-	if (matched_parts_out)
-		*matched_parts_out = matched_parts;
-	if (first_matched_part_out)
-		*first_matched_part_out = first_matched_part;
-	if (matched_character_count_out)
-		*matched_character_count_out = matched_character_count;
-
-	g_strfreev (namev);
-	g_strfreev (givenv);
-	g_strfreev (addv);
-	g_strfreev (familyv);
-
-	return match_type;
-}
-
-EABContactMatchType
-eab_contact_compare_name (EContact *contact1, EContact *contact2)
-{
-	EContactName *a, *b;
-	gint matches=0, possible=0;
-	gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;
-
-	g_return_val_if_fail (E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	a = e_contact_get (contact1, E_CONTACT_NAME);
-	b = e_contact_get (contact2, E_CONTACT_NAME);
-
-	if (a == NULL || b == NULL)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	if (a->given && b->given) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->given, b->given, FALSE /* both inputs are complete */)) {
-			++matches;
-			given_match = TRUE;
-		}
-	}
-
-	if (a->additional && b->additional) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->additional, b->additional, FALSE /* both inputs are complete */)) {
-			++matches;
-			additional_match = TRUE;
-		}
-	}
-
-	if (a->family && b->family) {
-		++possible;
-		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */
-		if (! e_utf8_casefold_collate (a->family, b->family)) {
-			++matches;
-			family_match = TRUE;
-		}
-	}
-
-	e_contact_name_free (a);
-	e_contact_name_free (b);
-
-	/* Now look at the # of matches and try to intelligently map
-	   an EAB_CONTACT_MATCH_* type to it.  Special consideration is given
-	   to family-name matches. */
-
-	if (possible == 0)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	if (possible == 1)
-		return family_match ? EAB_CONTACT_MATCH_VAGUE : EAB_CONTACT_MATCH_NONE;
-
-	if (possible == matches)
-		return family_match ? EAB_CONTACT_MATCH_EXACT : EAB_CONTACT_MATCH_PARTIAL;
-
-	if (possible == matches+1)
-		return family_match ? EAB_CONTACT_MATCH_VAGUE : EAB_CONTACT_MATCH_NONE;
-
-	return EAB_CONTACT_MATCH_NONE;
-}
-
-
-/*** Nickname Comparisons ***/
-
-EABContactMatchType
-eab_contact_compare_nickname (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	return EAB_CONTACT_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 EABContactMatchType
-compare_email_addresses (const gchar *addr1, const gchar *addr2)
-{
-	if (addr1 == NULL || *addr1 == 0 ||
-	    addr2 == NULL || *addr2 == 0)
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-
-	if (match_email_username (addr1, addr2)) 
-		return match_email_hostname (addr1, addr2) ? EAB_CONTACT_MATCH_EXACT : EAB_CONTACT_MATCH_VAGUE;
-
-	return EAB_CONTACT_MATCH_NONE;
-}
-
-EABContactMatchType
-eab_contact_compare_email (EContact *contact1, EContact *contact2)
-{
-	EABContactMatchType match = EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	GList *contact1_email, *contact2_email;
-	GList *i1, *i2;
-
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	contact1_email = e_contact_get (contact1, E_CONTACT_EMAIL);
-	contact2_email = e_contact_get (contact2, E_CONTACT_EMAIL);
-
-	if (contact1_email == NULL || contact2_email == NULL) {
-		g_list_foreach (contact1_email, (GFunc)g_free, NULL);
-		g_list_free (contact1_email);
-
-		g_list_foreach (contact2_email, (GFunc)g_free, NULL);
-		g_list_free (contact2_email);
-		return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-	}
-
-	i1 = contact1_email;
-
-	/* Do pairwise-comparisons on all of the e-mail addresses.  If
-	   we find an exact match, there is no reason to keep
-	   checking. */
-	while (i1 && match != EAB_CONTACT_MATCH_EXACT) {
-		char *addr1 = (char *) i1->data;
-
-		i2 = contact2_email;
-		while (i2 && match != EAB_CONTACT_MATCH_EXACT) {
-			char *addr2 = (char *) i2->data;
-
-			match = combine_comparisons (match, compare_email_addresses (addr1, addr2));
-			
-			i2 = i2->next;
-		}
-
-		i1 = i1->next;
-	}
-
-	g_list_foreach (contact1_email, (GFunc)g_free, NULL);
-	g_list_free (contact1_email);
-
-	g_list_foreach (contact2_email, (GFunc)g_free, NULL);
-	g_list_free (contact2_email);
-
-	return match;
-}
-
-EABContactMatchType
-eab_contact_compare_address (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-}
-
-EABContactMatchType
-eab_contact_compare_telephone (EContact *contact1, EContact *contact2)
-{
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
-}
-
-EABContactMatchType
-eab_contact_compare (EContact *contact1, EContact *contact2)
-{
-	EABContactMatchType result;
-
-	g_return_val_if_fail (contact1 && E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
-
-	result = EAB_CONTACT_MATCH_NONE;
-	result = combine_comparisons (result, eab_contact_compare_name      (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_nickname  (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_email     (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_address   (contact1, contact2));
-	result = combine_comparisons (result, eab_contact_compare_telephone (contact1, contact2));
-
-	return result;
-}
-
-typedef struct _MatchSearchInfo MatchSearchInfo;
-struct _MatchSearchInfo {
-	EContact *contact;
-	GList *avoid;
-	EABContactMatchQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-match_search_info_free (MatchSearchInfo *info)
-{
-	if (info) {
-		g_object_unref (info->contact);
-
-		/* This should already have been deallocated, but just in case... */
-		if (info->avoid) {
-			g_list_foreach (info->avoid, (GFunc) g_object_unref, NULL);
-			g_list_free (info->avoid);
-			info->avoid = NULL;
-		}
-
-		g_free (info);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	/* XXX we need to free contacts */
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	EABContactMatchType best_match = EAB_CONTACT_MATCH_NONE;
-	EContact *best_contact = NULL;
-	GList *remaining_contacts = NULL;
-	const GList *i;
-
-	if (status != E_BOOK_ERROR_OK) {
-		info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	/* remove the contacts we're to avoid from the list, if they're present */
-	for (i = contacts; i != NULL; i = g_list_next (i)) {
-		EContact *this_contact = E_CONTACT (i->data);
-		GList *iterator;
-		gboolean avoid = FALSE;
-		for (iterator = info->avoid; iterator; iterator = iterator->next) {
-			if (!strcmp (e_contact_get_const (iterator->data, E_CONTACT_UID),
-				     e_contact_get_const (this_contact, E_CONTACT_UID))) {
-				avoid = TRUE;
-				break;
-			}
-		}
-		if (!avoid)
-			remaining_contacts = g_list_prepend (remaining_contacts, this_contact);
-	}
-
-	remaining_contacts = g_list_reverse (remaining_contacts);
-
-	for (i = remaining_contacts; i != NULL; i = g_list_next (i)) {
-		EContact *this_contact = E_CONTACT (i->data);
-		EABContactMatchType this_match = eab_contact_compare (info->contact, this_contact);
-		if ((gint)this_match > (gint)best_match) {
-			best_match = this_match;
-			best_contact  = this_contact;
-		}
-	}
-
-	g_list_free (remaining_contacts);
-
-	info->cb (info->contact, best_contact, 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;
-	EContact *contact = info->contact;
-	EContactName *contact_name;
-	GList *contact_email;
-	gchar *query_parts[MAX_QUERY_PARTS];
-	gint p=0;
-	gchar *query, *qj;
-	int i;
-
-	if (book == NULL) {
-		info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	contact_name = e_contact_get (contact, E_CONTACT_NAME);
-	if (contact_name) {
-		if (contact_name->given && *contact_name->given)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->given);
-
-		if (contact_name->additional && *contact_name->additional)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->additional);
-
-		if (contact_name->family && *contact_name->family)
-			query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", contact_name->family);
-
-		e_contact_name_free (contact_name);
-	}
-
-	contact_email = e_contact_get (contact, E_CONTACT_EMAIL);
-	if (contact_email) {
-		GList *iter;
-		for (iter = contact_email; iter && p < MAX_QUERY_PARTS; iter = iter->next) {
-			gchar *addr = g_strdup (iter->data);
-			if (addr && *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);
-			}
-		}
-	}
-	g_list_foreach (contact_email, (GFunc)g_free, NULL);
-	g_list_free (contact_email);
-	
-	
-	/* 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;
-	}
-
-	if (query && *query)
-		e_book_async_get_contacts (book, query, query_cb, info);
-	else
-		query_cb (book, E_BOOK_ERROR_OK, NULL, info);
-
-	g_free (query);
-}
-
-void
-eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->contact = contact;
-	g_object_ref (contact);
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = NULL;
-
-	addressbook_load_default_book (use_common_book_cb, info);
-}
-
-/**
- * e_contact_locate_match_full:
- * @book: The book to look in.  If this is NULL, use the default
- * addressbook.
- * @contact: The contact to compare to.
- * @avoid: A list of contacts 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 EABContactMatchQueryCallback.
- **/
-void
-eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->contact = contact;
-	g_object_ref (contact);
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = g_list_copy (avoid);
-	g_list_foreach (info->avoid, (GFunc) g_object_ref, NULL);
-
-	if (book)
-		use_common_book_cb (book, info);
-	else
-		addressbook_load_default_book (use_common_book_cb, info);
-}
-
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
deleted file mode 100644
index 4b97b3c698..0000000000
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-contact-compare.h
- *
- * Copyright (C) 2001,2002,2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_CONTACT_COMPARE_H__
-#define __EAB_CONTACT_COMPARE_H__
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-
-typedef enum {
-	EAB_CONTACT_MATCH_NOT_APPLICABLE = 0,
-	EAB_CONTACT_MATCH_NONE           = 1,
-	EAB_CONTACT_MATCH_VAGUE          = 2,
-	EAB_CONTACT_MATCH_PARTIAL        = 3,
-	EAB_CONTACT_MATCH_EXACT          = 4
-} EABContactMatchType;
-
-typedef enum {
-	EAB_CONTACT_MATCH_PART_NOT_APPLICABLE   = -1,
-	EAB_CONTACT_MATCH_PART_NONE             = 0,
-	EAB_CONTACT_MATCH_PART_GIVEN_NAME       = 1<<0,
-	EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME  = 1<<2,
-	EAB_CONTACT_MATCH_PART_FAMILY_NAME      = 1<<3
-} EABContactMatchPart;
-
-typedef void (*EABContactMatchQueryCallback) (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure);
-
-EABContactMatchType eab_contact_compare_name_to_string      (EContact *contact, const gchar *str);
-
-EABContactMatchType eab_contact_compare_name_to_string_full (EContact *contact, const gchar *str,
-							     gboolean allow_partial_matches,
-							     gint *matched_parts, EABContactMatchPart *first_matched_part,
-							     gint *matched_character_count);
-
-EABContactMatchType eab_contact_compare_name      (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_nickname  (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_email     (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_address   (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_telephone (EContact *contact1, EContact *contact2);
-
-EABContactMatchType eab_contact_compare           (EContact *contact1, EContact *contact2);
-
-void                eab_contact_locate_match      (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure);
-void                eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure);
-
-
-
-#endif /* __E_CONTACT_COMPARE_H__ */
-
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
deleted file mode 100644
index c44547fb92..0000000000
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog-duplicate-contact">
-  <property name="border_width">6</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Duplicate Contact Detected</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button4">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-add</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="Custom" id="custom-old-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:55:10 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The name or email address of this contact already exists
-in this folder.  Would you like to add it anyway?</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Original Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">New Contact:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="custom-new-contact">
-	      <property name="visible">True</property>
-	      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sun, 05 Oct 2003 03:54:50 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment1">
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">0</property>
-
-	      <child>
-		<widget class="Custom" id="custom2">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_create_image_widget</property>
-		  <property name="string1">malehead.png</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
deleted file mode 100644
index 38a3c188b2..0000000000
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Code for checking for duplicates when doing EContact work.
- *
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
- *
- * Copyright (C) 2001, 2002, 2003, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include "eab-contact-merging.h"
-#include "eab-contact-compare.h"
-#include <glade/glade.h>
-#include <gtk/gtksignal.h>
-#include "addressbook/gui/widgets/eab-contact-display.h"
-
-typedef enum {
-	E_CONTACT_MERGING_ADD,
-	E_CONTACT_MERGING_COMMIT
-} EContactMergingOpType;
-
-typedef struct {
-	EContactMergingOpType op;
-	EBook *book;
-	EContact *contact;
-	EBookIdCallback id_cb;
-	EBookCallback   cb;
-	gpointer closure;
-} EContactMergingLookup;
-
-static void
-free_lookup (EContactMergingLookup *lookup)
-{
-	g_object_unref (lookup->book);
-	g_object_unref (lookup->contact);
-
-	g_free (lookup);
-}
-
-static void
-final_id_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if (lookup->id_cb)
-		lookup->id_cb (lookup->book, status, id, lookup->closure);
-
-	free_lookup (lookup);
-}
-
-static void
-final_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if (lookup->cb)
-		lookup->cb (lookup->book, status, lookup->closure);
-
-	free_lookup (lookup);
-}
-
-static void
-doit (EContactMergingLookup *lookup)
-{
-	if (lookup->op == E_CONTACT_MERGING_ADD)
-		e_book_async_add_contact (lookup->book, lookup->contact, final_id_cb, lookup);
-	else if (lookup->op == E_CONTACT_MERGING_COMMIT)
-		e_book_async_commit_contact (lookup->book, lookup->contact, final_cb, lookup);
-}
-
-static void
-cancelit (EContactMergingLookup *lookup)
-{
-	if (lookup->op == E_CONTACT_MERGING_ADD) {
-		if (lookup->id_cb)
-			final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup);
-	} else if (lookup->op == E_CONTACT_MERGING_COMMIT) {
-		if (lookup->cb)
-			final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup);
-	}
-}
-
-static void
-response (GtkWidget *dialog, int response, EContactMergingLookup *lookup)
-{
-	gtk_widget_destroy (dialog);
-
-	switch (response) {
-	case 0:
-		doit (lookup);
-		break;
-	case 1:
-		cancelit (lookup);
-		break;
-	}
-}
-
-static void
-match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure)
-{
-	EContactMergingLookup *lookup = closure;
-
-	if ((gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE) {
-		doit (lookup);
-	} else {
-		GladeXML *ui;
-		
-		GtkWidget *widget;
-
-		if (lookup->op == E_CONTACT_MERGING_ADD)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-duplicate-detected.glade", NULL, NULL);
-		else if (lookup->op == E_CONTACT_MERGING_COMMIT)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-merging-commit-duplicate-detected.glade", NULL, NULL);
-		else {
-			doit (lookup);
-			return;
-		}
-
-		widget = glade_xml_get_widget (ui, "custom-old-contact");
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (widget),
-					    match, EAB_CONTACT_DISPLAY_RENDER_COMPACT);
-
-		widget = glade_xml_get_widget (ui, "custom-new-contact");
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (widget),
-					    contact, EAB_CONTACT_DISPLAY_RENDER_COMPACT);
-
-		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
-
-		g_signal_connect (widget, "response",
-				  G_CALLBACK (response), lookup);
-
-		gtk_widget_show_all (widget);
-	}
-}
-
-gboolean
-eab_merging_book_add_contact (EBook           *book,
-			      EContact           *contact,
-			      EBookIdCallback  cb,
-			      gpointer         closure)
-{
-	EContactMergingLookup *lookup;
-
-	lookup = g_new (EContactMergingLookup, 1);
-
-	lookup->op = E_CONTACT_MERGING_ADD;
-	lookup->book = g_object_ref (book);
-	lookup->contact = g_object_ref (contact);
-	lookup->id_cb = cb;
-	lookup->closure = closure;
-
-	eab_contact_locate_match_full (book, contact, NULL, match_query_callback, lookup);
-
-	return TRUE;
-}
-
-gboolean
-eab_merging_book_commit_contact (EBook                 *book,
-				 EContact                 *contact,
-				 EBookCallback          cb,
-				 gpointer               closure)
-{
-	EContactMergingLookup *lookup;
-	GList *avoid;
-	
-	lookup = g_new (EContactMergingLookup, 1);
-
-	lookup->op = E_CONTACT_MERGING_COMMIT;
-	lookup->book = g_object_ref (book);
-	lookup->contact = g_object_ref (contact);
-	lookup->cb = cb;
-	lookup->closure = closure;
-
-	avoid = g_list_append (NULL, contact);
-
-	eab_contact_locate_match_full (book, contact, avoid, match_query_callback, lookup);
-
-	g_list_free (avoid);
-
-	return TRUE;
-}
-
-GtkWidget *
-_eab_contact_merging_create_contact_display(gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2);
-
-GtkWidget *
-_eab_contact_merging_create_contact_display(gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2)
-{
-	return eab_contact_display_new();
-}
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
deleted file mode 100644
index d6d60e57de..0000000000
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
- *
- * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
- */
-
-#ifndef __E_CONTACT_MERGING_H__
-#define __E_CONTACT_MERGING_H__
-
-#include <libebook/e-book-async.h>
-
-G_BEGIN_DECLS
-
-gboolean  eab_merging_book_add_contact    (EBook           *book,
-					   EContact        *contact,
-					   EBookIdCallback  cb,
-					   gpointer         closure);
-gboolean  eab_merging_book_commit_contact (EBook           *book,
-					   EContact        *contact,
-					   EBookCallback    cb,
-					   gpointer         closure);
-
-G_END_DECLS
-
-#endif /* ! __EAB_CONTACT_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 391039d81f..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-ruledir = $(privdatadir)
-rule_DATA = addresstypes.xml
-
-EXTRA_DIST = addresstypes.xml
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libeaddressbooksearch.la
-
-libeaddressbooksearch_la_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 a8621bf5a7..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal/util/e-util.h"
-
-#include "e-addressbook-search-dialog.h"
-
-
-static void eab_search_dialog_init             (EABSearchDialog          *widget);
-static void eab_search_dialog_class_init       (EABSearchDialogClass     *klass);
-static void eab_search_dialog_dispose          (GObject *object);
-
-static GtkDialog *parent_class = NULL;
-
-#define PARENT_TYPE GTK_TYPE_DIALOG
-
-E_MAKE_TYPE (eab_search_dialog,
-	     "EABSearchDialog",
-	     EABSearchDialog,
-	     eab_search_dialog_class_init,
-	     eab_search_dialog_init,
-	     PARENT_TYPE)
-
-static void
-eab_search_dialog_class_init (EABSearchDialogClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass*) klass;
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose = eab_search_dialog_dispose;
-}
-
-static GtkWidget *
-get_widget (EABSearchDialog *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 (EABSearchDialog *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
-dialog_response (GtkWidget *widget, int response_id, EABSearchDialog *dialog)
-{
-	char *query;
-
-	if (response_id == GTK_RESPONSE_OK) {
-		query = get_query(dialog);
-		g_object_set(dialog->view,
-			     "query", query,
-			     NULL);
-		g_free(query);
-	}
-
-	gtk_widget_destroy(GTK_WIDGET (dialog));
-}
-
-static void
-eab_search_dialog_init (EABSearchDialog *view)
-{
-	GtkDialog *dialog = GTK_DIALOG (view);
-
-	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);
-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, TRUE, TRUE, 0);
-	gtk_widget_show(view->search);
-
-	gtk_dialog_add_buttons (dialog,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				/*GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,*/
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-	
-	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
-
-	g_signal_connect(dialog, "response",
-			 G_CALLBACK(dialog_response), view);
-}
-
-GtkWidget *
-eab_search_dialog_new (EABView *addr_view)
-{
-	EABSearchDialog *view = g_object_new (EAB_SEARCH_DIALOG_TYPE, NULL);
-	view->view = addr_view;
-	return GTK_WIDGET(view);
-}
-
-static void
-eab_search_dialog_dispose (GObject *object)
-{
-	EABSearchDialog *view;
-
-	view = EAB_SEARCH_DIALOG (object);
-
-	if (view->context) {
-		g_object_unref(view->context);
-		view->context = NULL;
-	}
-	if (view->rule) {
-		g_object_unref(view->rule);
-		view->rule = NULL;
-	}
-
-	G_OBJECT_CLASS(parent_class)->dispose (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 8634074f69..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EAB_SEARCH_DIALOG_H__
-#define __EAB_SEARCH_DIALOG_H__
-
-#include <libebook/e-book.h>
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-#define EAB_SEARCH_DIALOG_TYPE		(eab_search_dialog_get_type ())
-#define EAB_SEARCH_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_SEARCH_DIALOG_TYPE, EABSearchDialog))
-#define EAB_SEARCH_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EAB_SEARCH_DIALOG_TYPE, EABSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EABSearchDialog       EABSearchDialog;
-typedef struct _EABSearchDialogClass  EABSearchDialogClass;
-
-struct _EABSearchDialog
-{
-	GtkDialog parent;
-
-	GtkWidget *search;
-
-	EABView *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-};
-
-struct _EABSearchDialogClass
-{
-	GtkDialogClass parent_class;
-};
-
-GType      eab_search_dialog_get_type (void);
-
-GtkWidget *eab_search_dialog_new (EABView *view);
-
-G_END_DECLS
-
-#endif /* __EAB_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index b67f65e6c3..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
-eab-marshal.c
-eab-marshal.h
-Evolution-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index ce5cc32275..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-INCLUDES =										\
-	-DG_LOG_DOMAIN=\"eab-widgets\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/component	\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-CORBA_COMPOSER_SOURCE_H	=			\
-	Evolution-Composer.h
-CORBA_COMPOSER_SOURCE_C =			\
-	Evolution-Composer-common.c		\
-	Evolution-Composer-skels.c		\
-	Evolution-Composer-stubs.c
-CORBA_COMPOSER_IDL = $(srcdir)/../../../composer/Evolution-Composer.idl
-
-$(CORBA_COMPOSER_SOURCE_H): $(CORBA_COMPOSER_IDL)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(CORBA_COMPOSER_IDL)
-
-$(CORBA_COMPOSER_SOURCE_C): $(CORBA_COMPOSER_SOURCE_H)
-
-CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H)
-CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C)
-CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C)
-
-noinst_LTLIBRARIES =				\
-	libeabwidgets.la
-
-libeabwidgets_la_SOURCES =			\
-	$(CORBA_SOURCE)				\
-	$(MARSHAL_GENERATED)			\
-	eab-contact-display.c			\
-	eab-contact-display.h			\
-	eab-gui-util.c				\
-	eab-gui-util.h				\
-	eab-popup-control.c			\
-	eab-popup-control.h			\
-	eab-vcard-control.c			\
-	eab-vcard-control.h			\
-	e-minicard.c				\
-	e-minicard.h				\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-minicard-view.c			\
-	e-minicard-view.h			\
-	e-minicard-view-widget.c		\
-	e-minicard-view-widget.h		\
-	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-view.c			\
-	e-addressbook-view.h			\
-	gal-view-minicard.c			\
-	gal-view-minicard.h			\
-	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h
-
-#TREEVIEW_SOURCES=	e-addressbook-treeview-adapter.c	\
-#			e-addressbook-treeview-adapter.h	\
-#			gal-view-factory-treeview.c		\
-#			gal-view-factory-treeview.h		\
-#			gal-view-treeview.c			\
-#			gal-view-treeview.h
-
-MARSHAL_GENERATED = eab-marshal.c eab-marshal.h
-@EVO_MARSHAL_RULE@
-
-BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-etspec_DATA= e-addressbook-view.etspec
-
-EXTRA_DIST = 			\
-	$(etspec_DATA)		\
-	eab-marshal.list
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index 992b42b852..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,693 +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 "eab-marshal.h"
-#include "e-addressbook-model.h"
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "eab-gui-util.h"
-
-#define PARENT_TYPE G_TYPE_OBJECT
-static GObjectClass *parent_class;
-
-/*
- * EABModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-};
-
-enum {
-	WRITABLE_STATUS,
-	STATUS_MESSAGE,
-	SEARCH_STARTED,
-	SEARCH_RESULT,
-	FOLDER_BAR_MESSAGE,
-	CONTACT_ADDED,
-	CONTACT_REMOVED,
-	CONTACT_CHANGED,
-	MODEL_CHANGED,
-	STOP_STATE_CHANGED,
-	BACKEND_DIED,
-	LAST_SIGNAL
-};
-
-static guint eab_model_signals [LAST_SIGNAL] = {0, };
-
-static void
-free_data (EABModel *model)
-{
-	if (model->data) {
-		int i;
-
-		for ( i = 0; i < model->data_count; i++ ) {
-			g_object_unref (model->data[i]);
-		}
-
-		g_free(model->data);
-		model->data = NULL;
-		model->data_count = 0;
-		model->allocated_count = 0;
-	}
-}
-
-static void
-remove_book_view(EABModel *model)
-{
-	if (model->book_view && model->create_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->create_contact_id);
-	if (model->book_view && model->remove_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->remove_contact_id);
-	if (model->book_view && model->modify_contact_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->modify_contact_id);
-	if (model->book_view && model->status_message_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->status_message_id);
-	if (model->book_view && model->sequence_complete_id)
-		g_signal_handler_disconnect (model->book_view,
-					     model->sequence_complete_id);
-
-	model->create_contact_id = 0;
-	model->remove_contact_id = 0;
-	model->modify_contact_id = 0;
-	model->status_message_id = 0;
-	model->sequence_complete_id = 0;
-
-	model->search_in_progress = FALSE;
-
-	if (model->book_view) {
-		e_book_view_stop (model->book_view);
-		g_object_unref (model->book_view);
-		model->book_view = NULL;
-	}
-}
-
-static void
-addressbook_dispose(GObject *object)
-{
-	EABModel *model = EAB_MODEL(object);
-
-	remove_book_view(model);
-	free_data (model);
-
-	if (model->book) {
-		if (model->writable_status_id)
-			g_signal_handler_disconnect (model->book,
-						     model->writable_status_id);
-		model->writable_status_id = 0;
-
-		if (model->backend_died_id)
-			g_signal_handler_disconnect (model->book,
-						     model->backend_died_id);
-		model->backend_died_id = 0;
-
-		g_object_unref (model->book);
-		model->book = NULL;
-	}
-
-	if (model->query) {
-		e_book_query_unref (model->query);
-		model->query = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-static void
-update_folder_bar_message (EABModel *model)
-{
-	int count;
-	char *message;
-
-	count = model->data_count;
-
-	switch (count) {
-	case 0:
-		message = g_strdup (_("No contacts"));
-		break;
-	case 1:
-		message = g_strdup (_("1 contact"));
-		break;
-	default:
-		message = g_strdup_printf (_("%d contacts"), count);
-		break;
-	}
-
-	g_signal_emit (model,
-		       eab_model_signals [FOLDER_BAR_MESSAGE], 0,
-		       message);
-
-	g_free (message);
-}
-
-static void
-create_contact(EBookView *book_view,
-	       const GList *contacts,
-	       EABModel *model)
-{
-	int old_count = model->data_count;
-	int length = g_list_length ((GList *)contacts);
-
-	if (model->data_count + length > model->allocated_count) {
-		while (model->data_count + length > model->allocated_count)
-			model->allocated_count = model->allocated_count * 2 + 1;
-		model->data = g_renew(EContact *, model->data, model->allocated_count);
-	}
-
-	for ( ; contacts; contacts = contacts->next) {
-		model->data[model->data_count++] = contacts->data;
-		g_object_ref (contacts->data);
-	}
-
-	g_signal_emit (model,
-		       eab_model_signals [CONTACT_ADDED], 0,
-		       old_count, model->data_count - old_count);
-
-	update_folder_bar_message (model);
-}
-
-static void
-remove_contact(EBookView *book_view,
-	       GList *ids,
-	       EABModel *model)
-{
-	/* XXX we should keep a hash around instead of this O(n*m) loop */
-	int i = 0;
-	GList *l;
-
-	for (l = ids; l; l = l->next) {
-		char *id = l->data;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_contact_get_const (model->data[i], E_CONTACT_UID), id) ) {
-				g_object_unref (model->data[i]);
-				memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (EContact *));
-				model->data_count--;
-
-				g_signal_emit (model,
-					       eab_model_signals [CONTACT_REMOVED], 0,
-					       i);
-
-				break;
-			}
-		}
-	}
-
-	update_folder_bar_message (model);
-}
-
-static void
-modify_contact(EBookView *book_view,
-	       const GList *contacts,
-	       EABModel *model)
-{
-	for ( ; contacts; contacts = contacts->next) {
-		int i;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_contact_get_const(model->data[i], E_CONTACT_UID),
-				     e_contact_get_const(E_CONTACT(contacts->data), E_CONTACT_UID)) ) {
-				g_object_unref (model->data[i]);
-				model->data[i] = e_contact_duplicate(E_CONTACT(contacts->data));
-				g_signal_emit (model,
-					       eab_model_signals [CONTACT_CHANGED], 0,
-					       i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EABModel *model)
-{
-	g_signal_emit (model,
-		       eab_model_signals [STATUS_MESSAGE], 0,
-		       status);
-}
-
-static void
-sequence_complete (EBookView *book_view,
-		   EBookViewStatus status,
-		   EABModel *model)
-{
-	model->search_in_progress = FALSE;
-	status_message (book_view, NULL, model);
-	g_signal_emit (model,
-		       eab_model_signals [SEARCH_RESULT], 0,
-		       status);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-}
-
-static void
-writable_status (EBook *book,
-		 gboolean writable,
-		 EABModel *model)
-{
-	if (!model->editable_set) {
-		model->editable = writable;
-
-		g_signal_emit (model,
-			       eab_model_signals [WRITABLE_STATUS], 0,
-			       writable);
-	}
-}
-
-static void
-backend_died (EBook *book,
-	      EABModel *model)
-{
-	g_signal_emit (model,
-		       eab_model_signals [BACKEND_DIED], 0);
-}
-
-static void
-eab_model_class_init (GObjectClass *object_class)
-{
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose = addressbook_dispose;
-	object_class->set_property   = eab_model_set_property;
-	object_class->get_property   = eab_model_get_property;
-
-	g_object_class_install_property (object_class, PROP_BOOK,
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY,
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	eab_model_signals [WRITABLE_STATUS] =
-		g_signal_new ("writable_status",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, writable_status),
-			      NULL, NULL,
-			      eab_marshal_NONE__BOOL,
-			      G_TYPE_NONE,
-			      1, G_TYPE_BOOLEAN);
-
-	eab_model_signals [STATUS_MESSAGE] =
-		g_signal_new ("status_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, status_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE,
-			      1, G_TYPE_POINTER);
-
-	eab_model_signals [SEARCH_STARTED] =
-		g_signal_new ("search_started",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, search_started),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-	
-	eab_model_signals [SEARCH_RESULT] =
-		g_signal_new ("search_result",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, search_result),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-	
-	eab_model_signals [FOLDER_BAR_MESSAGE] =
-		g_signal_new ("folder_bar_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, folder_bar_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_model_signals [CONTACT_ADDED] =
-		g_signal_new ("contact_added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contact_added),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT_INT,
-			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-
-	eab_model_signals [CONTACT_REMOVED] =
-		g_signal_new ("contact_removed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contact_removed),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	eab_model_signals [CONTACT_CHANGED] =
-		g_signal_new ("contact_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, contact_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	eab_model_signals [MODEL_CHANGED] =
-		g_signal_new ("model_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, model_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	eab_model_signals [STOP_STATE_CHANGED] =
-		g_signal_new ("stop_state_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, stop_state_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	eab_model_signals [BACKEND_DIED] =
-		g_signal_new ("backend_died",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABModelClass, backend_died),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-eab_model_init (GObject *object)
-{
-	EABModel *model = EAB_MODEL(object);
-	model->book = NULL;
-	model->query = e_book_query_any_field_contains ("");
-	model->book_view = NULL;
-	model->create_contact_id = 0;
-	model->remove_contact_id = 0;
-	model->modify_contact_id = 0;
-	model->status_message_id = 0;
-	model->writable_status_id = 0;
-	model->backend_died_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)
-{
-	EABModel *model = closure;
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error getting book view"), status);
-		return;
-	}
-
-	remove_book_view (model);
-	free_data (model);
-
-	model->book_view = book_view;
-	if (model->book_view)
-		g_object_ref (model->book_view);
-	model->create_contact_id = g_signal_connect(model->book_view,
-						    "contacts_added",
-						    G_CALLBACK (create_contact),
-						    model);
-	model->remove_contact_id = g_signal_connect(model->book_view,
-						    "contacts_removed",
-						    G_CALLBACK (remove_contact),
-						    model);
-	model->modify_contact_id = g_signal_connect(model->book_view,
-						    "contacts_changed",
-						    G_CALLBACK(modify_contact),
-						    model);
-	model->status_message_id = g_signal_connect(model->book_view,
-						    "status_message",
-						    G_CALLBACK(status_message),
-						    model);
-	model->sequence_complete_id = g_signal_connect(model->book_view,
-						       "sequence_complete",
-						       G_CALLBACK(sequence_complete),
-						       model);
-
-	model->search_in_progress = TRUE;
-	g_signal_emit (model,
-		       eab_model_signals [MODEL_CHANGED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [SEARCH_STARTED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-
-	e_book_view_start (model->book_view);
-}
-
-static void
-get_view (EABModel *model)
-{
-	gboolean success;
-
-	if (model->book && model->query) {
-		char *query_string = e_book_query_to_string (model->query);
-
-		remove_book_view(model);
-		free_data (model);
-
-		if (model->first_get_view) {
-			model->first_get_view = FALSE;
-
-			if (e_book_check_static_capability (model->book, "do-initial-query")) {
-				success = e_book_async_get_book_view (model->book, query_string, book_view_loaded, model);
-			} else {
-				g_signal_emit (model,
-					       eab_model_signals [MODEL_CHANGED], 0);
-				g_signal_emit (model,
-					       eab_model_signals [STOP_STATE_CHANGED], 0);
-				g_free (query_string);
-				return;
-			}
-		}
-		else
-			success = e_book_async_get_book_view (model->book, query_string, book_view_loaded, model);
-
-		g_free (query_string);
-	}
-}
-
-EContact *
-eab_model_get_contact(EABModel *model,
-		      int       row)
-{
-	if (model->data && 0 <= row && row < model->data_count) {
-		return e_contact_duplicate (model->data[row]);
-	}
-	return NULL;
-}
-
-static void
-eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EABModel *model;
-
-	model = EAB_MODEL (object);
-	
-	switch (prop_id){
-	case PROP_BOOK:
-		if (model->book) {
-			if (model->writable_status_id)
-				g_signal_handler_disconnect (model->book,
-							     model->writable_status_id);
-			model->writable_status_id = 0;
-
-			if (model->backend_died_id)
-				g_signal_handler_disconnect (model->book,
-							     model->backend_died_id);
-			model->backend_died_id = 0;
-
-			g_object_unref (model->book);
-		}
-		model->book = E_BOOK(g_value_get_object (value));
-		if (model->book) {
-			if (!model->editable_set) {
-				model->editable = e_book_is_writable (model->book);
-
-				g_signal_emit (model,
-					       eab_model_signals [WRITABLE_STATUS], 0,
-					       model->editable);
-			}
-			model->first_get_view = TRUE;
-			g_object_ref (model->book);
-			get_view (model);
-			g_signal_connect (model->book,
-					  "writable_status",
-					  G_CALLBACK (writable_status), model);
-			g_signal_connect (model->book,
-					  "backend_died",
-					  G_CALLBACK (backend_died), model);
-		}
-		break;
-	case PROP_QUERY:
-		if (model->query)
-			e_book_query_unref (model->query);
-		model->query = e_book_query_from_string (g_value_get_string (value));
-		get_view (model);
-		break;
-	case PROP_EDITABLE:
-		model->editable = g_value_get_boolean (value);
-		model->editable_set = TRUE;
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EABModel *eab_model;
-
-	eab_model = EAB_MODEL (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, eab_model->book);
-		break;
-	case PROP_QUERY: {
-		char *query_string = e_book_query_to_string (eab_model->query);
-		g_value_set_string (value, query_string);
-		break;
-	}
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, eab_model->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-GType
-eab_model_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABModelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_model_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABModel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_model_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABModel", &info, 0);
-	}
-
-	return type;
-}
-
-EABModel*
-eab_model_new (void)
-{
-	EABModel *et;
-
-	et = g_object_new (EAB_TYPE_MODEL, NULL);
-	
-	return et;
-}
-
-void   eab_model_stop    (EABModel *model)
-{
-	remove_book_view(model);
-	g_signal_emit (model,
-		       eab_model_signals [STOP_STATE_CHANGED], 0);
-	g_signal_emit (model,
-		       eab_model_signals [STATUS_MESSAGE], 0,
-		       "Search Interrupted.");
-}
-
-gboolean
-eab_model_can_stop (EABModel *model)
-{
-	return model->search_in_progress;
-}
-
-void
-eab_model_force_folder_bar_message (EABModel *model)
-{
-	update_folder_bar_message (model);
-}
-
-int
-eab_model_contact_count (EABModel *model)
-{
-	return model->data_count;
-}
-
-const EContact *
-eab_model_contact_at (EABModel *model, int index)
-{
-	return model->data[index];
-}
-
-gboolean
-eab_model_editable (EABModel *model)
-{
-	return model->editable;
-}
-
-EBook *
-eab_model_get_ebook (EABModel *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 64ce6c3845..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _EAB_MODEL_H_
-#define _EAB_MODEL_H_
-
-#include <glib.h>
-#include <glib-object.h>
-#include <libebook/e-book-async.h>
-#include <libebook/e-book-view.h>
-
-#define EAB_TYPE_MODEL                  (eab_model_get_type ())
-#define EAB_MODEL(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_MODEL, EABModel))
-#define EAB_MODEL_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), EAB_TYPE_MODEL, EABModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_MODEL))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_MODEL))
-
-typedef struct _EABModel EABModel;
-typedef struct _EABModelClass EABModelClass;
-
-struct _EABModel {
-	GObject parent;
-
-	/* item specific fields */
-	EBook *book;
-	EBookQuery *query;
-	EBookView *book_view;
-
-	EContact **data;
-	int data_count;
-	int allocated_count;
-
-	int create_contact_id, remove_contact_id, modify_contact_id;
-	int status_message_id, writable_status_id, sequence_complete_id;
-	int backend_died_id;
-
-	guint search_in_progress : 1;
-	guint editable : 1;
-	guint editable_set : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EABModelClass {
-	GObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*writable_status)    (EABModel *model, gboolean writable);
-	void (*search_started)     (EABModel *model);
-	void (*search_result)      (EABModel *model, EBookViewStatus status);
-	void (*status_message)     (EABModel *model, const gchar *message);
-	void (*folder_bar_message) (EABModel *model, const gchar *message);
-	void (*contact_added)      (EABModel *model, gint index, gint count);
-	void (*contact_removed)    (EABModel *model, gint index);
-	void (*contact_changed)    (EABModel *model, gint index);
-	void (*model_changed)      (EABModel *model);
-	void (*stop_state_changed) (EABModel *model);
-	void (*backend_died)       (EABModel *model);
-};
-
-
-GType              eab_model_get_type                  (void);
-EABModel          *eab_model_new                       (void);
-
-/* Returns object with ref count of 1. */
-EContact          *eab_model_get_contact               (EABModel *model,
-							int                row);
-EBook             *eab_model_get_ebook                 (EABModel *model);
-
-void               eab_model_stop                      (EABModel *model);
-gboolean           eab_model_can_stop                  (EABModel *model);
-
-void               eab_model_force_folder_bar_message  (EABModel *model);
-
-int                eab_model_contact_count             (EABModel *model);
-const EContact    *eab_model_contact_at                (EABModel *model,
-							int                index);
-gboolean           eab_model_editable                  (EABModel *model);
-
-#endif /* _EAB_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 cf1667fec5..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#include <config.h>
-#include <string.h>
-
-#include <libgnome/gnome-i18n.h>
-#include "eab-marshal.h"
-#include "e-addressbook-reflow-adapter.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-view.h"
-#include "eab-gui-util.h"
-
-#include "e-minicard.h"
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-
-struct _EAddressbookReflowAdapterPrivate {
-	EABModel *model;
-
-	gboolean loading;
-
-	int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id;
-	int search_started_id, search_result_id;
-};
-
-#define PARENT_TYPE e_reflow_model_get_type()
-static EReflowModel *parent_class;
-
-#define d(x)
-
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-	PROP_MODEL,
-};
-
-enum {
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_reflow_adapter_signals [LAST_SIGNAL] = {0, };
-
-static void
-unlink_model(EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	if (priv->model && priv->create_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->create_contact_id);
-	if (priv->model && priv->remove_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->remove_contact_id);
-	if (priv->model && priv->modify_contact_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->modify_contact_id);
-	if (priv->model && priv->model_changed_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->model_changed_id);
-	if (priv->model && priv->search_started_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->search_started_id);
-	if (priv->model && priv->search_result_id)
-		g_signal_handler_disconnect (priv->model,
-					     priv->search_result_id);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-	priv->search_started_id = 0;
-	priv->search_result_id = 0;
-
-	if (priv->model)
-		g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-
-static int
-text_height (PangoLayout *layout, const gchar *text)
-{
-	int height;
-
-	pango_layout_set_text (layout, text, -1);
-
-	pango_layout_get_pixel_size (layout, NULL, &height);
-
-	return height;
-}
-
-static void
-addressbook_dispose(GObject *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 eab_model_contact_count (priv->model);
-}
-
-/* This function returns the height of the minicontact in question */
-static int
-addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	EContactField field;
-	int count = 0;
-	char *string;
-	EContact *contact = (EContact*)eab_model_contact_at (priv->model, i);
-	PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (parent)->canvas), "");
-	int height;
-
-	string = e_contact_get(contact, E_CONTACT_FILE_AS);
-	height = text_height (layout, string ? string : "") + 10.0;
-	g_free(string);
-
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) {
-
-		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-			continue;
-
-		string = e_contact_get(contact, field);
-		if (string && *string) {
-			int this_height;
-			int field_text_height;
-
-			this_height = text_height (layout, e_contact_pretty_name(field));
-
-			field_text_height = text_height (layout, string);
-			if (this_height < field_text_height)
-				this_height = field_text_height;
-
-			this_height += 3;
-
-			height += this_height;
-			count ++;
-		}
-		g_free (string);
-	}
-	height += 2;
-
-	g_object_unref (layout);
-
-	return height;
-}
-
-static int
-addressbook_compare (EReflowModel *erm, int n1, int n2)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	EContact *contact1, *contact2;
-
-	if (priv->loading) {
-		return n1-n2;
-	}
-	else {
-		contact1 = (EContact*)eab_model_contact_at (priv->model, n1);
-		contact2 = (EContact*)eab_model_contact_at (priv->model, n2);
-
-		if (contact1 && contact2) {
-			const char *file_as1, *file_as2;
-			file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS);
-			file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS);
-			if (file_as1 && file_as2)
-				return g_utf8_collate(file_as1, file_as2);
-			if (file_as1)
-				return -1;
-			if (file_as2)
-				return 1;
-			return strcmp(e_contact_get_const (contact1, E_CONTACT_UID),
-				      e_contact_get_const (contact2, E_CONTACT_UID));
-		}
-		if (contact1)
-			return -1;
-		if (contact2)
-			return 1;
-		return 0;
-	}
-}
-
-static int
-adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
-{
-	gint ret_val = 0;
-
-	g_signal_emit (adapter,
-		       e_addressbook_reflow_adapter_signals[DRAG_BEGIN], 0,
-		       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(),
-				     "contact", eab_model_contact_at (priv->model, i),
-				     "editable", eab_model_editable (priv->model),
-				     NULL);
-
-#if 0
-	g_signal_connect (item, "selected",
-			  G_CALLBACK(card_selected), 0, emvm);
-#endif
-
-	g_signal_connect (item, "drag_begin",
-			  G_CALLBACK(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,
-			      "contact", eab_model_contact_at (priv->model, i),
-			      NULL);
-}
-
-static void
-create_contact (EABModel *model,
-		gint index, gint count,
-		EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_items_inserted (E_REFLOW_MODEL (adapter),
-				       index,
-				       count);
-}
-
-static void
-remove_contact (EABModel *model,
-		gint index,
-		EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_item_removed (E_REFLOW_MODEL (adapter), index);
-}
-
-static void
-modify_contact (EABModel *model,
-		gint index,
-		EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_item_changed (E_REFLOW_MODEL (adapter), index);
-}
-
-static void
-model_changed (EABModel *model,
-	       EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-search_started (EABModel *model,
-		EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->loading = TRUE;
-}
-
-static void
-search_result (EABModel *model,
-	       EBookViewStatus status,
-	       EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->loading = FALSE;
-
-	e_reflow_model_comparison_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-addressbook_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_object_set (priv->model,
-			      "book", g_value_get_object (value),
-			      NULL);
-		break;
-	case PROP_QUERY:
-		g_object_set (priv->model,
-			      "query", g_value_get_string (value),
-			      NULL);
-		break;
-	case PROP_EDITABLE:
-		g_object_set (priv->model,
-			      "editable", g_value_get_boolean (value),
-			      NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-addressbook_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (prop_id) {
-	case PROP_BOOK: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "book", value);
-		break;
-	}
-	case PROP_QUERY: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "query", value);
-		break;
-	}
-	case PROP_EDITABLE: {
-		g_object_get_property (G_OBJECT (priv->model),
-				       "editable", value);
-		break;
-	}
-	case PROP_MODEL:
-		g_value_set_object (value, priv->model);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_addressbook_reflow_adapter_class_init (GObjectClass *object_class)
-{
-	EReflowModelClass *model_class = (EReflowModelClass *) object_class;
-
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->set_property = addressbook_set_property;
-	object_class->get_property = addressbook_get_property;
-	object_class->dispose = addressbook_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY,
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_MODEL,
-					 g_param_spec_object ("model",
-							       _("Model"),
-							      /*_( */"XXX blurb" /*)*/,
-							      EAB_TYPE_MODEL,
-							      G_PARAM_READABLE));
-
-	e_addressbook_reflow_adapter_signals [DRAG_BEGIN] =
-		g_signal_new ("drag_begin",
-			      G_OBJECT_CLASS_TYPE(object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EAddressbookReflowAdapterClass, drag_begin),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	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->loading = FALSE;
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-	priv->search_started_id = 0;
-	priv->search_result_id = 0;
-}
-
-GType
-e_addressbook_reflow_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EAddressbookReflowAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_addressbook_reflow_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookReflowAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_addressbook_reflow_adapter_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookReflowAdapter", &info, 0);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,
-					EABModel *model)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->create_contact_id = g_signal_connect(priv->model,
-						"contact_added",
-						G_CALLBACK(create_contact),
-						adapter);
-	priv->remove_contact_id = g_signal_connect(priv->model,
-						"contact_removed",
-						G_CALLBACK(remove_contact),
-						adapter);
-	priv->modify_contact_id = g_signal_connect(priv->model,
-						"contact_changed",
-						G_CALLBACK(modify_contact),
-						adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-	priv->search_started_id = g_signal_connect(priv->model,
-						   "search_started",
-						   G_CALLBACK(search_started),
-						   adapter);
-	priv->search_result_id = g_signal_connect(priv->model,
-						  "search_result",
-						  G_CALLBACK(search_result),
-						  adapter);
-}
-
-EReflowModel *
-e_addressbook_reflow_adapter_new (EABModel *model)
-{
-	EAddressbookReflowAdapter *et;
-
-	et = g_object_new (E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, NULL);
-
-	e_addressbook_reflow_adapter_construct (et, model);
-
-	return E_REFLOW_MODEL(et);
-}
-
-
-EContact *
-e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter,
-					  int index)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return eab_model_get_contact (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 1321b27bb4..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ /dev/null
@@ -1,44 +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 <libebook/e-contact.h>
-#include "e-addressbook-model.h"
-
-#define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER        (e_addressbook_reflow_adapter_get_type ())
-#define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapter))
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapterClass))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER))
-
-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);
-};
-
-
-GType         e_addressbook_reflow_adapter_get_type          (void);
-void          e_addressbook_reflow_adapter_construct         (EAddressbookReflowAdapter *adapter,
-							      EABModel         *model);
-EReflowModel *e_addressbook_reflow_adapter_new               (EABModel         *model);
-
-/* Returns object with ref count of 1. */
-EContact     *e_addressbook_reflow_adapter_get_contact       (EAddressbookReflowAdapter *adapter,
-							      int                        index);
-#endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
deleted file mode 100644
index 9fa48084ed..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,356 +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 "eab-contact-merging.h"
-#include "eab-gui-util.h"
-#include "util/eab-destination.h"
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <gnome.h>
-
-struct _EAddressbookTableAdapterPrivate {
-	EABModel *model;
-
-	int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-#define COLS (E_CONTACT_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	g_signal_handler_disconnect (priv->model,
-				     priv->create_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->remove_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->modify_contact_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->model_changed_id);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-
-	g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-static void
-addressbook_dispose(GObject *object)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(object);
-
-	if (adapter->priv) {
-		unlink_model(adapter);
-
-		g_free (adapter->priv);
-		adapter->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* 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 = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	return eab_model_contact_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 = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const char *value;
-
-	if ( col >= COLS || row >= eab_model_contact_count (priv->model) )
-		return NULL;
-
-	value = e_contact_get_const((EContact*)eab_model_contact_at (priv->model, row), col);
-
-	if (value && !strncmp (value, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (value);
-		if (dest) {
-			/* XXX blech, we leak this */
-			value = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_object_unref (dest);
-		}
-	}
-
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-contact_modified_cb (EBook* book, EBookStatus status,
-		     gpointer user_data)
-{
-	if (status != E_BOOK_ERROR_OK)
-		eab_error_dialog (_("Error modifying card"), status);
-}
-
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	if (eab_model_editable (priv->model)) {
-		EContact *contact;
-
-		if (col >= COLS || row >= eab_model_contact_count (priv->model))
-			return;
-
-		contact = eab_model_get_contact (priv->model, row);
-		if (!contact)
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_contact_set(contact, col, (void *) val);
-		eab_merging_book_commit_contact (eab_model_get_ebook (priv->model),
-						 contact, contact_modified_cb, NULL);
-
-		g_object_unref (contact);
-
-		/* XXX do we need this?  shouldn't the commit_contact 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 = EAB_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const EContact *contact;
-
-	if (row >= 0 && row < eab_model_contact_count (priv->model))
-		contact = eab_model_contact_at (priv->model, row);
-	else
-		contact = NULL;
-
-	if (!eab_model_editable(priv->model))
-		return FALSE;
-	else if (contact && e_contact_get ((EContact *) contact, E_CONTACT_IS_LIST))
-		/* we only allow editing of the name and file as for
-                   lists */
-		return col == E_CONTACT_FULL_NAME || col == E_CONTACT_FILE_AS; 
-	else
-		return col < E_CONTACT_LAST_SIMPLE_STRING;
-
-	return FALSE;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etm);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	EContact *contact;
-	int col;
-
-	contact = e_contact_new ();
-
-	for (col = 1; col < E_CONTACT_LAST_SIMPLE_STRING; col++) {
-		const void *val = e_table_model_value_at (source, col, row);
-		e_contact_set (contact, col, (void *) val);
-	}
-
-	eab_merging_book_add_contact (eab_model_get_ebook (priv->model), contact, NULL, NULL);
-
-	g_object_unref (contact);
-}
-
-/* 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
-eab_table_adapter_class_init (GObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->dispose = addressbook_dispose;
-
-	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
-eab_table_adapter_init (GObject *object)
-{
-	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(object);
-	EAddressbookTableAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTableAdapterPrivate, 1);
-
-	priv->create_contact_id = 0;
-	priv->remove_contact_id = 0;
-	priv->modify_contact_id = 0;
-	priv->model_changed_id = 0;
-}
-
-
-static void
-create_contact (EABModel *model,
-		gint index, gint count,
-		EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count);
-}
-
-static void
-remove_contact (EABModel *model,
-		gint index,
-		EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_rows_deleted (E_TABLE_MODEL (adapter), index, 1);
-}
-
-static void
-modify_contact (EABModel *model,
-		gint index,
-		EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_row_changed (E_TABLE_MODEL (adapter), index);
-}
-
-static void
-model_changed (EABModel *model,
-	       EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	e_table_model_changed (E_TABLE_MODEL (adapter));
-}
-
-GType
-eab_table_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EAddressbookTableAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_table_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookTableAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_table_adapter_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookTableAdapter", &info, 0);
-	}
-
-	return type;
-}
-
-void
-eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
-				       EABModel *model)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->create_contact_id = g_signal_connect(priv->model,
-						   "contact_added",
-						   G_CALLBACK(create_contact),
-						   adapter);
-	priv->remove_contact_id = g_signal_connect(priv->model,
-						   "contact_removed",
-						   G_CALLBACK(remove_contact),
-						   adapter);
-	priv->modify_contact_id = g_signal_connect(priv->model,
-						   "contact_changed",
-						   G_CALLBACK(modify_contact),
-						   adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-}
-
-ETableModel *
-eab_table_adapter_new (EABModel *model)
-{
-	EAddressbookTableAdapter *et;
-
-	et = g_object_new(E_TYPE_AB_TABLE_ADAPTER, NULL);
-
-	eab_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 cf139e2bee..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _EAB_TABLE_ADAPTER_H_
-#define _EAB_TABLE_ADAPTER_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-view.h>
-
-#define E_TYPE_AB_TABLE_ADAPTER                 (eab_table_adapter_get_type ())
-#define EAB_TABLE_ADAPTER(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_AB_TABLE_ADAPTER, EAddressbookTableAdapter))
-#define EAB_TABLE_ADAPTER_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_AB_TABLE_ADAPTER, EAddressbookTableAdapterClass))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_AB_TABLE_ADAPTER))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_AB_TABLE_ADAPTER))
-
-typedef struct _EAddressbookTableAdapter EAddressbookTableAdapter;
-typedef struct _EAddressbookTableAdapterPrivate EAddressbookTableAdapterPrivate;
-typedef struct _EAddressbookTableAdapterClass EAddressbookTableAdapterClass;
-
-struct _EAddressbookTableAdapter {
-	ETableModel parent;
-
-	EAddressbookTableAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTableAdapterClass {
-	ETableModelClass parent_class;
-};
-
-
-GType        eab_table_adapter_get_type (void);
-void         eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
-					  EABModel *model);
-ETableModel *eab_table_adapter_new (EABModel *model);
-
-#endif /* _EAB_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
deleted file mode 100644
index 592f9d2b03..0000000000
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
+++ /dev/null
@@ -1,630 +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-treeview-adapter.h"
-#include "e-card-merging.h"
-#include "eab-gui-util.h"
-#include <gtk/gtktreednd.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-
-struct _EAddressbookTreeViewAdapterPrivate {
-	EAddressbookModel *model;
-
-	gint stamp;
-
-	ECardSimple **simples;
-	int count;
-
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE G_TYPE_OBJECT
-GObjectClass *parent_class;
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	g_signal_handler_disconnect (priv->model,
-				     priv->create_card_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->remove_card_id);
-	g_signal_handler_disconnect (priv->model,
-				     priv->modify_card_id);
-	g_signal_handler_disconnect (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 ++)
-			g_object_unref (priv->simples[i]);
-		g_free (priv->simples);
-		priv->simples = NULL;
-	}
-
-	g_object_unref (priv->model);
-
-	priv->model = NULL;
-}
-
-static void
-build_simple_mapping(EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			g_object_unref (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));
-		g_object_ref (priv->simples[i]);
-	}
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER(object);
-
-	unlink_model(adapter);
-
-	g_free (adapter->priv);
-	adapter->priv = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-#if 0
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	if (e_addressbook_model_editable (priv->model)) {
-		ECard *card;
-
-		if ( col >= COLS|| row >= e_addressbook_model_card_count (priv->model) )
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_card_simple_set(priv->simples[row],
-				  col,
-				  val);
-		g_object_get(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);
-	g_object_unref (simple);
-	g_object_unref (card);
-}
-#endif
-
-static void
-e_addressbook_treeview_adapter_class_init (GtkObjectClass *object_class)
-{
-	parent_class = g_type_class_peek_parent (object_class);
-
-	object_class->destroy = addressbook_destroy;
-}
-
-static void
-e_addressbook_treeview_adapter_init (GtkObject *object)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER(object);
-	EAddressbookTreeViewAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTreeViewAdapterPrivate, 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
-get_iter (EAddressbookTreeViewAdapter *adapter, gint index, GtkTreeIter *iter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-
-	iter->stamp = priv->stamp;
-	iter->user_data = GINT_TO_POINTER (index);
-}
-
-static void
-create_card (EAddressbookModel *model,
-	     gint index, gint count,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *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 *));
-
-	for (i = 0; i < count; i ++) {
-		GtkTreeIter iter;
-		GtkTreePath *path;
-
-		priv->simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index + i));
-
-		get_iter (adapter, index + i, &iter);
-		path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-		gtk_tree_model_row_inserted (GTK_TREE_MODEL (adapter), path, &iter);
-		gtk_tree_model_row_changed (GTK_TREE_MODEL (adapter), path, &iter);
-
-		gtk_tree_path_free (path);
-	}
-}
-
-static void
-remove_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-
-	g_object_unref (priv->simples[index]);
-	memmove (priv->simples + index, priv->simples + index + 1, (priv->count - index - 1) * sizeof (ECardSimple *));
-	priv->count --;
-	get_iter (adapter, index, &iter);
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-	gtk_tree_model_row_deleted (GTK_TREE_MODEL (adapter), path);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-modify_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTreeViewAdapter *adapter)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-
-	g_object_unref (priv->simples[index]);
-	priv->simples[index] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index));
-
-	get_iter (adapter, index, &iter);
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (adapter), &iter);
-
-	gtk_tree_model_row_changed (GTK_TREE_MODEL (adapter), path, &iter);
-
-	gtk_tree_path_free (path);
-}
-
-static void
-model_changed (EAddressbookModel *model,
-	       EAddressbookTreeViewAdapter *adapter)
-{
-	int i;
-
-	/* there has *got* to be an easier/faster way to do this... */
-	for (i = 0; i < adapter->priv->count; i++) {
-		remove_card (model, i, adapter);
-	}
-
-	build_simple_mapping (adapter);
-
-	if (adapter->priv->count) {
-		printf ("AIIEEEEEE\n");
-	}
-
-	/* XXX this isn't right either, we need to add the new cards */
-}
-
-static GtkTreeModelFlags
-adapter_get_flags (GtkTreeModel *tree_model)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), 0);
-
-  return GTK_TREE_MODEL_LIST_ONLY;
-}
-
-static gint
-adapter_get_n_columns (GtkTreeModel *tree_model)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), 0);
-
-  return COLS;
-}
-
-static GType
-adapter_get_column_type (GtkTreeModel *tree_model,
-			 gint          index)
-{
-  g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), G_TYPE_INVALID);
-  g_return_val_if_fail (index < COLS && index >= 0, G_TYPE_INVALID);
-  
-  return G_TYPE_STRING;
-}
-
-static gboolean
-adapter_get_iter (GtkTreeModel *tree_model,
-		  GtkTreeIter  *iter,
-		  GtkTreePath  *path)
-{
-	EAddressbookTreeViewAdapter *adapter;
-	GSList *list;
-	gint i;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	i = gtk_tree_path_get_indices (path)[0];
-
-	if (i >= adapter->priv->count)
-		return FALSE;
-
-	iter->stamp = adapter->priv->stamp;
-	iter->user_data = GINT_TO_POINTER (i);
-
-	return TRUE;
-}
-
-static GtkTreePath *
-adapter_get_path (GtkTreeModel *tree_model,
-		  GtkTreeIter  *iter)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-	GtkTreePath *retval;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), NULL);
-	g_return_val_if_fail (iter->stamp == adapter->priv->stamp, NULL);
-
-
-	if (GPOINTER_TO_INT (iter->user_data) >= adapter->priv->count)
-		return NULL;
-
-	retval = gtk_tree_path_new ();
-	gtk_tree_path_append_index (retval, GPOINTER_TO_INT (iter->user_data));
-	return retval;
-}
-
-static void
-adapter_get_value (GtkTreeModel *tree_model,
-		   GtkTreeIter  *iter,
-		   gint          column,
-		   GValue       *value)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-	ECardSimple *simple;
-	gint tmp_column = column;
-	const char *v;
-
-	g_return_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model));
-	g_return_if_fail (column < COLS);
-	g_return_if_fail (adapter->priv->stamp == iter->stamp);
-
-	simple = adapter->priv->simples [ GPOINTER_TO_INT (iter->user_data) ];
-
-	v = e_card_simple_get_const(simple, column);
-
-	if (v && !strncmp (v, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (v);
-		if (dest) {
-			/* XXX blech, we leak this */
-			v = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_object_unref (dest);
-		}
-	}
-
-	g_value_init (value, G_TYPE_STRING);
-	g_value_set_string (value, (v ? v : ""));
-}
-
-static gboolean
-adapter_iter_next (GtkTreeModel  *tree_model,
-		   GtkTreeIter   *iter)
-{
-	EAddressbookTreeViewAdapter *adapter;
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-	g_return_val_if_fail (E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model)->priv->stamp == iter->stamp, FALSE);
-
-	adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	iter->user_data = GINT_TO_POINTER (GPOINTER_TO_INT (iter->user_data) + 1);
-
-	return (GPOINTER_TO_INT (iter->user_data) < adapter->priv->count);
-}
-
-static gboolean
-adapter_iter_children (GtkTreeModel *tree_model,
-		       GtkTreeIter  *iter,
-		       GtkTreeIter  *parent)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	/* this is a list, nodes have no children */
-	if (parent)
-		return FALSE;
-
-	/* but if parent == NULL we return the list itself as children of the
-	 * "root"
-	 */
-	if (adapter->priv->count) {
-		iter->stamp = adapter->priv->stamp;
-		iter->user_data = GINT_TO_POINTER (0);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-adapter_iter_has_child (GtkTreeModel *tree_model,
-			GtkTreeIter  *iter)
-{
-	return FALSE;
-}
-
-static gint
-adapter_iter_n_children (GtkTreeModel *tree_model,
-			 GtkTreeIter  *iter)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), -1);
-	if (iter == NULL)
-		return adapter->priv->count;
-			
-	g_return_val_if_fail (adapter->priv->stamp == iter->stamp, -1);
-	return 0;
-}
-
-static gboolean
-adapter_iter_nth_child (GtkTreeModel *tree_model,
-			GtkTreeIter  *iter,
-			GtkTreeIter  *parent,
-			gint          n)
-{
-	EAddressbookTreeViewAdapter *adapter = E_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model);
-
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (tree_model), FALSE);
-
-	if (parent)
-		return FALSE;
-
-	if (n < adapter->priv->count) {
-		iter->stamp = adapter->priv->stamp;
-		iter->user_data = GINT_TO_POINTER (n);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-adapter_iter_parent (GtkTreeModel *tree_model,
-		     GtkTreeIter  *iter,
-		     GtkTreeIter  *child)
-{
-	return FALSE;
-}
-
-static void
-adapter_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = adapter_get_flags;
-	iface->get_n_columns = adapter_get_n_columns;
-	iface->get_column_type = adapter_get_column_type;
-	iface->get_iter = adapter_get_iter;
-	iface->get_path = adapter_get_path;
-	iface->get_value = adapter_get_value;
-	iface->iter_next = adapter_iter_next;
-	iface->iter_children = adapter_iter_children;
-	iface->iter_has_child = adapter_iter_has_child;
-	iface->iter_n_children = adapter_iter_n_children;
-	iface->iter_nth_child = adapter_iter_nth_child;
-	iface->iter_parent = adapter_iter_parent;
-}
-
-static gboolean
-adapter_drag_data_delete   (GtkTreeDragSource *drag_source,
-			    GtkTreePath       *path)
-{
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (drag_source), FALSE);
-
-	return FALSE;
-}
-
-static gboolean
-adapter_drag_data_get      (GtkTreeDragSource *drag_source,
-			    GtkTreePath       *path,
-			    GtkSelectionData  *selection_data)
-{
-	g_return_val_if_fail (E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER (drag_source), FALSE);
-
-	/* Note that we don't need to handle the GTK_TREE_MODEL_ROW
-	 * target, because the default handler does it for us, but
-	 * we do anyway for the convenience of someone maybe overriding the
-	 * default handler.
-	 */
-
-	if (gtk_tree_set_row_drag_data (selection_data,
-					GTK_TREE_MODEL (drag_source),
-					path)) {
-		return TRUE;
-	}
-	else {
-		if (selection_data->target == gdk_atom_intern ("text/x-vcard", FALSE)) {
-			printf ("HI THERE\n");
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-adapter_drag_source_init (GtkTreeDragSourceIface *iface)
-{
-	iface->drag_data_delete = adapter_drag_data_delete;
-	iface->drag_data_get = adapter_drag_data_get;
-}
-
-GType
-e_addressbook_treeview_adapter_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo adapter_info =  {
-			sizeof (EAddressbookTreeViewAdapterClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_addressbook_treeview_adapter_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EAddressbookTreeViewAdapter),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_addressbook_treeview_adapter_init,
-		};
-
-		static const GInterfaceInfo tree_model_info = {
-			(GInterfaceInitFunc) adapter_tree_model_init,
-			NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo drag_source_info = {
-			(GInterfaceInitFunc) adapter_drag_source_init,
-			NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EAddressbookTreeViewAdapter", &adapter_info, 0);
-
-		g_type_add_interface_static (type,
-					     GTK_TYPE_TREE_MODEL,
-					     &tree_model_info);
-
-		g_type_add_interface_static (type,
-					     GTK_TYPE_TREE_DRAG_SOURCE,
-					     &drag_source_info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_treeview_adapter_construct (EAddressbookTreeViewAdapter *adapter,
-					  EAddressbookModel *model)
-{
-	EAddressbookTreeViewAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	g_object_ref (priv->model);
-
-	priv->stamp = g_random_int ();
-
-	priv->create_card_id = g_signal_connect(priv->model,
-						"card_added",
-						G_CALLBACK(create_card),
-						adapter);
-	priv->remove_card_id = g_signal_connect(priv->model,
-						"card_removed",
-						G_CALLBACK(remove_card),
-						adapter);
-	priv->modify_card_id = g_signal_connect(priv->model,
-						"card_changed",
-						G_CALLBACK(modify_card),
-						adapter);
-	priv->model_changed_id = g_signal_connect(priv->model,
-						  "model_changed",
-						  G_CALLBACK(model_changed),
-						  adapter);
-
-	build_simple_mapping (adapter);
-}
-
-GtkTreeModel *
-e_addressbook_treeview_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookTreeViewAdapter *et;
-
-	et = g_object_new(E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, NULL);
-
-	e_addressbook_treeview_adapter_construct (et, model);
-
-	return (GtkTreeModel*)et;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.h b/addressbook/gui/widgets/e-addressbook-treeview-adapter.h
deleted file mode 100644
index 2c4370dee3..0000000000
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_TREEVIEW_ADAPTER_H_
-#define _E_ADDRESSBOOK_TREEVIEW_ADAPTER_H_
-
-#include <gtk/gtktreemodel.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_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER        (e_addressbook_treeview_adapter_get_type ())
-#define E_ADDRESSBOOK_TREEVIEW_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, EAddressbookTreeViewAdapter))
-#define E_ADDRESSBOOK_TREEVIEW_ADAPTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER, EAddressbookTreeViewAdapterClass))
-#define E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER))
-#define E_IS_ADDRESSBOOK_TREEVIEW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_TREEVIEW_ADAPTER))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EAddressbookTreeViewAdapter EAddressbookTreeViewAdapter;
-typedef struct _EAddressbookTreeViewAdapterPrivate EAddressbookTreeViewAdapterPrivate;
-typedef struct _EAddressbookTreeViewAdapterClass EAddressbookTreeViewAdapterClass;
-
-struct _EAddressbookTreeViewAdapter {
-	GObject parent;
-
-	EAddressbookTreeViewAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTreeViewAdapterClass {
-	GObjectClass parent_class;
-};
-
-
-GType         e_addressbook_treeview_adapter_get_type (void);
-void          e_addressbook_treeview_adapter_construct (EAddressbookTreeViewAdapter *adapter,
-							EAddressbookModel *model);
-GtkTreeModel *e_addressbook_treeview_adapter_new (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 5303b279be..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,1855 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/util/e-xml-utils.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include <gal/widgets/e-treeview-selection-model.h>
-#include "gal-view-factory-treeview.h"
-#include "gal-view-treeview.h"
-#endif
-#include "gal-view-minicard.h"
-#include "gal-view-factory-minicard.h"
-
-#include "eab-marshal.h"
-#include "e-addressbook-view.h"
-#include "e-addressbook-model.h"
-#include "eab-gui-util.h"
-#include "util/eab-book-util.h"
-#include "e-addressbook-table-adapter.h"
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include "e-addressbook-treeview-adapter.h"
-#endif
-#include "eab-contact-merging.h"
-
-#include "e-contact-editor.h"
-#include <gdk/gdkkeysyms.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
-#define SHOW_ALL_SEARCH "(contains \"x-evolution-any-field\" \"\")"
-
-#define d(x)
-
-static void eab_view_init		(EABView		 *card);
-static void eab_view_class_init	(EABViewClass	 *klass);
-
-static void eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void eab_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-static void eab_view_dispose (GObject *object);
-static void change_view_type (EABView *view, EABViewType view_type);
-
-static void status_message     (GtkObject *object, const gchar *status, EABView *eav);
-static void search_result      (GtkObject *object, EBookViewStatus status, EABView *eav);
-static void folder_bar_message (GtkObject *object, const gchar *status, EABView *eav);
-static void stop_state_changed (GtkObject *object, EABView *eav);
-static void writable_status (GtkObject *object, gboolean writable, EABView *eav);
-static void backend_died (GtkObject *object, EABView *eav);
-static void command_state_change (EABView *eav);
-
-static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,
-				   EABView *view);
-static void selection_received (GtkWidget *invisible, GtkSelectionData *selection_data,
-				guint time, EABView *view);
-static void selection_get (GtkWidget *invisible, GtkSelectionData *selection_data,
-			   guint info, guint time_stamp, EABView *view);
-static void invisible_destroyed (gpointer data, GObject *where_object_was);
-
-#define PARENT_TYPE GTK_TYPE_EVENT_BOX
-static GtkEventBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_TYPE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	SEARCH_RESULT,
-	FOLDER_BAR_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 eab_view_signals [LAST_SIGNAL] = {0, };
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-static GalViewCollection *collection = NULL;
-
-GType
-eab_view_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_view_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_view_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABView", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-eab_view_class_init (EABViewClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = G_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_property = eab_view_set_property;
-	object_class->get_property = eab_view_get_property;
-	object_class->dispose = eab_view_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TYPE, 
-					 g_param_spec_int ("type",
-							   _("Type"),
-							   /*_( */"XXX blurb" /*)*/,
-							   EAB_VIEW_NONE, 
-							   EAB_VIEW_TABLE,
-							   EAB_VIEW_NONE,
-							   G_PARAM_READWRITE));
-
-	eab_view_signals [STATUS_MESSAGE] =
-		g_signal_new ("status_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, status_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_view_signals [SEARCH_RESULT] =
-		g_signal_new ("search_result",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, search_result),
-			      NULL, NULL,
-			      eab_marshal_NONE__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	eab_view_signals [FOLDER_BAR_MESSAGE] =
-		g_signal_new ("folder_bar_message",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, folder_bar_message),
-			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
-			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	eab_view_signals [COMMAND_STATE_CHANGE] =
-		g_signal_new ("command_state_change",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABViewClass, command_state_change),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-static void
-eab_view_init (EABView *eav)
-{
-	eav->view_type = EAB_VIEW_NONE;
-
-	eav->model = NULL;
-	eav->object = NULL;
-	eav->widget = NULL;
-	eav->scrolled = NULL;
-	eav->contact_display = NULL;
-
-	eav->view_instance = NULL;
-	eav->view_menus = NULL;
-	eav->current_view = NULL;
-	eav->uic = NULL;
-
-	eav->book = NULL;
-	eav->query = NULL;
-
-	eav->invisible = NULL;
-	eav->clipboard_contacts = NULL;
-}
-
-static void
-eab_view_dispose (GObject *object)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	if (eav->model) {
-		g_signal_handlers_disconnect_matched (eav->model,
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      object);
-		g_object_unref (eav->model);
-		eav->model = NULL;
-	}
-
-	if (eav->book) {
-		g_object_unref (eav->book);
-		eav->book = NULL;
-	}
-
-	if (eav->query) {
-		g_free(eav->query);
-		eav->query = NULL;
-	}
-
-	eav->uic = NULL;
-
-	if (eav->view_instance) {
-		g_object_unref (eav->view_instance);
-		eav->view_instance = NULL;
-	}
-
-	if (eav->view_menus) {
-		g_object_unref (eav->view_menus);
-		eav->view_menus = NULL;
-	}
-
-	if (eav->clipboard_contacts) {
-		g_list_foreach (eav->clipboard_contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (eav->clipboard_contacts);
-		eav->clipboard_contacts = NULL;
-	}
-		
-	if (eav->invisible) {
-		gtk_widget_destroy (eav->invisible);
-		eav->invisible = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-GtkWidget*
-eab_view_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_AB_VIEW, NULL));
-	EABView *eav = EAB_VIEW (widget);
-
-	/* create our model */
-	eav->model = eab_model_new ();
-
-	g_signal_connect (eav->model, "status_message",
-			  G_CALLBACK (status_message), eav);
-	g_signal_connect (eav->model, "search_result",
-			  G_CALLBACK (search_result), eav);
-	g_signal_connect (eav->model, "folder_bar_message",
-			  G_CALLBACK (folder_bar_message), eav);
-	g_signal_connect (eav->model, "stop_state_changed",
-			  G_CALLBACK (stop_state_changed), eav);
-	g_signal_connect (eav->model, "writable_status",
-			  G_CALLBACK (writable_status), eav);
-	g_signal_connect (eav->model, "backend_died",
-			  G_CALLBACK (backend_died), eav);
-
-	eav->editable = FALSE;
-	eav->query = g_strdup (SHOW_ALL_SEARCH);
-
-	/* create the paned window and contact display */
-	eav->paned = gtk_vpaned_new ();
-	gtk_container_add (GTK_CONTAINER (eav), eav->paned);
-
-	eav->widget = gtk_label_new ("empty label here");
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->widget);
-	gtk_widget_show (eav->widget);
-
-	eav->scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (eav->scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (eav->scrolled), GTK_SHADOW_IN);
-	eav->contact_display = eab_contact_display_new ();
-
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (eav->scrolled), eav->contact_display);
-	gtk_widget_show (eav->contact_display);
-
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->scrolled);
-	gtk_widget_show (eav->scrolled);
-	gtk_widget_show (eav->paned);
-
-	/* XXX hack */
-	gtk_paned_set_position (GTK_PANED (eav->paned), 144);
-
-	/* gtk selection crap */
-	eav->invisible = gtk_invisible_new ();
-
-	gtk_selection_add_target (eav->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-		
-	g_signal_connect (eav->invisible, "selection_get",
-			  G_CALLBACK (selection_get), 
-			  eav);
-	g_signal_connect (eav->invisible, "selection_clear_event",
-			  G_CALLBACK (selection_clear_event),
-			  eav);
-	g_signal_connect (eav->invisible, "selection_received",
-			  G_CALLBACK (selection_received),
-			  eav);
-	g_object_weak_ref (G_OBJECT (eav->invisible), invisible_destroyed, eav);
-
-	return widget;
-}
-
-static void
-writable_status (GtkObject *object, gboolean writable, EABView *eav)
-{
-	eav->editable = writable;
-	command_state_change (eav);
-}
-
-static void
-init_collection (void)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new();
-
-		gal_view_collection_set_title (collection, _("Addressbook"));
-
-		galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
-		gal_view_collection_set_storage_directories
-			(collection,
-			 EVOLUTION_GALVIEWSDIR "/addressbook/",
-			 galview);
-		g_free(galview);
-
-		spec = e_table_specification_new();
-		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec");
-
-		factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-		factory = gal_view_factory_minicard_new();
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-		factory = gal_view_factory_treeview_new ();
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-#endif
-
-		gal_view_collection_load(collection);
-	}
-}
-
-static void
-display_view(GalViewInstance *instance,
-	     GalView *view,
-	     gpointer data)
-{
-	EABView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, EAB_VIEW_TABLE);
-		gal_view_etable_attach_table (GAL_VIEW_ETABLE(view), e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)));
-	}
-	else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, EAB_VIEW_MINICARD);
-		gal_view_minicard_attach (GAL_VIEW_MINICARD (view), E_MINICARD_VIEW_WIDGET (address_view->object));
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (GAL_IS_VIEW_TREEVIEW (view)) {
-		change_view_type (address_view, EAB_VIEW_TREEVIEW);
-		gal_view_treeview_attach (GAL_VIEW_TREEVIEW(view), GTK_TREE_VIEW (address_view->object));
-	}
-#endif
-	address_view->current_view = view;
-}
-
-static void
-setup_menus (EABView *view)
-{
-	if (view->book && view->view_instance == NULL) {
-		init_collection ();
-		view->view_instance = gal_view_instance_new (collection, e_book_get_uri (view->book));
-	}
-
-	if (view->view_instance && view->uic) {
-		view->view_menus = gal_view_menus_new(view->view_instance);
-		gal_view_menus_apply(view->view_menus, view->uic, NULL);
-
-		display_view (view->view_instance, gal_view_instance_get_current_view (view->view_instance), view);
-
-		g_signal_connect(view->view_instance, "display_view",
-				 G_CALLBACK (display_view), view);
-	}
-}
-
-static void
-eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	switch (prop_id){
-	case PROP_BOOK:
-		if (eav->book) {
-			g_object_unref (eav->book);
-		}
-		if (g_value_get_object (value)) {
-			eav->book = E_BOOK(g_value_get_object (value));
-			g_object_ref (eav->book);
-		}
-		else
-			eav->book = NULL;
-
-		if (eav->view_instance) {
-			g_object_unref (eav->view_instance);
-			eav->view_instance = NULL;
-		}
-
-		g_object_set(eav->model,
-			     "book", eav->book,
-			     NULL);
-
-		setup_menus (eav);
-
-		break;
-	case PROP_QUERY:
-#if 0 /* This code will mess up ldap a bit.  We need to think about the ramifications of this more. */
-		if ((g_value_get_string (value) == NULL && !strcmp (eav->query, SHOW_ALL_SEARCH)) ||
-		    (g_value_get_string (value) != NULL && !strcmp (eav->query, g_value_get_string (value))))
-			break;
-#endif
-		g_free(eav->query);
-		eav->query = g_strdup(g_value_get_string (value));
-		if (!eav->query)
-			eav->query = g_strdup (SHOW_ALL_SEARCH);
-		g_object_set(eav->model,
-			     "query", eav->query,
-			     NULL);
-		break;
-	case PROP_TYPE:
-		change_view_type(eav, g_value_get_int (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-eab_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EABView *eav = EAB_VIEW(object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		if (eav->book)
-			g_value_set_object (value, eav->book);
-		else
-			g_value_set_object (value, NULL);
-		break;
-	case PROP_QUERY:
-		g_value_set_string (value, eav->query);
-		break;
-	case PROP_TYPE:
-		g_value_set_int (value, eav->view_type);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static ESelectionModel*
-get_selection_model (EABView *view)
-{
-	if (view->view_type == EAB_VIEW_TABLE)
-		return e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(view->widget)));
-	else if (view->view_type == EAB_VIEW_MINICARD)
-		return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view->object));
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW)
-		return e_treeview_get_selection_model (GTK_TREE_VIEW (view->object));
-#endif
-	g_return_val_if_reached (NULL);
-}
-
-/* Popup menu stuff */
-typedef struct {
-	EABView *view;
-	EPopupMenu *submenu;
-	gpointer closure;
-} ContactAndBook;
-
-static ESelectionModel*
-contact_and_book_get_selection_model (ContactAndBook *contact_and_book)
-{
-	return get_selection_model (contact_and_book->view);
-}
-
-static void
-contact_and_book_free (ContactAndBook *contact_and_book)
-{
-	EABView *view = contact_and_book->view;
-	ESelectionModel *selection;
-
-	if (contact_and_book->submenu)
-		gal_view_instance_free_popup_menu (view->view_instance,
-						   contact_and_book->submenu);
-
-	selection = contact_and_book_get_selection_model (contact_and_book);
-	if (selection)
-		e_selection_model_right_click_up(selection);
-
-	g_object_unref (view);
-}
-
-static void
-get_contact_list_1(gint model_row,
-		   gpointer closure)
-{
-	ContactAndBook *contact_and_book;
-	GList **list;
-	EABView *view;
-	EContact *contact;
-
-	contact_and_book = closure;
-	list = contact_and_book->closure;
-	view = contact_and_book->view;
-
-	contact = eab_model_get_contact(view->model, model_row);
-	*list = g_list_prepend(*list, contact);
-}
-
-static GList *
-get_contact_list (ContactAndBook *contact_and_book)
-{
-	GList *list = NULL;
-	ESelectionModel *selection;
-
-	selection = contact_and_book_get_selection_model (contact_and_book);
-
-	if (selection) {
-		contact_and_book->closure = &list;
-		e_selection_model_foreach (selection, get_contact_list_1, contact_and_book);
-	}
-
-	return list;
-}
-
-static void
-has_email_address_1(gint model_row,
-			  gpointer closure)
-{
-	ContactAndBook *contact_and_book;
-	gboolean *has_email;
-	EABView *view;
-	const EContact *contact;
-	GList *email;
-
-	contact_and_book = closure;
-	has_email = contact_and_book->closure;
-	view = contact_and_book->view;
-
-	if (*has_email)
-		return;
-
-	contact = eab_model_contact_at(view->model, model_row);
-
-	email = e_contact_get (E_CONTACT (contact), E_CONTACT_EMAIL);
-
-	if (g_list_length (email) > 0)
-		*has_email = TRUE;
-
-	g_list_foreach (email, (GFunc)g_free, NULL);
-	g_list_free (email);
-}
-
-static gboolean
-get_has_email_address (ContactAndBook *contact_and_book)
-{
-	ESelectionModel *selection;
-	gboolean has_email = FALSE;
-
-	selection = contact_and_book_get_selection_model (contact_and_book);
-
-	if (selection) {
-		contact_and_book->closure = &has_email;
-		e_selection_model_foreach (selection, has_email_address_1, contact_and_book);
-	}
-
-	return has_email;
-}
-
-static void
-save_as (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	GList *contacts = get_contact_list (contact_and_book);
-	if (contacts) {
-		eab_contact_list_save(_("Save as VCard"), contacts, NULL);
-		e_free_object_list(contacts);
-	}
-}
-
-static void
-send_as (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	GList *contacts = get_contact_list (contact_and_book);
-	if (contacts) {
-		eab_send_contact_list(contacts, EAB_DISPOSITION_AS_ATTACHMENT);
-		e_free_object_list(contacts);
-	}
-}
-
-static void
-send_to (GtkWidget *widget, ContactAndBook *contact_and_book)
-
-{
-	GList *contacts = get_contact_list (contact_and_book);
-
-	if (contacts) {
-		eab_send_contact_list(contacts, EAB_DISPOSITION_AS_TO);
-		e_free_object_list(contacts);
-	}
-}
-
-static void
-print (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	GList *contacts = get_contact_list (contact_and_book);
-	if (contacts) {
-		if (contacts->next)
-			gtk_widget_show(e_contact_print_contact_list_dialog_new(contacts));
-		else
-			gtk_widget_show(e_contact_print_contact_dialog_new(contacts->data));
-		e_free_object_list(contacts);
-	}
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-static void
-print_envelope (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	GList *cards = get_card_list (contact_and_book);
-	if (cards) {
-		gtk_widget_show(e_contact_list_print_envelope_dialog_new(contact_and_book->card));
-		e_free_object_list(cards);
-	}
-}
-#endif
-
-static void
-copy (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	eab_view_copy (contact_and_book->view);
-}
-
-static void
-paste (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	eab_view_paste (contact_and_book->view);
-}
-
-static void
-cut (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	eab_view_cut (contact_and_book->view);
-}
-
-static void
-delete (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(contact_and_book->view->widget)))) {
-		EBook *book;
-		GList *list = get_contact_list(contact_and_book);
-		GList *iterator;
-		gboolean bulk_remove = FALSE;
-
-		bulk_remove = e_book_check_static_capability (contact_and_book->view->model->book,
-							      "bulk-remove");
-
-		g_object_get(contact_and_book->view->model,
-			     "book", &book,
-			     NULL);
-
-		if (bulk_remove) {
-			GList *ids = NULL;
-
-			for (iterator = list; iterator; iterator = iterator->next) {
-				EContact *contact = iterator->data;
-				ids = g_list_prepend (ids, (char*)e_contact_get_const (contact, E_CONTACT_UID));
-			}
-
-			/* Remove the cards all at once. */
-			/* XXX no callback specified... ugh */
-			e_book_async_remove_contacts (book,
-						      ids,
-						      NULL,
-						      NULL);
-			
-			g_list_free (ids);
-		}
-		else {
-			for (iterator = list; iterator; iterator = iterator->next) {
-				EContact *contact = iterator->data;
-				/* Remove the card. */
-				/* XXX no callback specified... ugh */
-				e_book_async_remove_contact (book,
-							     e_contact_get_const (contact, E_CONTACT_UID),
-							     NULL,
-							     NULL);
-			}
-		}
-		e_free_object_list(list);
-		g_object_unref(book);
-	}
-}
-
-static void
-copy_to_folder (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	eab_view_copy_to_folder (contact_and_book->view);
-}
-
-static void
-move_to_folder (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	eab_view_move_to_folder (contact_and_book->view);
-}
-
-static void
-free_popup_info (GtkWidget *w, ContactAndBook *contact_and_book)
-{
-	contact_and_book_free (contact_and_book);
-}
-
-static void
-new_card (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	EBook *book;
-	EContact *contact = e_contact_new();
-
-	g_object_get(contact_and_book->view->model,
-		     "book", &book,
-		     NULL);
-
-	eab_show_contact_editor (book, contact, TRUE, TRUE);
-	g_object_unref (book);
-	g_object_unref (contact);
-}
-
-static void
-new_list (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	EBook *book;
-	EContact *contact = e_contact_new ();
-
-	g_object_get(contact_and_book->view->model,
-		     "book", &book,
-		     NULL);
-	eab_show_contact_list_editor (book, contact, TRUE, TRUE);
-	g_object_unref(book);
-	g_object_unref(contact);
-}
-
-#if 0
-static void
-sources (GtkWidget *widget, ContactAndBook *contact_and_book)
-{
-	BonoboControl *control;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control = g_object_get_data (G_OBJECT (gcal), "control");
-	if (control == NULL)
-		return;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_ShellView_showSettings (shell_view, &ev);
-	
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_show_settings(): Could not show settings");
-
-	CORBA_exception_free (&ev);
-}
-#endif
-
-#define POPUP_READONLY_MASK 0x1
-#define POPUP_NOSELECTION_MASK 0x2
-#define POPUP_NOEMAIL_MASK 0x4
-
-static void
-do_popup_menu(EABView *view, GdkEvent *event)
-{
-	ContactAndBook *contact_and_book;
-	GtkMenu *popup;
-	EPopupMenu *submenu = NULL;
-	ESelectionModel *selection_model;
-	gboolean selection = FALSE;
-
-	EPopupMenu menu[] = {
-		E_POPUP_ITEM (N_("New Contact..."), G_CALLBACK(new_card), POPUP_READONLY_MASK),
-		E_POPUP_ITEM (N_("New Contact List..."), G_CALLBACK(new_list), POPUP_READONLY_MASK),
-		E_POPUP_SEPARATOR,
-#if 0
-		E_POPUP_ITEM (N_("Go to Folder..."), G_CALLBACK (goto_folder), 0),
-		E_POPUP_ITEM (N_("Import..."), G_CALLBACK (import), POPUP_READONLY_MASK),
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Search for Contacts..."), G_CALLBACK (search), 0),
-		E_POPUP_ITEM (N_("Addressbook Sources..."), G_CALLBACK (sources), 0),
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Pilot Settings..."), G_CALLBACK (pilot_settings), 0),
-#endif
-		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Save as VCard"), G_CALLBACK(save_as), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Forward Contact"), G_CALLBACK(send_as), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Send Message to Contact"), G_CALLBACK(send_to), POPUP_NOSELECTION_MASK | POPUP_NOEMAIL_MASK),
-		E_POPUP_ITEM (N_("Print"), G_CALLBACK(print), POPUP_NOSELECTION_MASK),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-		E_POPUP_ITEM (N_("Print Envelope"), G_CALLBACK(print_envelope), POPUP_NOSELECTION_MASK),
-#endif
-		E_POPUP_SEPARATOR,
-
-		E_POPUP_ITEM (N_("Copy to folder..."), G_CALLBACK(copy_to_folder), POPUP_NOSELECTION_MASK), 
-		E_POPUP_ITEM (N_("Move to folder..."), G_CALLBACK(move_to_folder), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_SEPARATOR,
-
-		E_POPUP_ITEM (N_("Cut"), G_CALLBACK (cut), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Copy"), G_CALLBACK (copy), POPUP_NOSELECTION_MASK),
-		E_POPUP_ITEM (N_("Paste"), G_CALLBACK (paste), POPUP_READONLY_MASK),
-		E_POPUP_ITEM (N_("Delete"), G_CALLBACK(delete), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),
-		E_POPUP_SEPARATOR,
-
-#if 0
-		E_POPUP_SUBMENU (N_("Current View"), submenu = gal_view_instance_get_popup_menu (view->view_instance), 0),
-#endif
-		E_POPUP_TERMINATOR
-	};
-
-	contact_and_book = g_new(ContactAndBook, 1);
-	contact_and_book->view = view;
-	contact_and_book->submenu = submenu;
-
-	g_object_ref (contact_and_book->view);
-
-	selection_model = contact_and_book_get_selection_model (contact_and_book);
-	if (selection_model)
-		selection = e_selection_model_selected_count (selection_model) > 0;
-
-	popup = e_popup_menu_create (menu,
-				     0,
-				     (eab_model_editable (view->model) ? 0 : POPUP_READONLY_MASK) +
-				     (selection ? 0 : POPUP_NOSELECTION_MASK) +
-				     (get_has_email_address (contact_and_book) ? 0 : POPUP_NOEMAIL_MASK),
-				     contact_and_book);
-
-	g_signal_connect (popup, "selection-done",
-			  G_CALLBACK (free_popup_info), contact_and_book);
-	e_popup_menu (popup, event);
-
-}
-
-static void
-render_contact (int row, EABView *view)
-{
-	EContact *contact = eab_model_get_contact (view->model, row);
-
-	eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), contact,
-				    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-}
-
-static void
-selection_changed (GObject *o, EABView *view)
-{
-	ESelectionModel *selection_model;
-
-	command_state_change (view);
-
-	selection_model = get_selection_model (view);
-
-	if (e_selection_model_selected_count (selection_model) == 1)
-		e_selection_model_foreach (selection_model,
-					   (EForeachFunc)render_contact, view);
-	else
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), NULL,
-					    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-					    
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EABView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EABModel *model = view->model;
-		EContact *contact = eab_model_get_contact (model, row);
-		EBook *book;
-
-		g_object_get(model,
-			     "book", &book,
-			     NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			eab_show_contact_list_editor (book, contact, FALSE, view->editable);
-		else
-			eab_show_contact_editor (book, contact, FALSE, view->editable);
-
-		g_object_unref (book);
-		g_object_unref (contact);
-	}
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EABView *view)
-{
-	do_popup_menu(view, event);
-	return TRUE;
-}
-
-static gint
-table_white_space_event(ETableScrolled *table, GdkEvent *event, EABView *view)
-{
-	if (event->type == GDK_BUTTON_PRESS && ((GdkEventButton *)event)->button == 3) {
-		do_popup_menu(view, event);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-static void
-table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     gpointer            user_data)
-{
-	EABView *view = user_data;
-
-	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD: {
-		char *value;
-
-		value = e_vcard_to_string (E_VCARD (view->model->data[row]), EVC_FORMAT_VCARD_30);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-}
-
-static void
-emit_status_message (EABView *eav, const gchar *status)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [STATUS_MESSAGE], 0,
-		       status);
-}
-
-static void
-emit_search_result (EABView *eav, EBookViewStatus status)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [SEARCH_RESULT], 0,
-		       status);
-}
-
-static void
-emit_folder_bar_message (EABView *eav, const gchar *message)
-{
-	g_signal_emit (eav,
-		       eab_view_signals [FOLDER_BAR_MESSAGE], 0,
-		       message);
-}
-
-static void
-status_message (GtkObject *object, const gchar *status, EABView *eav)
-{
-	emit_status_message (eav, status);
-}
-
-static void
-search_result (GtkObject *object, EBookViewStatus status, EABView *eav)
-{
-	emit_search_result (eav, status);
-}
-
-static void
-folder_bar_message (GtkObject *object, const gchar *status, EABView *eav)
-{
-	emit_folder_bar_message (eav, status);
-}
-
-static void
-stop_state_changed (GtkObject *object, EABView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-command_state_change (EABView *eav)
-{
-	/* Reffing during emission is unnecessary.  Gtk automatically refs during an emission. */
-	g_signal_emit (eav, eab_view_signals [COMMAND_STATE_CHANGE], 0);
-}
-
-static void
-backend_died (GtkObject *object, EABView *eav)
-{
-	char *message = g_strdup_printf (_("The addressbook backend for\n%s\nhas crashed. "
-					   "You will have to restart Evolution in order "
-					   "to use it again"),
-					 e_book_get_uri (eav->book));
-        gnome_error_dialog_parented (message, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (eav))));
-        g_free (message);
-}
-
-static void
-minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EABView *view)
-{
-       do_popup_menu(view, event);
-}
-
-static void
-create_minicard_view (EABView *view)
-{
-	GtkWidget *scrolled_window;
-	GtkWidget *minicard_view;
-	EAddressbookReflowAdapter *adapter;
-
-	adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view->model));
-	minicard_view = e_minicard_view_widget_new(adapter);
-
-	g_signal_connect(minicard_view, "selection_change",
-			 G_CALLBACK(selection_changed), view);
-
-	g_signal_connect(minicard_view, "right_click",
-			 G_CALLBACK(minicard_right_click), view);
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-
-	view->object = G_OBJECT(minicard_view);
-	view->widget = scrolled_window;
-
-	gtk_container_add (GTK_CONTAINER (scrolled_window), minicard_view);
-	gtk_widget_show (minicard_view);
-
-	gtk_widget_show_all( GTK_WIDGET(scrolled_window) );
-
-	gtk_paned_add1 (GTK_PANED (view->paned), scrolled_window);
-
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-create_table_view (EABView *view)
-{
-	ETableModel *adapter;
-	GtkWidget *table;
-	
-	adapter = eab_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_from_spec_file (adapter, NULL, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec", NULL);
-
-	view->object = G_OBJECT(adapter);
-	view->widget = table;
-
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "double_click",
-			 G_CALLBACK(table_double_click), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "right_click",
-			 G_CALLBACK(table_right_click), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "white_space_event",
-			 G_CALLBACK(table_white_space_event), view);
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "selection_change",
-			 G_CALLBACK(selection_changed), 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);
-	
-	g_signal_connect (E_TABLE_SCROLLED(table)->table,
-			  "table_drag_data_get",
-			  G_CALLBACK (table_drag_data_get),
-			  view);
-
-	gtk_paned_add1 (GTK_PANED (view->paned), table);
-
-	gtk_widget_show( GTK_WIDGET(table) );
-}
-
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-static void
-treeview_row_activated(GtkTreeView *treeview,
-		       GtkTreePath *path, GtkTreeViewColumn *column,
-		       EABView *view)
-{
-	EABModel *model = view->model;
-	int row = gtk_tree_path_get_indices (path)[0];
-	ECard *card = eab_model_get_card(model, row);
-	EBook *book;
-
-	g_object_get(model,
-		     "book", &book,
-		     NULL);
-		
-	g_assert (E_IS_BOOK (book));
-
-	if (e_card_evolution_list (card))
-		eab_show_contact_list_editor (book, card, FALSE, view->editable);
-	else
-		eab_show_contact_editor (book, card, FALSE, view->editable);
-
-	g_object_unref (book);
-	g_object_unref (card);
-}
-
-static void
-create_treeview_view (EABView *view)
-{
-	GtkTreeModel *adapter;
-	ECardSimple *simple;
-	GtkWidget *treeview;
-	GtkWidget *scrolled;
-	int i;
-
-	simple = e_card_simple_new(NULL);
-
-	adapter = eab_treeview_adapter_new(view->model);
-
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN);
-	treeview = gtk_tree_view_new_with_model (adapter);
-
-	gtk_widget_show (treeview);
-
-	gtk_container_add (GTK_CONTAINER (scrolled), treeview);
-
-	for (i = 0; i < 15; i ++) {
-		GtkTreeViewColumn *column =
-			gtk_tree_view_column_new_with_attributes (e_card_simple_get_name (simple, i),
-								  gtk_cell_renderer_text_new (),
-								  "text", i,
-								  NULL);
-
-		gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-	}
-
-	view->object = G_OBJECT(treeview);
-	view->widget = scrolled;
-
-	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);
-	gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (treeview), 
-						GDK_BUTTON1_MASK,
-						drag_types,
-						num_drag_types,
-						GDK_ACTION_MOVE);
-
-	g_signal_connect(treeview, "row_activated",
-			 G_CALLBACK (treeview_row_activated), view);
-#if 0
-	g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "right_click",
-			 G_CALLBACK(table_right_click), 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);
-	
-	g_signal_connect (E_TABLE_SCROLLED(table)->table,
-			  "table_drag_data_get",
-			  G_CALLBACK (table_drag_data_get),
-			  view);
-#endif
-
-
-	g_signal_connect(e_treeview_get_selection_model (GTK_TREE_VIEW (treeview)), "selection_changed",
-			 G_CALLBACK(selection_changed), view);
-
-	gtk_paned_add1 (GTK_PANED (view->paned), scrolled);
-
-	gtk_widget_show( GTK_WIDGET(scrolled) );
-
-	g_object_unref (simple);
-}
-#endif
-
-static void
-change_view_type (EABView *view, EABViewType view_type)
-{
-	if (view_type == view->view_type)
-		return;
-
-	if (view->widget) {
-		gtk_container_remove (GTK_CONTAINER (view->paned), view->widget);
-		view->widget = NULL;
-	}
-	view->object = NULL;
-
-	switch (view_type) {
-	case EAB_VIEW_TABLE:
-		create_table_view (view);
-		break;
-	case EAB_VIEW_MINICARD:
-		create_minicard_view (view);
-		break;
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	case EAB_VIEW_TREEVIEW:
-		create_treeview_view (view);
-		break;
-#endif
-	default:
-		g_warning ("view_type not recognized.");
-		return;
-	}
-
-	view->view_type = view_type;
-
-	command_state_change (view);
-}
-
-typedef struct {
-	GtkWidget *table;
-	GObject *printable;
-} EContactPrintDialogWeakData;
-
-static void
-e_contact_print_destroy(gpointer data, GObject *where_object_was)
-{
-	EContactPrintDialogWeakData *weak_data = data;
-	g_object_unref (weak_data->printable);
-	g_object_unref (weak_data->table);
-	g_free (weak_data);
-}
-
-static void
-e_contact_print_button(GtkDialog *dialog, gint response, gpointer data)
-{
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = g_object_get_data(G_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( response ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		master = gnome_print_job_new(gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
-		pc = gnome_print_job_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_job_close(master);
-		gnome_print_job_print(master);
-		g_object_unref (master);
-		gtk_widget_destroy((GtkWidget *)dialog);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		master = gnome_print_job_new (gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
-		pc = gnome_print_job_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_job_close(master);
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		g_object_unref (master);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-	default:
-		gtk_widget_destroy((GtkWidget *)dialog);
-		break;
-	}
-}
-
-void
-eab_view_setup_menus (EABView *view,
-				BonoboUIComponent *uic)
-{
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	init_collection ();
-
-	view->uic = uic;
-
-	setup_menus (view);
-}
-
-/**
- * eab_view_discard_menus:
- * @view: An addressbook view.
- * 
- * Makes an addressbook view discard its GAL view menus and its views instance
- * objects.  This should be called when the corresponding Bonobo component is
- * deactivated.
- **/
-void
-eab_view_discard_menus (EABView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (view->view_instance);
-
-	if (view->view_menus) {
-		gal_view_menus_unmerge (view->view_menus, NULL);
-
-		g_object_unref (view->view_menus);
-		view->view_menus = NULL;
-	}
-
-	if (view->view_instance) {
-		g_object_unref (view->view_instance);
-		view->view_instance = NULL;
-	}
-
-	view->uic = NULL;
-}
-
-void
-eab_view_print(EABView *view)
-{
-	if (view->view_type == EAB_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		g_object_get (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 == EAB_VIEW_TABLE) {
-		GtkWidget *dialog;
-		EPrintable *printable;
-		ETable *etable;
-		EContactPrintDialogWeakData *weak_data;
-
-		dialog = gnome_print_dialog_new(NULL, "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);
-
-		g_object_get(view->widget, "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-		g_object_unref(etable);
-		g_object_ref (view->widget);
-
-		g_object_set_data (G_OBJECT (dialog), "table", view->widget);
-		g_object_set_data (G_OBJECT (dialog), "printable", printable);
-		
-		g_signal_connect(dialog,
-				 "response", G_CALLBACK(e_contact_print_button), NULL);
-
-		weak_data = g_new (EContactPrintDialogWeakData, 1);
-
-		weak_data->table = view->widget;
-		weak_data->printable = G_OBJECT (printable);
-
-		g_object_weak_ref (G_OBJECT (dialog), e_contact_print_destroy, weak_data);
-
-		gtk_widget_show(dialog);
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW) {
-		/* XXX */
-	}
-#endif
-}
-
-void
-eab_view_print_preview(EABView *view)
-{
-	if (view->view_type == EAB_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-
-		g_object_get (view->model,
-			      "query", &query,
-			      "book", &book,
-			      NULL);
-		e_contact_print_preview(book, query);
-		g_free(query);
-	}
-	else if (view->view_type == EAB_VIEW_TABLE) {
-		EPrintable *printable;
-		ETable *etable;
-		GnomePrintJob *master;
-		GnomePrintContext *pc;
-		GnomePrintConfig *config;
-		GtkWidget *preview;
-
-		g_object_get(view->widget, "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-		g_object_unref(etable);
-
-		master = gnome_print_job_new(NULL);
-		config = gnome_print_job_get_config (master);
-		gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1);
-		pc = gnome_print_job_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_job_close(master);
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		g_object_unref (master);
-		g_object_unref (printable);
-	}
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	else if (view->view_type == EAB_VIEW_TREEVIEW) {
-		/* XXX */
-	}
-#endif
-}
-
-void
-eab_view_delete_selection(EABView *view)
-{
-	ContactAndBook contact_and_book;
-
-	memset (&contact_and_book, 0, sizeof (contact_and_book));
-	contact_and_book.view = view;
-
-	delete (GTK_WIDGET (view), &contact_and_book);
-}
-
-static void
-invisible_destroyed (gpointer data, GObject *where_object_was)
-{
-	EABView *view = data;
-	view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EABView *view)
-{
-	char *value;
-
-	value = eab_contact_list_to_string (view->clipboard_contacts);
-
-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-				8, value, strlen (value));
-				
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EABView *view)
-{
-	if (view->clipboard_contacts) {
-		g_list_foreach (view->clipboard_contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (view->clipboard_contacts);
-		view->clipboard_contacts = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EABView *view)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-	else {
-		/* XXX make sure selection_data->data = \0 terminated */
-		GList *contact_list = eab_contact_list_from_string (selection_data->data);
-		GList *l;
-		
-		for (l = contact_list; l; l = l->next) {
-			EContact *contact = l->data;
-
-			/* XXX NULL for a callback /sigh */
-			eab_merging_book_add_contact (view->book, contact, NULL /* XXX */, NULL);
-		}
-
-		g_list_foreach (contact_list, (GFunc)g_object_unref, NULL);
-		g_list_free (contact_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_contacts (EABView *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 = eab_model_get_contact (view->model, GPOINTER_TO_INT (iterator->data));
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-void
-eab_view_save_as (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_contact_list_save (_("Save as VCard"), list, NULL);
-	e_free_object_list(list);
-}
-
-void
-eab_view_view (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	eab_show_multiple_contacts (view->book, list, view->editable);
-	e_free_object_list(list);
-}
-
-void
-eab_view_send (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_send_contact_list (list, EAB_DISPOSITION_AS_ATTACHMENT);
-	e_free_object_list(list);
-}
-
-void
-eab_view_send_to (EABView *view)
-{
-	GList *list = get_selected_contacts (view);
-	if (list)
-		eab_send_contact_list (list, EAB_DISPOSITION_AS_TO);
-	e_free_object_list(list);
-}
-
-void
-eab_view_cut (EABView *view)
-{
-	eab_view_copy (view);
-	eab_view_delete_selection (view);
-}
-
-void
-eab_view_copy (EABView *view)
-{
-	view->clipboard_contacts = get_selected_contacts (view);
-
-	gtk_selection_owner_set (view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-eab_view_paste (EABView *view)
-{
-	gtk_selection_convert (view->invisible, clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-void
-eab_view_select_all (EABView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_select_all (model);
-}
-
-void
-eab_view_show_all(EABView *view)
-{
-	g_object_set(view,
-		     "query", NULL,
-		     NULL);
-}
-
-void
-eab_view_stop(EABView *view)
-{
-	if (view)
-		eab_model_stop (view->model);
-}
-
-static void
-view_transfer_contacts (EABView *view, gboolean delete_from_source)
-{
-	EBook *book;
-	GList *contacts;
-	GtkWindow *parent_window;
-
-	g_object_get(view->model, 
-		     "book", &book,
-		     NULL);
-	contacts = get_selected_contacts (view);
-	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
-
-	eab_transfer_contacts (book, contacts, delete_from_source, parent_window);
-	g_object_unref(book);
-}
-
-void
-eab_view_copy_to_folder (EABView *view)
-{
-	view_transfer_contacts (view, FALSE);
-}
-
-void
-eab_view_move_to_folder (EABView *view)
-{
-	view_transfer_contacts (view, TRUE);
-}
-
-
-static gboolean
-eab_view_selection_nonempty (EABView  *view)
-{
-	ESelectionModel *selection_model;
-
-	selection_model = get_selection_model (view);
-	if (selection_model == NULL)
-		return FALSE;
-
-	return e_selection_model_selected_count (selection_model) != 0;
-}
-
-gboolean
-eab_view_can_create (EABView  *view)
-{
-	return view ? eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_print (EABView  *view)
-{
-	return view && view->model ? eab_model_contact_count (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_save_as (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_view (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean 
-eab_view_can_send (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean   
-eab_view_can_send_to (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_delete (EABView  *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_cut (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_copy (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_paste (EABView *view)
-{
-	return view ? eab_model_editable (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_select_all (EABView *view)
-{
-	return view ? eab_model_contact_count (view->model) != 0 : FALSE;
-}
-
-gboolean
-eab_view_can_stop (EABView  *view)
-{
-	return view ? eab_model_can_stop (view->model) : FALSE;
-}
-
-gboolean
-eab_view_can_copy_to_folder (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-eab_view_can_move_to_folder (EABView *view)
-{
-	return view ? eab_view_selection_nonempty (view) && eab_model_editable (view->model) : FALSE;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec
deleted file mode 100644
index 84f9ad44b8..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.etspec
+++ /dev/null
@@ -1,58 +0,0 @@
-<ETableSpecification draw-grid="true">
-  <ETableColumn model_col= "2" _title="File As"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "3" _title="Full Name"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "4" _title="Given Name"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "5" _title="Family Name"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Nickname"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col= "7" _title="Email"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "8" _title="Email 2"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Email 3"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col= "14" _title="Assistant Phone"  expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "15" _title="Business Phone"   expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "16" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="17" _title="Business Fax"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="18" _title="Callback Phone"    expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="19" _title="Car Phone"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="20" _title="Company Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="21" _title="Home Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="22" _title="Home Phone 2"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="23" _title="Home Fax"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="24" _title="ISDN Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="25" _title="Mobile Phone"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="26" _title="Other Phone"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="27" _title="Other Fax"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="28" _title="Pager"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="29" _title="Primary Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="30" _title="Radio"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="31" _title="Telex"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="32" _title="TTYTDD"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="33" _title="Organization"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="34" _title="Unit"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="35" _title="Office"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="36" _title="Title"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="37" _title="Role"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="38" _title="Manager"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="39" _title="Assistant"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="40" _title="Web Site"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="41" _title="Journal"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="42" _title="Categories"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableColumn model_col="46" _title="Spouse"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="47" _title="Note"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-
-  <ETableState>
-    <column source="0"/>
-    <column source="1"/>
-    <column source="5"/>
-    <column source="23"/>
-    <column source="36"/>
-    <grouping>
-      <leaf column="0" ascending="true"/>
-    </grouping>
-  </ETableState>
-</ETableSpecification>
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index f819704550..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __EAB_VIEW_H__
-#define __EAB_VIEW_H__
-
-#include <gtk/gtkeventbox.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-instance.h>
-#include <libebook/e-book.h>
-#include "e-addressbook-model.h"
-#include "eab-contact-display.h"
-#include "widgets/menus/gal-view-menus.h"
-
-G_BEGIN_DECLS
-
-/* EABView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TYPE_AB_VIEW                          (eab_view_get_type ())
-#define EAB_VIEW(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_AB_VIEW, EABView))
-#define EAB_VIEW_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_AB_VIEW, EABViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_AB_VIEW))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_AB_VIEW))
-
-typedef enum {
-	EAB_VIEW_NONE, /* initialized to this */
-	EAB_VIEW_MINICARD,
-	EAB_VIEW_TABLE,
-#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-	,EAB_VIEW_TREEVIEW
-#endif
-} EABViewType;
-
-
-typedef struct _EABView       EABView;
-typedef struct _EABViewClass  EABViewClass;
-
-struct _EABView
-{
-	GtkEventBox parent;
-	
-	/* item specific fields */
-	EABViewType view_type;
-
-	EABModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_contacts;
-
-	EBook *book;
-	char  *query;
-	guint editable : 1;
-
-	GObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *scrolled;
-	GtkWidget *contact_display;
-	GtkWidget *paned;
-
-	/* Menus handler and the view instance */
-	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
-	GalView *current_view;
-	BonoboUIComponent *uic;
-};
-
-struct _EABViewClass
-{
-	GtkEventBoxClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message)        (EABView *view, const gchar *message);
-	void (*search_result)         (EABView *view, EBookViewStatus status);
-	void (*folder_bar_message)    (EABView *view, const gchar *message);
-	void (*command_state_change)  (EABView *view);
-};
-
-GtkWidget *eab_view_new                 (void);
-GType      eab_view_get_type            (void);
-
-void       eab_view_setup_menus         (EABView  *view,
-					 BonoboUIComponent *uic);
-
-void       eab_view_discard_menus       (EABView  *view);
-
-void       eab_view_save_as             (EABView  *view);
-void       eab_view_view                (EABView  *view);
-void       eab_view_send                (EABView  *view);
-void       eab_view_send_to             (EABView  *view);
-void       eab_view_print               (EABView  *view);
-void       eab_view_print_preview       (EABView  *view);
-void       eab_view_delete_selection    (EABView  *view);
-void       eab_view_cut                 (EABView  *view);
-void       eab_view_copy                (EABView  *view);
-void       eab_view_paste               (EABView  *view);
-void       eab_view_select_all          (EABView  *view);
-void       eab_view_show_all            (EABView  *view);
-void       eab_view_stop                (EABView  *view);
-void       eab_view_copy_to_folder      (EABView  *view);
-void       eab_view_move_to_folder      (EABView  *view);
-
-gboolean   eab_view_can_create          (EABView  *view);
-gboolean   eab_view_can_print           (EABView  *view);
-gboolean   eab_view_can_save_as         (EABView  *view);
-gboolean   eab_view_can_view            (EABView  *view);
-gboolean   eab_view_can_send            (EABView  *view);
-gboolean   eab_view_can_send_to         (EABView  *view);
-gboolean   eab_view_can_delete          (EABView  *view);
-gboolean   eab_view_can_cut             (EABView  *view);
-gboolean   eab_view_can_copy            (EABView  *view);
-gboolean   eab_view_can_paste           (EABView  *view);
-gboolean   eab_view_can_select_all      (EABView  *view);
-gboolean   eab_view_can_stop            (EABView  *view);
-gboolean   eab_view_can_copy_to_folder  (EABView  *view);
-gboolean   eab_view_can_move_to_folder  (EABView  *view);
-
-G_END_DECLS;
-
-#endif /* __EAB_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
deleted file mode 100644
index df1465349e..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-label.h"
-#include "eab-marshal.h"
-
-#include <gtk/gtksignal.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gdk/gdkkeysyms.h>
-
-static void e_minicard_label_init		(EMinicardLabel		 *card);
-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
-static void e_minicard_label_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_label_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-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_style_set (EMinicardLabel *label, GtkStyle *previous_style);
-
-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );
-
-static void set_colors (EMinicardLabel *label);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_WIDTH,
-	PROP_HEIGHT,
-	PROP_HAS_FOCUS,
-	PROP_FIELD,
-	PROP_FIELDNAME,
-	PROP_TEXT_MODEL,
-	PROP_MAX_FIELD_NAME_WIDTH,
-	PROP_EDITABLE
-};
-
-enum {
-	STYLE_SET,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_label_signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_label_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardLabelClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_label_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardLabel),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_label_init,
-		};
-
-		type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicardLabel", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_label_class_init (EMinicardLabelClass *klass)
-{
-	GObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	klass->style_set = e_minicard_label_style_set;
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->set_property = e_minicard_label_set_property;
-	object_class->get_property = e_minicard_label_get_property;
-	/*  object_class->destroy = e_minicard_label_destroy; */
-
-	g_object_class_install_property (object_class, PROP_WIDTH,
-					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HEIGHT,
-					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
-					 g_param_spec_boolean ("has_focus",
-							       _("Has Focus"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FIELD,
-					 g_param_spec_string ("field",
-							      _("Field"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FIELDNAME,
-					 g_param_spec_string ("fieldname",
-							      _("Field Name"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TEXT_MODEL,
-					 g_param_spec_object ("text_model",
-							      _("Text Model"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_TEXT_MODEL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_MAX_FIELD_NAME_WIDTH,
-					 g_param_spec_double ("max_field_name_length",
-							      _("Max field name length"),
-							      /*_( */"XXX blurb" /*)*/,
-							      -1.0, G_MAXDOUBLE, -1.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	e_minicard_label_signals [STYLE_SET] =
-		g_signal_new ("style_set",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EMinicardLabelClass, style_set),
-			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
-			      G_TYPE_NONE, 1,
-			      GTK_TYPE_STYLE);
-
-	/* 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_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasItem *item;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-	item = GNOME_CANVAS_ITEM (object);	
-
-	switch (prop_id){
-	case PROP_WIDTH:
-		e_minicard_label->width = g_value_get_double (value);
-		e_minicard_label_resize_children(e_minicard_label);
-		e_canvas_item_request_reflow (item);
-		break;
-	case PROP_HAS_FOCUS:
-		if (e_minicard_label->field && (g_value_get_boolean (value) != E_FOCUS_NONE))
-			e_canvas_item_grab_focus(e_minicard_label->field, FALSE);
-		break;
-	case PROP_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL );
-		break;
-	case PROP_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
-		break;
-	case PROP_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL);
-		break;
-	case PROP_MAX_FIELD_NAME_WIDTH:
-		e_minicard_label->max_field_name_length = g_value_get_double (value);
-		break;
-	case PROP_EDITABLE:
-		e_minicard_label->editable = g_value_get_boolean (value);
-		g_object_set (e_minicard_label->field, "editable", FALSE /* e_minicard_label->editable */, NULL);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_label_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EMinicardLabel *e_minicard_label;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-
-	switch (prop_id) {
-	case PROP_WIDTH:
-		g_value_set_double (value, e_minicard_label->width);
-		break;
-	case PROP_HEIGHT:
-		g_value_set_double (value, e_minicard_label->height);
-		break;
-	case PROP_HAS_FOCUS:
-		g_value_set_boolean (value, e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE);
-		break;
-	case PROP_FIELD:
-		g_object_get_property (G_OBJECT (e_minicard_label->field),
-				       "text", value);
-		break;
-	case PROP_FIELDNAME:
-		g_object_get_property (G_OBJECT (e_minicard_label->fieldname),
-				       "text", value);
-		break;
-	case PROP_TEXT_MODEL:
-		g_object_get_property (G_OBJECT (e_minicard_label->field),
-				       "model", value);
-		break;
-	case PROP_MAX_FIELD_NAME_WIDTH:
-		g_value_set_double (value, e_minicard_label->max_field_name_length);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_minicard_label->editable);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_label_realize (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasGroup *group;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
-		(* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
-	e_canvas_item_request_reflow(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,
-				 "fill_color", "black",
-				 "draw_background", FALSE,
-				 "im_context", E_CANVAS (item->canvas)->im_context,
-				 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,
-				 "fill_color", "black",
-				 "editable", FALSE, /* e_minicard_label->editable, */
-				 "draw_background", FALSE,
-				 "im_context", E_CANVAS (item->canvas)->im_context,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	set_colors (e_minicard_label);
-
-	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 (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardLabel *e_minicard_label;
- 
-	e_minicard_label = E_MINICARD_LABEL (item);
-
-	switch( event->type ) {
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Escape) {
-			GnomeCanvasItem *parent;
-
-			e_text_cancel_editing (E_TEXT (e_minicard_label->field));
-
-			parent = GNOME_CANVAS_ITEM (e_minicard_label)->parent;
-			if (parent)
-				e_canvas_item_grab_focus(parent, FALSE);
-		}
-		break;
-	case GDK_FOCUS_CHANGE: {
-		GdkEventFocus *focus_event = (GdkEventFocus *) event;
-
-		e_minicard_label->has_focus = focus_event->in;
-		set_colors (e_minicard_label);
-
-		g_object_set (e_minicard_label->field,
-			      "handle_popup", e_minicard_label->has_focus,
-			      NULL);
-		break;
-	}
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE: 
-	case GDK_MOTION_NOTIFY:
-	case GDK_ENTER_NOTIFY:
-	case GDK_LEAVE_NOTIFY: {
-		gboolean return_val;
-		g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
-		return return_val;
-	}
-	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) MAX ( left_width, 0 ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) MAX ( e_minicard_label->width - 8 - left_width, 0 ),
-			       NULL );
-}
-
-static void
-set_colors (EMinicardLabel *label)
-{
-	if ( (GTK_OBJECT_FLAGS( label ) & GNOME_CANVAS_ITEM_REALIZED) ) {
-		GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (label)->canvas);
-		GtkStyle *style = gtk_widget_get_style (canvas);
-		if (label->has_focus) {
-			gnome_canvas_item_set (label->rect, 
-					       "outline_color_gdk", &style->mid[GTK_STATE_SELECTED],
-					       "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-		}
-		else {
-			gnome_canvas_item_set (label->rect,
-					       "outline_color_gdk", NULL,
-					       "fill_color_gdk", NULL,
-					       NULL);
-
-			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-
-			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
-					       NULL);
-		}
-	}
-}
-
-static void
-e_minicard_label_style_set (EMinicardLabel *label, GtkStyle *previous_style)
-{
-	set_colors (label);
-}
-
-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;
-
-	g_object_get(e_minicard_label->fieldname, 
-		     "text_height", &text_height,
-		     NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	g_object_get(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 );
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_height", (double) e_minicard_label->height - 3,
-			       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);
-	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 d914cb30bb..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <glib.h>
-#include <libgnomecanvas/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_TYPE_MINICARD_LABEL			(e_minicard_label_get_type ())
-#define E_MINICARD_LABEL(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_LABEL, EMinicardLabel))
-#define E_MINICARD_LABEL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_LABEL, EMiniCardLabelClass))
-#define E_IS_MINICARD_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL))
-#define E_IS_MINICARD_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL))
-
-
-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;
-
-	void (* style_set) (EMinicardLabel *label, GtkStyle *previous_style);
-};
-
-
-GType      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 ff1bdc1f06..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-#include <gal/widgets/e-canvas-background.h>
-#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "eab-marshal.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_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_view_widget_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_minicard_view_widget_dispose       (GObject *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_style_set     (GtkWidget *widget, GtkStyle *previous_style);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE,
-	PROP_COLUMN_WIDTH
-};
-
-enum {
-	SELECTION_CHANGE,
-	COLUMN_WIDTH_CHANGED,
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_view_widget_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardViewWidgetClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_view_widget_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardViewWidget),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_view_widget_init,
-		};
-
-		type = g_type_register_static (e_canvas_get_type (), "EMinicardViewWidget", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	object_class->set_property       = e_minicard_view_widget_set_property;
-	object_class->get_property       = e_minicard_view_widget_get_property;
-	object_class->dispose            = e_minicard_view_widget_dispose;
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_COLUMN_WIDTH, 
-					 g_param_spec_double ("column_width",
-							      _("Column Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 150.0,
-							      G_PARAM_READWRITE));
-
-	signals [SELECTION_CHANGE] =
-		g_signal_new ("selection_change",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, selection_change),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	signals [COLUMN_WIDTH_CHANGED] =
-		g_signal_new ("column_width_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, column_width_changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__DOUBLE,
-			      G_TYPE_NONE, 1, G_TYPE_DOUBLE);
-
-	signals [RIGHT_CLICK] =
-		g_signal_new ("right_click",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, right_click),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	widget_class->style_set     = e_minicard_view_widget_style_set;
-	widget_class->realize       = e_minicard_view_widget_realize;
-	widget_class->size_allocate = e_minicard_view_widget_size_allocate;
-
-	canvas_class->reflow        = e_minicard_view_widget_reflow;
-
-	klass->selection_change     = NULL;
-	klass->column_width_changed = NULL;
-	klass->right_click          = NULL;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-	view->editable = FALSE;
-	view->column_width = 150;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter)
-{
-	EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (g_object_new (e_minicard_view_widget_get_type (), NULL));
-
-	widget->adapter = adapter;
-	g_object_ref (widget->adapter);
-
-	return GTK_WIDGET (widget);
-}
-
-static void
-e_minicard_view_widget_set_property (GObject *object,
-				     guint prop_id,
-				     const GValue *value,
-				     GParamSpec *pspec)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (prop_id){
-	case PROP_BOOK:
-		if (emvw->book)
-			g_object_unref (emvw->book);
-		if (g_value_get_object (value)) {
-			emvw->book = E_BOOK(g_value_get_object (value));
-			if (emvw->book)
-				g_object_ref(emvw->book);
-		} else
-			emvw->book = NULL;
-		if (emvw->emv)
-			g_object_set(emvw->emv,
-				     "book", emvw->book,
-				       NULL);
-		break;
-	case PROP_QUERY:
-		emvw->query = g_strdup(g_value_get_string (value));
-		if (emvw->emv)
-			g_object_set(emvw->emv,
-				     "query", emvw->query,
-				     NULL);
-		break;
-	case PROP_EDITABLE:
-		emvw->editable = g_value_get_boolean (value);
-		if (emvw->emv)
-			g_object_set (emvw->emv,
-				      "editable", emvw->editable,
-				      NULL);
-		break;
-	case PROP_COLUMN_WIDTH:
-		emvw->column_width = g_value_get_double (value);
-		if (emvw->emv) {
-			g_object_set (emvw->emv,
-				      "column_width", emvw->column_width,
-				      NULL);
-		}
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_get_property (GObject *object,
-				     guint prop_id,
-				     GValue *value,
-				     GParamSpec *pspec)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (prop_id) {
-	case PROP_BOOK:
-		g_value_set_object (value, emvw->book);
-		break;
-	case PROP_QUERY:
-		g_value_set_string (value, emvw->query);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, emvw->editable);
-		break;
-	case PROP_COLUMN_WIDTH:
-		g_value_set_double (value, emvw->column_width);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_dispose (GObject *object)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);
-
-	if (view->book) {
-		g_object_unref (view->book);
-		view->book = NULL;
-	}
-	if (view->query) {
-		g_free(view->query);
-		view->query = NULL;
-	}
-
-	if (view->adapter) {
-		g_object_unref (view->adapter);
-		view->adapter = NULL;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose (object);
-}
-
-static void
-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
-{
-	g_signal_emit (widget,
-		       signals [SELECTION_CHANGE], 0);
-}
-
-static void
-selection_row_change (ESelectionModel *esm, int row, EMinicardViewWidget *widget)
-{
-	gboolean selected = e_selection_model_is_row_selected (esm, row);
-
-	/* we only handle the selected case here */
-	if (!selected)
-		return;
-
-	selection_change (esm, widget);
-}
-
-static void
-column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget)
-{
-	g_signal_emit (widget,
-		       signals [COLUMN_WIDTH_CHANGED], 0, width);
-}
-
-static guint
-right_click (EMinicardView *view, GdkEvent *event, EMinicardViewWidget *widget)
-{
-	guint ret_val;
-	g_signal_emit (widget,
-		       signals [RIGHT_CLICK], 0,
-		       event, &ret_val);
-	return ret_val;
-}
-
-static void
-e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	if (view->background)
-		gnome_canvas_item_set (view->background,
-				       "fill_color_gdk", &widget->style->base[GTK_STATE_NORMAL],
-				       NULL );
-
-	if (GTK_WIDGET_CLASS(parent_class)->style_set)
-		GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style);
-}
-
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-	GtkStyle *style = gtk_widget_get_style (widget);
-
-	view->background = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS(view) ),
-						 e_canvas_background_get_type(),
-						 "fill_color_gdk", &style->base[GTK_STATE_NORMAL],
-						 NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		"adapter", view->adapter,
-		"column_width", view->column_width,
-		NULL );
-
-	g_signal_connect (E_REFLOW(view->emv)->selection,
-			  "selection_changed",
-			  G_CALLBACK (selection_change), view);
-	g_signal_connect (E_REFLOW(view->emv)->selection,
-			  "selection_row_changed",
-			  G_CALLBACK (selection_row_change), view);
-	g_signal_connect (view->emv,
-			  "column_width_changed",
-			  G_CALLBACK (column_width_changed), view);
-	g_signal_connect (view->emv,
-			  "right_click",
-			  G_CALLBACK (right_click), view);
-
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS(parent_class)->realize (widget);
-}
-
-static void
-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-	
-	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-		gnome_canvas_item_set( view->emv,
-				       "height", (double) allocation->height,
-				       NULL );
-		gnome_canvas_item_set( view->emv,
-				       "minimum_width", (double) allocation->width,
-				       NULL );
-		g_object_get(view->emv,
-			     "width", &width,
-			     NULL);
-		width = MAX(width, allocation->width);
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1);
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	g_object_get(view->emv,
-		     "width", &width,
-		     NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-}
-
-ESelectionModel *
-e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view)
-{
-	if (view->emv)
-		return E_SELECTION_MODEL (E_REFLOW (view->emv)->selection);
-	else
-		return NULL;
-}
-
-EMinicardView *
-e_minicard_view_widget_get_view             (EMinicardViewWidget       *view)
-{
-	if (view->emv)
-		return E_MINICARD_VIEW (view->emv);
-	else
-		return NULL;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
deleted file mode 100644
index ef8401b88c..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gal/widgets/e-canvas.h>
-#include <libebook/e-book.h>
-#include "e-minicard-view.h"
-
-G_BEGIN_DECLS
-
-#define E_TYPE_MINICARD_VIEW_WIDGET		(e_minicard_view_widget_get_type ())
-#define E_MINICARD_VIEW_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget))
-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-
-
-typedef struct _EMinicardViewWidget       EMinicardViewWidget;
-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
-
-struct _EMinicardViewWidget
-{
-	ECanvas parent;
-
-	GnomeCanvasItem *background;
-	GnomeCanvasItem *emv;
-
-	EAddressbookReflowAdapter *adapter;
-
-	EBook *book;
-	char *query;
-	guint editable : 1;
-
-	double column_width;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-	void         (*selection_change)     (EMinicardViewWidget *emvw);
-	void         (*column_width_changed) (EMinicardViewWidget *emvw, double width);
-	guint        (*right_click)          (EMinicardViewWidget *emvw);
-};
-
-
-GType            e_minicard_view_widget_get_type             (void);
-GtkWidget       *e_minicard_view_widget_new                  (EAddressbookReflowAdapter *adapter);
-
-/* Get parts of the view widget. */
-ESelectionModel *e_minicard_view_widget_get_selection_model  (EMinicardViewWidget       *view);
-EMinicardView   *e_minicard_view_widget_get_view             (EMinicardViewWidget       *view);
-
-G_END_DECLS
-
-#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 3c588c9ef2..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-view.h"
-
-#include "eab-gui-util.h"
-#include "eab-marshal.h"
-#include "util/eab-book-util.h"
-
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdnd.h>
-#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
-#include <string.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 {
-	PROP_0,
-	PROP_ADAPTER,
-	PROP_BOOK,
-	PROP_QUERY,
-	PROP_EDITABLE
-};
-
-
-enum {
-	RIGHT_CLICK,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD_LIST,
-};
-#define VCARD_LIST_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-static void
-e_minicard_view_drag_data_get(GtkWidget *widget,
-			      GdkDragContext *context,
-			      GtkSelectionData *selection_data,
-			      guint info,
-			      guint time,
-			      EMinicardView *view)
-{
-	if (!E_IS_MINICARD_VIEW(view))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD_LIST: {
-		char *value;
-		
-		value = eab_contact_list_to_string (view->drag_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-
-	g_list_foreach (view->drag_list, (GFunc)g_object_unref, NULL);
-	g_list_free (view->drag_list);
-	view->drag_list = NULL;
-}
-
-static int
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
-{
-	GdkDragContext *context;
-	GtkTargetList *target_list;
-	GdkDragAction actions = GDK_ACTION_MOVE | GDK_ACTION_COPY;
-	
-	view->drag_list = e_minicard_view_get_card_list (view);
-
-	g_print ("dragging %d card(s)\n", g_list_length (view->drag_list));
-
-	target_list = gtk_target_list_new (drag_types, num_drag_types);
-
-	context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)->canvas),
-				  target_list, actions, 1/*XXX*/, event);
-
-	if (!view->canvas_drag_data_get_id)
-		view->canvas_drag_data_get_id = g_signal_connect (GNOME_CANVAS_ITEM (view)->canvas,
-								  "drag_data_get",
-								  G_CALLBACK (e_minicard_view_drag_data_get),
-								  view);
-
-	gtk_drag_set_icon_default (context);
-
-	return TRUE;
-}
-
-static void
-set_empty_message (EMinicardView *view)
-{
-	char *empty_message;
-	gboolean editable = FALSE;
-
-	if (view->adapter) {
-		g_object_get (view->adapter,
-			      "editable", &editable,
-			      NULL);
-	}
-
-	if (editable)
-		empty_message = _("\n\nThere are no items to show in this view.\n\n"
-				  "Double-click here to create a new Contact.");
-	else
-		empty_message = _("\n\nThere are no items to show in this view.");
-
-	g_object_set (view,
-		      "empty_message", empty_message,
-		      NULL);
-}
-
-static void
-writable_status_change (EABModel *model, gboolean writable, EMinicardView *view)
-{
-	set_empty_message (view);
-}
-
-static void
-adapter_changed (EMinicardView *view)
-{
-	set_empty_message (view);
-
-	g_signal_connect (view->adapter, "drag_begin",
-			  G_CALLBACK (e_minicard_view_drag_begin), view);
-}
-
-static void
-e_minicard_view_set_property (GObject *object,
-			      guint prop_id,
-			      const GValue *value,
-			      GParamSpec *pspec)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-	
-	switch (prop_id){
-	case PROP_ADAPTER:
-		if (view->adapter) {
-			if (view->writable_status_id) {
-				EABModel *model;
-				g_object_get (view->adapter,
-					      "model", &model,
-					      NULL);
-				if (model) {
-					g_signal_handler_disconnect (model, view->writable_status_id);
-				}
-			}
-
-			g_object_unref (view->adapter);
-		}
-		view->writable_status_id = 0;
-		view->adapter = g_value_get_object (value);
-		g_object_ref (view->adapter);
-		adapter_changed (view);
-		g_object_set (view,
-			      "model", view->adapter,
-			      NULL);
-		if (view->adapter) {
-			EABModel *model;
-			g_object_get (view->adapter,
-				      "model", &model,
-				      NULL);
-			if (model) {
-				view->writable_status_id =
-					g_signal_connect (model, "writable_status",
-							  G_CALLBACK (writable_status_change), view);
-			}
-							    
-		}
-		break;
-	case PROP_BOOK:
-		g_object_set (view->adapter,
-			      "book", g_value_get_object (value),
-			      NULL);
-		set_empty_message (view);
-		break;
-	case PROP_QUERY:
-		g_object_set (view->adapter,
-			      "query", g_value_get_string (value),
-			      NULL);
-		break;
-	case PROP_EDITABLE:
-		g_object_set (view->adapter,
-			      "editable", g_value_get_boolean (value),
-			      NULL);
-		set_empty_message (view);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_property (GObject *object,
-			      guint prop_id,
-			      GValue *value,
-			      GParamSpec *pspec)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-
-	switch (prop_id) {
-	case PROP_ADAPTER:
-		g_value_set_object (value, view->adapter);
-		break;
-	case PROP_BOOK:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "book", value);
-		break;
-	case PROP_QUERY:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "query", value);
-		break;
-	case PROP_EDITABLE:
-		g_object_get_property (G_OBJECT (view->adapter),
-				       "editable", value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_view_dispose (GObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->canvas_drag_data_get_id) {
-		g_signal_handler_disconnect (GNOME_CANVAS_ITEM (view)->canvas,
-					     view->canvas_drag_data_get_id);
-		view->canvas_drag_data_get_id = 0;
-	}
-
-	if (view->adapter) {
-		if (view->writable_status_id) {
-			EABModel *model;
-			g_object_get (view->adapter,
-				      "model", &model,
-				      NULL);
-			if (model) {
-				g_signal_handler_disconnect (model, view->writable_status_id);
-			}
-		}
-
-		g_object_unref (view->adapter);
-	}
-	view->writable_status_id = 0;
-	view->adapter = NULL;
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose (object);
-}
-
-static guint
-e_minicard_view_right_click (EMinicardView *view, GdkEvent *event)
-{
-	guint ret_val = 0;
-	g_signal_emit (view, signals[RIGHT_CLICK], 0,
-		       event, &ret_val);
-	return ret_val;
-}
-
-static gboolean
-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
- 
-	view = E_MINICARD_VIEW (item);
-
-	switch( event->type ) {
-	case GDK_2BUTTON_PRESS:
-		if (((GdkEventButton *)event)->button == 1) {
-			gboolean editable;
-
-			g_object_get(view->adapter, "editable", &editable, NULL);
-  
-			if (editable) {
-				EBook *book;
-				g_object_get(view, "book", &book, NULL);
- 
-				if (book && E_IS_BOOK (book))
-					eab_show_contact_editor (book, e_contact_new(), TRUE, editable);
-			}
-			return TRUE;
-		}
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			e_minicard_view_right_click (view, event);
-		}
-		break;
-	default:
-		break;
-	}
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-	else
-		return FALSE;
-}
-
-static gint
-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
-	int return_val = FALSE;
-
-	view = E_MINICARD_VIEW (reflow);
-	if (parent_class->selection_event) {
-		return_val = parent_class->selection_event (reflow, item, event);
-	}
-
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in) {
-			int i;
-			for (i = 0; i < reflow->count; i++) {
-				if (reflow->items[i] == item) {
-					e_selection_model_maybe_do_something(reflow->selection, i, 0, 0);
-					break;
-				}
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3) {
-			return_val = e_minicard_view_right_click (view, event);
-			if (!return_val)
-				e_selection_model_right_click_up(reflow->selection);
-		}
-		break;
-	default:
-		break;
-	}
-	return return_val;
-}
-
-typedef struct {
-	EMinicardView *view;
-	EBookCallback cb;
-	gpointer closure;
-} ViewCbClosure;
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	EContact *contact;
-	ViewCbClosure *viewcbclosure = user_data;
-	EMinicardView *view = viewcbclosure->view;
-	EBookCallback cb = viewcbclosure->cb;
-	gpointer closure = viewcbclosure->closure;
-
-	g_object_get (view->adapter,
-		      "book", &book,
-		      NULL);
-
-	contact = e_addressbook_reflow_adapter_get_contact (view->adapter, i);
-
-	e_book_async_remove_contact(book, contact, cb, closure);
-
-	g_object_unref (contact);
-}
-
-#if 0
-static int
-compare_to_utf_str (EMinicard *card, const char *utf_str)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (g_unichar_isdigit (g_utf8_get_char (utf_str))) {
-		return 1;
-	}
-
-	if (card->card) {
-		char *file_as;
-		g_object_get(card->card,
-			     "file_as", &file_as,
-			     NULL);
-		if (file_as)
-			return g_utf8_strcasecmp (file_as, utf_str);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	EReflowClass *reflow_class;
-	
-	object_class = G_OBJECT_CLASS (klass);
-	item_class = (GnomeCanvasItemClass *) klass;
-	reflow_class = (EReflowClass *) klass;
-	
-	parent_class = g_type_class_peek_parent (klass);
-	
-	object_class->set_property    = e_minicard_view_set_property;
-	object_class->get_property    = e_minicard_view_get_property;
-	object_class->dispose         = e_minicard_view_dispose;
-
-	g_object_class_install_property (object_class, PROP_ADAPTER, 
-					 g_param_spec_object ("adapter",
-							      _("Adapter"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_BOOK, 
-					 g_param_spec_object ("book",
-							      _("Book"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_BOOK,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_QUERY, 
-					 g_param_spec_string ("query",
-							      _("Query"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE, 
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	signals [RIGHT_CLICK] =
-		g_signal_new ("right_click",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardViewClass, right_click),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	item_class->event             = e_minicard_view_event;
-
-	reflow_class->selection_event = e_minicard_view_selection_event;
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->adapter = NULL;
-	view->canvas_drag_data_get_id = 0;
-	view->writable_status_id = 0;
-
-	set_empty_message (view);
-}
-
-GType
-e_minicard_view_get_type (void)
-{
-	static GType reflow_type = 0;
-
-	if (!reflow_type) {
-		static const GTypeInfo reflow_info =  {
-			sizeof (EMinicardViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_view_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicardView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_view_init,
-		};
-
-		reflow_type = g_type_register_static (PARENT_TYPE, "EMinicardView", &reflow_info, 0);
-	}
-
-	return reflow_type;
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	ViewCbClosure viewcbclosure;
-	viewcbclosure.view = view;
-	viewcbclosure.cb = cb;
-	viewcbclosure.closure = closure;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection,
-				   do_remove,
-				   &viewcbclosure);
-}
-
-void
-e_minicard_view_jump_to_letter (EMinicardView *view,
-                                gunichar letter)
-{
-#if 0
-	char uft_str[6 + 1];
-
-	utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
-	e_reflow_sorted_jump (E_REFLOW_SORTED (view),
-	                      (GCompareFunc) compare_to_utf_str,
-	                      utf_str);
-#endif
-}
-
-typedef struct {
-	GList *list;
-	EAddressbookReflowAdapter *adapter;
-} ModelAndList;
-
-static void
-add_to_list (int index, gpointer closure)
-{
-	ModelAndList *mal = closure;
-	mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_contact (mal->adapter, index));
-}
-
-GList *
-e_minicard_view_get_card_list (EMinicardView *view)
-{
-	ModelAndList mal;
-
-	mal.adapter = view->adapter;
-	mal.list = NULL;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection, add_to_list, &mal);
-
-	mal.list = g_list_reverse (mal.list);
-	return mal.list;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 2614b7577a..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include "e-minicard.h"
-
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-selection-model-simple.h>
-#include <libebook/e-book.h>
-#include "e-addressbook-reflow-adapter.h"
-
-G_BEGIN_DECLS
-
-/* 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_TYPE_MINICARD_VIEW			(e_minicard_view_get_type ())
-#define E_MINICARD_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView))
-#define E_MINICARD_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-
-
-typedef struct _EMinicardView       EMinicardView;
-typedef struct _EMinicardViewClass  EMinicardViewClass;
-
-struct _EMinicardView
-{
-	EReflow parent;
-
-	EAddressbookReflowAdapter *adapter;
-	
-	/* item specific fields */
-
-	GList *drag_list;
-
-	guint canvas_drag_data_get_id;
-
-	guint writable_status_id;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowClass parent_class;
-
-	void (*right_click) (EMinicardView *view, GdkEvent *event);
-};
-
-GType    e_minicard_view_get_type          (void);
-void     e_minicard_view_remove_selection  (EMinicardView *view,
-					    EBookCallback  cb,
-					    gpointer       closure);
-void     e_minicard_view_jump_to_letter    (EMinicardView *view,
-					    gunichar       letter);
-GList   *e_minicard_view_get_card_list     (EMinicardView *view);
-
-
-G_END_DECLS
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
deleted file mode 100644
index 259d2b12f0..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnomecanvas/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 <libebook/e-book.h>
-#include "eab-marshal.h"
-#include "eab-gui-util.h"
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "e-minicard-view.h"
-#include "e-contact-editor.h"
-#include "util/eab-destination.h"
-
-static void e_minicard_init		(EMinicard		 *card);
-static void e_minicard_class_init	(EMinicardClass	 *klass);
-static void e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_minicard_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_minicard_dispose (GObject *object);
-static void e_minicard_finalize (GObject *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_style_set (EMinicard *minicard, GtkStyle *previous_style);
-
-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 {
-	EContactField field;
-	GnomeCanvasItem *label;
-};
-
-#define d(x)
-
-#define LIST_ICON_FILENAME "contact-list-16.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 {
-	PROP_0,
-	PROP_WIDTH,
-	PROP_HEIGHT,
-	PROP_HAS_FOCUS,
-	PROP_SELECTED,
-	PROP_HAS_CURSOR,
-	PROP_EDITABLE,
-	PROP_CONTACT
-};
-
-enum {
-	SELECTED,
-	DRAG_BEGIN,
-	STYLE_SET,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_signals [LAST_SIGNAL] = {0, };
-
-GType
-e_minicard_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EMinicardClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_minicard_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EMinicard),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_minicard_init,
-		};
-
-		type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicard", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-e_minicard_class_init (EMinicardClass *klass)
-{
-	GObjectClass *object_class = (GObjectClass*) klass;
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) klass;
-
-	object_class->set_property  = e_minicard_set_property;
-	object_class->get_property  = e_minicard_get_property;
-	object_class->dispose    = e_minicard_dispose;
-	object_class->finalize      = e_minicard_finalize;
-
-	klass->style_set = e_minicard_style_set;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-
-	g_object_class_install_property (object_class, PROP_WIDTH,
-					 g_param_spec_double ("width",
-							      _("Width"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HEIGHT,
-					 g_param_spec_double ("height",
-							      _("Height"),
-							      /*_( */"XXX blurb" /*)*/,
-							      0.0, G_MAXDOUBLE, 10.0,
-							      G_PARAM_READABLE));
-
-	g_object_class_install_property (object_class, PROP_HAS_FOCUS,
-					 /* XXX should be _enum */
-					 g_param_spec_int ("has_focus",
-							   _("Has Focus"),
-							   /*_( */"XXX blurb" /*)*/,
-							   E_MINICARD_FOCUS_TYPE_START, E_MINICARD_FOCUS_TYPE_END,
-							   E_MINICARD_FOCUS_TYPE_START,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_SELECTED,
-					 g_param_spec_boolean ("selected",
-							       _("Selected"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_HAS_CURSOR,
-					 g_param_spec_boolean ("has_cursor",
-							       _("Has Cursor"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _("Editable"),
-							       /*_( */"XXX blurb" /*)*/,
-							       FALSE,
-							       G_PARAM_READWRITE));
-  
-	g_object_class_install_property (object_class, PROP_CONTACT,
-					 g_param_spec_object ("contact",
-							      _("Contact"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_CONTACT,
-							      G_PARAM_READWRITE));
-  
-	e_minicard_signals [SELECTED] =
-		g_signal_new ("selected",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardClass, selected),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	e_minicard_signals [DRAG_BEGIN] =
-		g_signal_new ("drag_begin",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EMinicardClass, drag_begin),
-			      NULL, NULL,
-			      eab_marshal_INT__POINTER,
-			      G_TYPE_INT, 1, G_TYPE_POINTER);
-
-	e_minicard_signals [STYLE_SET] =
-		g_signal_new ("style_set",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (EMinicardClass, style_set),
-			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
-			      G_TYPE_NONE, 1,
-			      GTK_TYPE_STYLE);
-
-	/* 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->rect             = NULL;
-	minicard->fields           = NULL;
-	minicard->width            = 10;
-	minicard->height           = 10;
-	minicard->has_focus        = FALSE;
-	minicard->selected         = FALSE;
-	minicard->editable         = FALSE;
-	minicard->has_cursor       = FALSE;
-
-	minicard->contact          = NULL;
-
-	minicard->list_icon_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME, NULL);
-	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_ACTIVE],
-				       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->text[GTK_STATE_NORMAL],
-				       NULL);
-	}
-	minicard->selected = selected;
-}
-
-static void
-set_has_cursor (EMinicard *minicard, gboolean has_cursor)
-{
-	if (!minicard->has_focus && has_cursor)
-		e_canvas_item_grab_focus(GNOME_CANVAS_ITEM (minicard), FALSE);
-	minicard->has_cursor = has_cursor;
-}
-
-
-static void
-e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-	GList *l;
-
-	item = GNOME_CANVAS_ITEM (object);
-	e_minicard = E_MINICARD (object);
-	
-	switch (prop_id){
-	case PROP_WIDTH:
-		if (e_minicard->width != g_value_get_double (value)) {
-			e_minicard->width = g_value_get_double (value);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case PROP_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( g_value_get_int(value) == E_FOCUS_START ||
-			     g_value_get_int(value) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", g_value_get_int (value),
-						      NULL);
-			} else if ( g_value_get_int (value) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", g_value_get_int (value),
-						      NULL);
-			}
-		}
-		else {
-			if (!e_minicard->has_focus)
-				e_canvas_item_grab_focus(item, FALSE);
-		}
-		break;
-	case PROP_SELECTED:
-		if (e_minicard->selected != g_value_get_boolean (value))
-			set_selected (e_minicard, g_value_get_boolean (value));
-		break;
-	case PROP_EDITABLE:
-		e_minicard->editable = g_value_get_boolean (value);
-		for (l = e_minicard->fields; l; l = l->next) {
-			g_object_set (E_MINICARD_FIELD (l->data)->label,
-				      "editable", FALSE /* e_minicard->editable */,
-				      NULL);
-		}
-		break;
-	case PROP_HAS_CURSOR:
-		d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION));
-		if (e_minicard->has_cursor != g_value_get_boolean (value))
-			set_has_cursor (e_minicard, g_value_get_boolean (value));
-		break;
-	case PROP_CONTACT:
-		if (e_minicard->contact)
-			g_object_unref (e_minicard->contact);
-		e_minicard->contact = E_CONTACT(g_value_get_object (value));
-		if (e_minicard->contact)
-			g_object_ref (e_minicard->contact);
-		remodel(e_minicard);
-		e_canvas_item_request_reflow(item);
-		e_minicard->changed = FALSE;
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_get_property  (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (object);
-
-	switch (prop_id) {
-	case PROP_WIDTH:
-		g_value_set_double (value, e_minicard->width);
-		break;
-	case PROP_HEIGHT:
-		g_value_set_double (value, e_minicard->height);
-		break;
-	case PROP_HAS_FOCUS:
-		g_value_set_int (value, e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE);
-		break;
-	case PROP_SELECTED:
-		g_value_set_boolean (value, e_minicard->selected);
-		break;
-	case PROP_HAS_CURSOR:
-		g_value_set_boolean (value, e_minicard->has_cursor);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_minicard->editable);
-		break;
-	case PROP_CONTACT:
-		g_value_set_object (value, e_minicard->contact);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_minicard_dispose (GObject *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->fields) {
-		g_list_foreach(e_minicard->fields, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(e_minicard->fields);
-		e_minicard->fields = NULL;
-	}
-
-	if (e_minicard->list_icon_pixbuf) {
-		gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
-		e_minicard->list_icon_pixbuf = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-
-
-static void
-e_minicard_finalize (GObject *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->contact)
-		g_object_unref (e_minicard->contact);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style)
-{
-	if ( (GTK_OBJECT_FLAGS( minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
-		set_selected (minicard, minicard->selected);
-}
-
-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) MAX (e_minicard->width - 1, 0),
-				 "y2", (double) MAX (e_minicard->height - 1, 0),
-				 "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) MAX (e_minicard->width - 3, 0),
-				 "y2", (double) MAX (e_minicard->height - 3, 0),
-				 "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) MAX( e_minicard->width - 12, 0 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "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);
-
-	set_selected (e_minicard, e_minicard->selected);
-
-	remodel(e_minicard);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_unrealize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	EMinicard *minicard = data;
-	g_object_unref (editor);
-	minicard->editor = NULL;
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out"));
-			if (focus_event->in) {
-				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
-				e_minicard->has_focus = TRUE;
-				if (!e_minicard->selected) {
-					e_minicard_selected(e_minicard, event);
-				}
-			}
-			else {
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS: {
-		if (1 <= event->button.button && event->button.button <= 2) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			GdkEventMask mask = ((1 << (4 + event->button.button)) |
-					     GDK_POINTER_MOTION_MASK |
-					     GDK_BUTTON_PRESS_MASK |
-					     GDK_BUTTON_RELEASE_MASK);
-			
-			e_canvas_item_grab_focus(item, TRUE);
-
-			if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (e_minicard),
-						    mask, NULL, event->button.time)) {
-				return FALSE;
-			}
-			gtk_grab_add (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-			e_minicard->button_x = event->button.x;
-			e_minicard->button_y = event->button.y;
-			e_minicard->drag_button = event->button.button;
-			e_minicard->drag_button_down = TRUE;
-			return ret_val;
-		} else if (event->button.button == 3) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			if (ret_val != 0)
-				return ret_val;
-		}
-		break;
-	}
-	case GDK_BUTTON_RELEASE:
-		e_minicard_selected(e_minicard, event);
-		if (e_minicard->drag_button == event->button.button) {
-			e_minicard->drag_button = 0;
-			e_minicard->drag_button_down = FALSE;
-			e_minicard->button_x = -1;
-			e_minicard->button_y = -1;
-
-			if (GTK_WIDGET_HAS_GRAB (GNOME_CANVAS_ITEM (e_minicard)->canvas)) {
-				gtk_grab_remove (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-				gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (e_minicard), event->button.time);
-			}
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (e_minicard->drag_button_down && event->motion.state & GDK_BUTTON1_MASK) {
-			if (MAX (abs (e_minicard->button_x - event->motion.x),
-				 abs (e_minicard->button_y - event->motion.y)) > 3) {
-				gint ret_val;
-
-				ret_val = e_minicard_drag_begin(e_minicard, event);
-
-				e_minicard->drag_button_down = FALSE;
-
-				return ret_val;
-			}
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			if (e_minicard->editor) {
-				if (GPOINTER_TO_INT (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST)))
-					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)) {
-					g_object_get(item->parent,
-						     "book", &book,
-						     NULL);
-				}
-
-				if (book != NULL) {
-					if (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST)) {
-						EContactListEditor *editor = eab_show_contact_list_editor (book, e_minicard->contact,
-													   FALSE, e_minicard->editable);
-						e_minicard->editor = G_OBJECT (editor);
-					}
-					else {
-						EContactEditor *editor = eab_show_contact_editor (book, e_minicard->contact,
-												  FALSE, e_minicard->editable);
-						e_minicard->editor = G_OBJECT (editor);
-					}
-					g_object_ref (e_minicard->editor);
-
-					g_signal_connect (e_minicard->editor, "editor_closed",
-							  G_CALLBACK (editor_closed_cb), e_minicard);
-
-					g_object_unref (book);
-				}
-			}
-			return TRUE;
-		}
-		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_resize_children( EMinicard *e_minicard )
-{
-	GList *list;
-	gboolean is_list = GPOINTER_TO_INT (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST));
-
-	if (e_minicard->header_text) {
-		gnome_canvas_item_set( e_minicard->header_text,
-				       "width", ((double) e_minicard->width - 12 
-						 - (is_list ? 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
-add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	name = g_strdup_printf("%s:", e_contact_pretty_name (field));
-	string = e_contact_get (e_minicard->contact, field);
-
-	/* Magically convert embedded XML into an address. */
-	if (!strncmp (string, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (string);
-		if (dest != NULL) {
-			gchar *new_string = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_free (string);
-			string = new_string;
-			g_object_unref (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", FALSE /* e_minicard->editable */,
-			       NULL );
-#if notyet
-	g_object_set(E_MINICARD_LABEL(new_item)->field,
-		     "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field),
-		     NULL);
-#endif
-	g_object_set_data(G_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 int
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	EContactField field;
-	int width = -1;
-	PangoLayout *layout;
-
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), "");
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		int this_width;
-
-		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-			continue;
-
-		name = g_strdup_printf("%s:", e_contact_pretty_name (field));
-		pango_layout_set_text (layout, name, -1);
-		pango_layout_get_pixel_size (layout, &this_width, NULL);
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	g_object_unref (layout);
-	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->contact) {
-		EContactField field;
-		GList *list;
-		char *file_as;
-		int left_width = -1;
-
-		if (e_minicard->header_text) {
-			file_as = e_contact_get (e_minicard->contact, E_CONTACT_FILE_AS);
-			gnome_canvas_item_set (e_minicard->header_text,
-					       "text", file_as ? file_as : "",
-					       NULL );
-			g_free(file_as);
-		}
-
-		if (e_minicard->contact && e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST))
-			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_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
-				continue;
-
-			if (list)
-				minicard_field = list->data;
-			if (minicard_field && minicard_field->field == field) {
-				GList *this_list = list;
-				char *string;
-
-				string = e_contact_get(e_minicard->contact, field);
-				if (string && *string) {
-					/* Magically convert embedded XML into an address. */
-					if (!strncmp (string, "<?xml", 4)) {
-						EABDestination *dest = eab_destination_import (string);
-						if (dest != NULL) {
-							gchar *new_string = g_strdup (eab_destination_get_textrep (dest, TRUE));
-							g_free (string);
-							string = new_string;
-							g_object_unref (dest);
-						}
-					}
-
-					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
-					g_object_set(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_contact_get(e_minicard->contact, 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;
-
-		g_object_get( 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;
-			g_object_get (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,
-				       "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->contact) {
-		return e_contact_get_const (minicard->contact, E_CONTACT_UID);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	int cmp = 0;
-	
-	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->contact && minicard2->contact) {
-		char *file_as1, *file_as2;
-		g_object_get(minicard1->contact,
-			     "file_as", &file_as1,
-			     NULL);
-		g_object_get(minicard2->contact,
-			     "file_as", &file_as2,
-			     NULL);
-
-		if (file_as1 && file_as2) 
-			cmp = g_utf8_collate(file_as1, file_as2);
-		else if (file_as1)
-			cmp = -1;
-		else if (file_as2)
-			cmp = 1;
-		else 
-			cmp = strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-
-		g_free (file_as1);
-		g_free (file_as2);
-	}
-
-	return cmp;
-}
-
-int
-e_minicard_selected (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard);
-	if (item->parent) {
-		guint signal_id = g_signal_lookup ("selection_event", G_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) {
-			g_signal_emit(item->parent,
-				      signal_id, 0,
-				      item, event, &ret_val);
-		}
-	}
-	return ret_val;
-}
-
-static gint
-e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *parent;
-	g_signal_emit (minicard,
-		       e_minicard_signals[DRAG_BEGIN], 0,
-		       event, &ret_val);
-
-	parent = GNOME_CANVAS_ITEM (minicard)->parent;
-	if (parent && E_IS_REFLOW (parent)) {
-		E_REFLOW (parent)->maybe_in_drag = FALSE;
-	}
-	return ret_val;
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index 2d0cfd8ed5..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include <libgnomecanvas/gnome-canvas.h>
-#include <libebook/e-contact.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_TYPE_MINICARD			(e_minicard_get_type ())
-#define E_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD, EMinicard))
-#define E_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD, EMinicardClass))
-#define E_IS_MINICARD(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD))
-#define E_IS_MINICARD_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD))
-
-
-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 */
-	EContact *contact;
-	
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *header_rect;
-	GnomeCanvasItem *header_text;
-	GnomeCanvasItem *list_icon;
-
-	GdkPixbuf *list_icon_pixbuf;
-	double list_icon_size;
-
-	GObject *editor;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-
-	guint selected : 1;
-	guint has_cursor : 1;
-
-	guint has_focus : 1;
-
-	guint editable : 1;
-
-	guint drag_button_down : 1;
-	gint drag_button;
-
-	gint button_x;
-	gint button_y;
-
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	gint (* selected) (EMinicard *minicard, GdkEvent *event);
-	gint (* drag_begin) (EMinicard *minicard, GdkEvent *event);
-
-	void (* style_set) (EMinicard *minicard, GtkStyle *previous_style);
-};
-
-
-GType       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/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
deleted file mode 100644
index 3de6eac380..0000000000
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *
- *  Copyright (C) 2003 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "eab-contact-display.h"
-
-#include "e-util/e-html-utils.h"
-#include "util/eab-destination.h"
-
-#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-url.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-struct _EABContactDisplayPrivate {
-	GtkHTML *html;
-	EContact *contact;
-};
-
-
-#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n"  \
-                    "<head>\n<meta name=\"generator\" content=\"Evolution Addressbook Component\">\n</head>\n"
-
-#define MAX_COMPACT_IMAGE_DIMENSION 48
-
-static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  EABContactDisplay *display)
-{
-	printf ("on_url_requested (%s)\n", url);
-	if (!strcmp (url, "internal-contact-photo:")) {
-		EContactPhoto *photo;
-
-		photo = e_contact_get (display->priv->contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO);
-
-		printf ("writing a photo of length %d\n", photo->length);
-
-		gtk_html_stream_write (handle, photo->data, photo->length);
-
-		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-	}
-}
-
-static void
-on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
-{
-	GError *err = NULL;
-		
-	gnome_url_show (url, &err);
-		
-	if (err) {
-		g_warning ("gnome_url_show: %s", err->message);
-		g_error_free (err);
-	}
-}
-
-static void
-render_address (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field)
-{
-	EContactAddress *adr;
-	const char *label;
-
-	label = e_contact_get_const (contact, label_field);
-	if (label) {
-		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
-
-		gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr valign=\"top\"><td>");
-		gtk_html_stream_printf (html_stream, "<b>%s:</b>&nbsp;<td>%s<br>", html_label, html);
-
-		gtk_html_stream_printf (html_stream, "<a href=\"http://www.mapquest.com/\">%s</a>", _("Map It"));
-		gtk_html_stream_printf (html_stream, "</td></tr></table>");
-		g_free (html);
-		return;
-	}
-
-	adr = e_contact_get (contact, adr_field);
-	if (adr &&
-	    (adr->po || adr->ext || adr->street || adr->locality || adr->region || adr->code || adr->country)) {
-
-		gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr valign=\"top\"><td>");
-		gtk_html_stream_printf (html_stream, "<b>%s:</b>&nbsp;<td>", html_label);
-
-		if (adr->po && *adr->po) gtk_html_stream_printf (html_stream, "%s<br>", adr->po);
-		if (adr->ext && *adr->ext) gtk_html_stream_printf (html_stream, "%s<br>", adr->ext);
-		if (adr->street && *adr->street) gtk_html_stream_printf (html_stream, "%s<br>", adr->street);
-		if (adr->locality && *adr->locality) gtk_html_stream_printf (html_stream, "%s<br>", adr->locality);
-		if (adr->region && *adr->region) gtk_html_stream_printf (html_stream, "%s<br>", adr->region);
-		if (adr->code && *adr->code) gtk_html_stream_printf (html_stream, "%s<br>", adr->code);
-		if (adr->country && *adr->country) gtk_html_stream_printf (html_stream, "%s<br>", adr->country);
-
-		gtk_html_stream_printf (html_stream, "<a href=\"http://www.mapquest.com/\">%s</a>", _("Map It"));
-		gtk_html_stream_printf (html_stream, "</td></tr></table>");
-	}
-	if (adr)
-		e_contact_address_free (adr);
-}
-
-static void
-render_string (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field)
-{
-	const char *str;
-
-	str = e_contact_get_const (contact, field);
-
-	if (str && *str) {
-		char *html = e_text_to_html (str, 0);
-		gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>", html_label, str);
-		g_free (html);
-	}
-}
-
-static void
-render_url (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field)
-{
-	const char *str;
-	str = e_contact_get_const (contact, field);
-	if (str && *str) {
-		char *html = e_text_to_html (str, E_TEXT_TO_HTML_CONVERT_URLS);
-		gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>",
-					html_label, html);
-		g_free (html);
-	}
-}
-
-static void
-eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact)
-{
-	GtkHTMLStream *html_stream;
-
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
-	html_stream = gtk_html_begin (display->priv->html);
-	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
-	gtk_html_stream_write (html_stream, "<body>\n", 7);
-
-	if (contact) {
-		char *str, *html;
-		EContactPhoto *photo;
-
-		gtk_html_stream_printf (html_stream, "<table border=\"0\" valign=\"top\"><tr valign=\"top\"><td>");
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		if (photo) {
-			gtk_html_stream_printf (html_stream, "<img src=\"internal-contact-photo:\">");
-			e_contact_photo_free (photo);
-		}
-		
-		gtk_html_stream_printf (html_stream, "</td><td>\n");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (str) {
-			html = e_text_to_html (str, 0);
-			gtk_html_stream_printf (html_stream, "<h2>%s</h2>", html);
-			g_free (html);
-		}
-		else {
-			str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "<h2>%s</h2>", html);
-				g_free (html);
-			}
-		}
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-			GList *email_list;
-			GList *l;
-
-			gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr valign=\"top\"><td>");
-			gtk_html_stream_printf (html_stream, "<b>%s:</b>&nbsp;<td>", _("List Members"));
-
-			email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-			for (l = email_list; l; l = l->next) {
-				EABDestination *dest = eab_destination_import (l->data);
-				if (dest) {
-					const char *textrep = eab_destination_get_textrep (dest, TRUE);
-					char *html = e_text_to_html (textrep, 0);
-					gtk_html_stream_printf (html_stream, "%s<br>", html);
-					g_free (html);
-					g_object_unref (dest);
-				}
-			}
-			gtk_html_stream_printf (html_stream, "</td></tr></table>");
-		}
-		else {
-			render_string (html_stream, contact, _("Job Title"), E_CONTACT_TITLE);
-
-			render_string (html_stream, contact, _("Email"), E_CONTACT_EMAIL_1);
-			render_string (html_stream, contact, _("Email"), E_CONTACT_EMAIL_2);
-			render_string (html_stream, contact, _("Email"), E_CONTACT_EMAIL_3);
-
-
-			render_address (html_stream, contact, _("Home Address"),  E_CONTACT_ADDRESS_HOME,  E_CONTACT_ADDRESS_LABEL_HOME);
-			render_address (html_stream, contact, _("Work Address"),  E_CONTACT_ADDRESS_WORK,  E_CONTACT_ADDRESS_LABEL_WORK);
-			render_address (html_stream, contact, _("Other Address"), E_CONTACT_ADDRESS_OTHER, E_CONTACT_ADDRESS_LABEL_OTHER);
-
-			gtk_html_stream_printf (html_stream, "<hr>");
-
-			render_url (html_stream, contact, _("Home page"), E_CONTACT_HOMEPAGE_URL);
-			render_url (html_stream, contact, _("Blog"), E_CONTACT_BLOG_URL);
-
-		}
-
-		gtk_html_stream_printf (html_stream, "</td></tr></table>\n");
-	}
-
-	gtk_html_stream_write (html_stream, "</body></html>\n", 15);
-	gtk_html_end (display->priv->html, html_stream, GTK_HTML_STREAM_OK);
-}
-
-static void
-eab_contact_display_render_compact (EABContactDisplay *display, EContact *contact)
-{
-	GtkHTMLStream *html_stream;
-
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
-	html_stream = gtk_html_begin (display->priv->html);
-	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
-	gtk_html_stream_write (html_stream, "<body>\n", 7);
-
-	if (contact) {
-		char *str, *html;
-		EContactPhoto *photo;
-
-		gtk_html_stream_printf (html_stream,
-					"<table width=\"100%%\" cellpadding=1 cellspacing=0 bgcolor=\"#000000\">"
-					"<tr><td>"
-					"<table width=\"100%%\" cellpadding=0 cellspacing=0 bgcolor=\"#eeeeee\">"
-					"<tr><td>"
-					"<table>"
-					"<tr valign=\"top\"><td>");
-
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		if (photo) {
-			int calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION;
-			GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
-			GdkPixbuf *pixbuf;
-
-			/* figure out if we need to downscale the
-			   image here.  we don't scale the pixbuf
-			   itself, just insert width/height tags in
-			   the html */
-			gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
-			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-			gdk_pixbuf_loader_close (loader, NULL);
-			g_object_unref (loader);
-			if (pixbuf) {
-				int max_dimension = gdk_pixbuf_get_height (pixbuf);
-				if (max_dimension < gdk_pixbuf_get_width (pixbuf))
-					max_dimension = gdk_pixbuf_get_width (pixbuf);
-
-				calced_width = (float)gdk_pixbuf_get_width (pixbuf) / max_dimension * MAX_COMPACT_IMAGE_DIMENSION;
-				calced_height = (float)gdk_pixbuf_get_height (pixbuf) / max_dimension * MAX_COMPACT_IMAGE_DIMENSION;
-
-				calced_width = MIN (calced_width, MAX_COMPACT_IMAGE_DIMENSION);
-				calced_height = MIN (calced_height, MAX_COMPACT_IMAGE_DIMENSION);
-			}
-
-			gdk_pixbuf_unref (pixbuf);
-			gtk_html_stream_printf (html_stream, "<img width=\"%d\" height=\"%d\" src=\"internal-contact-photo:\">",
-						calced_width, calced_height);
-			e_contact_photo_free (photo);
-		}
-		
-		gtk_html_stream_printf (html_stream, "</td><td>\n");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (str) {
-			html = e_text_to_html (str, 0);
-			gtk_html_stream_printf (html_stream, "<b>%s</b>", html);
-			g_free (html);
-		}
-		else {
-			str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "<b>%s</b>", html);
-				g_free (html);
-			}
-		}
-
-		gtk_html_stream_write (html_stream, "<hr>", 4);
-		
-		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-			GList *email_list;
-			GList *l;
-
-			gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr valign=\"top\"><td>");
-			gtk_html_stream_printf (html_stream, "<b>%s:</b>&nbsp;<td>", _("List Members"));
-
-			email_list = e_contact_get (contact, E_CONTACT_EMAIL);
-			for (l = email_list; l; l = l->next) {
-				EABDestination *dest = eab_destination_import (l->data);
-				if (dest) {
-					const char *textrep = eab_destination_get_textrep (dest, TRUE);
-					char *html = e_text_to_html (textrep, 0);
-					gtk_html_stream_printf (html_stream, "%s, ", html);
-					g_free (html);
-					g_object_unref (dest);
-				}
-			}
-			gtk_html_stream_printf (html_stream, "</td></tr></table>");
-		}
-		else {
-			gboolean comma = FALSE;
-			str = e_contact_get_const (contact, E_CONTACT_TITLE);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>", _("Job Title"), str);
-				g_free (html);
-			}
-
-			gtk_html_stream_printf (html_stream, "<b>%s:</b> ", _("Email"));
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s", str);
-				g_free (html);
-				comma = TRUE;
-			}
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_2);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", str);
-				g_free (html);
-				comma = TRUE;
-			}
-			str = e_contact_get_const (contact, E_CONTACT_EMAIL_3);
-			if (str) {
-				html = e_text_to_html (str, 0);
-				gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", str);
-				g_free (html);
-			}
-			gtk_html_stream_write (html_stream, "<br>", 4);
-			
-			str = e_contact_get_const (contact, E_CONTACT_HOMEPAGE_URL);
-			if (str) {
-				html = e_text_to_html (str, E_TEXT_TO_HTML_CONVERT_URLS);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>",
-							_("Home page"), html);
-				g_free (html);
-			}
-
-			str = e_contact_get_const (contact, E_CONTACT_BLOG_URL);
-			if (str) {
-				html = e_text_to_html (str, E_TEXT_TO_HTML_CONVERT_URLS);
-				gtk_html_stream_printf (html_stream, "<b>%s:</b> %s<br>",
-							_("Blog"), html);
-			}
-		}
-
-		gtk_html_stream_printf (html_stream, "</td></tr></table></td></tr></table></td></tr></table>\n");
-	}
-
-	gtk_html_stream_write (html_stream, "</body></html>\n", 15);
-	gtk_html_end (display->priv->html, html_stream, GTK_HTML_STREAM_OK);
-}
-
-void
-eab_contact_display_render (EABContactDisplay *display, EContact *contact,
-			    EABContactDisplayRenderMode mode)
-{
-	switch (mode) {
-	case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
-		eab_contact_display_render_normal (display, contact);
-		break;
-	case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
-		eab_contact_display_render_compact (display, contact);
-		break;
-	}
-}
-
-GtkWidget*
-eab_contact_display_new (void)
-{
-	EABContactDisplay *display;
-
-	display = g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
-	
-	display->priv = g_new0 (EABContactDisplayPrivate, 1);
-
-	display->priv->html = GTK_HTML (gtk_html_new ());
-	
-	gtk_html_set_default_content_type (display->priv->html, "text/html; charset=utf-8");
-	
-	gtk_html_set_editable (display->priv->html, FALSE);
-
-
-	g_signal_connect (display->priv->html, "url_requested",
-			  G_CALLBACK (on_url_requested),
-			  display);
-	g_signal_connect (display->priv->html, "link_clicked",
-			  G_CALLBACK (on_link_clicked),
-			  display);
-#if 0
-	g_signal_connect (display->priv->html, "object_requested",
-			  G_CALLBACK (on_object_requested),
-			  mail_display);
-	g_signal_connect (display->priv->html, "button_press_event",
-			  G_CALLBACK (html_button_press_event), mail_display);
-	g_signal_connect (display->priv->html, "motion_notify_event",
-			  G_CALLBACK (html_motion_notify_event), mail_display);
-	g_signal_connect (display->priv->html, "enter_notify_event",
-			  G_CALLBACK (html_enter_notify_event), mail_display);
-	g_signal_connect (display->priv->html, "iframe_created",
-			  G_CALLBACK (html_iframe_created), mail_display);
-	g_signal_connect (display->priv->html, "on_url",
-			  G_CALLBACK (html_on_url), mail_display);
-#endif
-
-	gtk_box_pack_start_defaults (GTK_BOX (display), GTK_WIDGET (display->priv->html));
-	gtk_widget_show (GTK_WIDGET (display->priv->html));
-
-	return GTK_WIDGET (display);
-}
-
-
-static void
-eab_contact_display_init (GObject *object)
-{
-}
-
-static void
-eab_contact_display_class_init (GtkObjectClass *object_class)
-{
-	//	object_class->destroy = mail_display_destroy;
-}
-
-GType
-eab_contact_display_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (EABContactDisplayClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_contact_display_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABContactDisplay),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_contact_display_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "EABContactDisplay", &info, 0);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
deleted file mode 100644
index e7f47031ce..0000000000
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _EAB_CONTACT_DISPLAY_H_
-#define _EAB_CONTACT_DISPLAY_H_
-
-#include <gtk/gtkvbox.h>
-#include <gtkhtml/gtkhtml.h>
-#include <libebook/e-contact.h>
-
-#define EAB_TYPE_CONTACT_DISPLAY        (eab_contact_display_get_type ())
-#define EAB_CONTACT_DISPLAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplay))
-#define EAB_CONTACT_DISPLAY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayClass))
-#define IS_EAB_CONTACT_DISPLAY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_CONTACT_DISPLAY))
-#define IS_EAB_CONTACT_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_CONTACT_DISPLAY))
-
-typedef struct _EABContactDisplay EABContactDisplay;
-typedef struct _EABContactDisplayPrivate EABContactDisplayPrivate;
-typedef struct _EABContactDisplayClass EABContactDisplayClass;
-
-typedef enum {
-	EAB_CONTACT_DISPLAY_RENDER_NORMAL,  /* for use in the preview pane */
-	EAB_CONTACT_DISPLAY_RENDER_COMPACT  /* for use with embedded vcards (e.g, the EABVCardControl) */
-} EABContactDisplayRenderMode;
-
-struct _EABContactDisplay {
-	GtkVBox parent;
-	
-	EABContactDisplayPrivate *priv;
-};
-
-struct _EABContactDisplayClass {
-	GtkVBoxClass parent_class;
-};
-
-GtkType        eab_contact_display_get_type    (void);
-GtkWidget *    eab_contact_display_new         (void);
-
-void           eab_contact_display_render      (EABContactDisplay *display, EContact *contact,
-						EABContactDisplayRenderMode render_mode);
-
-#endif /* _EAB_CONTACT_DISPLAY_H_ */
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
deleted file mode 100644
index bd4ed78463..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ /dev/null
@@ -1,819 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include <gal/util/e-util.h>
-#include "eab-gui-util.h"
-#include "util/eab-book-util.h"
-#include "util/eab-destination.h"
-
-#include <gnome.h>
-
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-void
-eab_error_dialog (const gchar *msg, EBookStatus status)
-{
-	static char *status_to_string[] = {
-		N_("Success"),
-		N_("Unknown error"),
-		N_("Repository offline"),
-		N_("Permission denied"),
-		N_("Contact not found"),
-		N_("Contact ID already exists"),
-		N_("Protocol not supported"),
-		N_("Cancelled"),
-		N_("Authentication Failed"),
-		N_("Authentication Required"),
-		N_("TLS not Available"),
-		N_("Addressbook does not exist"),
-		N_("Other error")
-	};
-	char *error_msg;
-	GtkWidget *dialog;
-
-	error_msg = g_strdup_printf ("%s: %s", msg, _(status_to_string [status]));
-
-	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-					 error_msg);
-
-	g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-
-	gtk_widget_show (dialog);
-
-	g_free (error_msg);
-}
-
-gint
-eab_prompt_save_dialog (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-	gint response;
-
-	dialog = gtk_message_dialog_new (parent,
-					  (GtkDialogFlags)0,
-					  GTK_MESSAGE_QUESTION,
-					  GTK_BUTTONS_NONE,
-					 _("Do you want to save changes?"));
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				_("_Discard"), GTK_RESPONSE_NO,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_SAVE, GTK_RESPONSE_YES,
-				NULL);
-
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
-
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-	gtk_widget_destroy (dialog);
-
-	return response;
-}
-
-static void
-added_cb (EBook* book, EBookStatus status, const char *id,
-	  gboolean is_list)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (is_list ? _("Error adding list") : _("Error adding contact"), status);
-	}
-}
-
-static void
-modified_cb (EBook* book, EBookStatus status,
-	     gboolean is_list)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (is_list ? _("Error modifying list") : _("Error modifying contact"),
-				  status);
-	}
-}
-
-static void
-deleted_cb (EBook* book, EBookStatus status,
-	    gboolean is_list)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (is_list ? _("Error removing list") : _("Error removing contact"),
-				  status);
-	}
-}
-
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	g_object_unref (editor);
-}
-
-EContactEditor *
-eab_show_contact_editor (EBook *book, EContact *contact,
-			 gboolean is_new_contact,
-			 gboolean editable)
-{
-	EContactEditor *ce;
-
-	ce = e_contact_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "contact_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	return ce;
-}
-
-EContactListEditor *
-eab_show_contact_list_editor (EBook *book, EContact *contact,
-			      gboolean is_new_contact,
-			      gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = e_contact_list_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "list_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "list_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "list_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), GINT_TO_POINTER (TRUE));
-
-	e_contact_list_editor_show (ce);
-
-	return ce;
-}
-
-static void
-view_contacts (EBook *book, GList *list, gboolean editable)
-{
-	for (; list; list = list->next) {
-		EContact *contact = list->data;
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			eab_show_contact_list_editor (book, contact, FALSE, editable);
-		else
-			eab_show_contact_editor (book, contact, FALSE, editable);
-	}
-}
-
-void
-eab_show_multiple_contacts (EBook *book,
-			    GList *list,
-			    gboolean editable)
-{
-	if (list) {
-		int length = g_list_length (list);
-		if (length > 5) {
-			GtkWidget *dialog;
-			gint response;
-
-			dialog = gtk_message_dialog_new (NULL,
-							 0,
-							 GTK_MESSAGE_QUESTION,
-							 GTK_BUTTONS_YES_NO,
-							 _("Opening %d contacts will open %d new windows as well.\n"
-							   "Do you really want to display all of these contacts?"),
-							 length,
-							 length);
-
-			response = gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-			if (response == GTK_RESPONSE_YES)
-				view_contacts (book, list, editable);
-		} else {
-			view_contacts (book, list, editable);
-		}
-	}
-}
-
-
-static gint
-file_exists(GtkFileSelection *filesel, const char *filename)
-{
-	GtkWidget *dialog;
-	gint response;
-
-	dialog = gtk_message_dialog_new (GTK_WINDOW (filesel),
-					 0,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_NONE,
-					 _("%s already exists\nDo you want to overwrite it?"), filename);
-
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-				_("Overwrite"), GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	return response;
-}
-
-typedef struct {
-	GtkFileSelection *filesel;
-	char *vcard;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gint error = 0;
-	gint response = 0;
-	
-	const char *filename = gtk_file_selection_get_filename (info->filesel);
-
-	error = e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-
-	if (error == EEXIST) {
-		response = file_exists(info->filesel, filename);
-		switch (response) {
-			case GTK_RESPONSE_ACCEPT : /* Overwrite */
-				e_write_file(filename, info->vcard, O_WRONLY | O_CREAT | O_TRUNC);
-				break;
-			case GTK_RESPONSE_REJECT : /* cancel */
-				return;
-		}
-	} else if (error != 0) {
-		GtkWidget *dialog;
-		char *str;
-
-		str = g_strdup_printf (_("Error saving %s: %s"), filename, strerror(errno));
-		dialog = gtk_message_dialog_new (GTK_WINDOW (info->filesel),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 str);
-		g_free (str);
-
-		gtk_widget_show (dialog);
-		
-		return;
-	}
-	
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_widget_destroy (GTK_WIDGET (info->filesel));
-}
-
-static void
-destroy_it(void *data, GObject *where_the_object_was)
-{
-	SaveAsInfo *info = data;
-	g_free (info->vcard);
-	g_free (info);
-}
-
-static char *
-make_safe_filename (const char *prefix, char *name)
-{
-	char *safe, *p;
-
-	if (!name) {
-		/* This is a filename. Translators take note. */
-		name = _("card.vcf");
-	}
-
-	p = strrchr (name, '/');
-	if (p)
-		safe = g_strdup_printf ("%s%s%s", prefix, p, ".vcf");
-	else
-		safe = g_strdup_printf ("%s/%s%s", prefix, name, ".vcf");
-	
-	p = strrchr (safe, '/') + 1;
-	if (p)
-		e_filename_make_safe (p);
-	
-	return safe;
-}
-
-void
-eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
-{
-	GtkFileSelection *filesel;
-	char *file;
-	char *name;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	name = e_contact_get (contact, E_CONTACT_FILE_AS);
-	file = make_safe_filename (g_get_home_dir(), name);
-	gtk_file_selection_set_filename (filesel, file);
-	g_free (file);
-
-	info->filesel = filesel;
-	info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-	g_signal_connect(filesel->ok_button, "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(filesel->cancel_button, "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-
-	if (parent_window) {
-		gtk_window_set_transient_for (GTK_WINDOW (filesel),
-					      parent_window);
-		gtk_window_set_modal (GTK_WINDOW (filesel), TRUE);
-	}
-
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
-
-void
-eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	/* This is a filename. Translators take note. */
-	if (list && list->data && list->next == NULL) {
-		char *name, *file;
-		name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FILE_AS);
-		if (!name)
-			name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FULL_NAME);
-
-		file = make_safe_filename (g_get_home_dir(), name);
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	} else {
-		char *file;
-		file = make_safe_filename (g_get_home_dir(), _("list"));
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	}
-
-	info->filesel = filesel;
-	info->vcard = eab_contact_list_to_string (list);
-	
-	g_signal_connect(filesel->ok_button, "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(filesel->cancel_button, "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-
-	if (parent_window) {
-		gtk_window_set_transient_for (GTK_WINDOW (filesel),
-					      parent_window);
-		gtk_window_set_modal (GTK_WINDOW (filesel), TRUE);
-	}
-
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
-
-typedef struct ContactCopyProcess_ ContactCopyProcess;
-
-typedef void (*ContactCopyDone) (ContactCopyProcess *process);
-
-struct ContactCopyProcess_ {
-	int count;
-	GList *contacts;
-	EBook *source;
-	EBook *destination;
-	ContactCopyDone done_cb;
-};
-
-static void
-contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error removing contact"), status);
-	}
-}
-
-static void
-do_delete (gpointer data, gpointer user_data)
-{
-	EBook *book = user_data;
-	EContact *contact = data;
-
-	e_book_async_remove_contact(book, contact, contact_deleted_cb, NULL);
-}
-
-static void
-delete_contacts (ContactCopyProcess *process)
-{
-	g_list_foreach (process->contacts,
-			do_delete,
-			process->source);
-}
-
-static void
-process_unref (ContactCopyProcess *process)
-{
-	process->count --;
-	if (process->count == 0) {
-		if (process->done_cb) {
-			process->done_cb (process);
-		}
-		e_free_object_list(process->contacts);
-		g_object_unref (process->source);
-		g_object_unref (process->destination);
-		g_free (process);
-	}
-}
-
-static void
-contact_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	ContactCopyProcess *process = user_data;
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (_("Error adding contact"), status);
-	} else {
-		process_unref (process);
-	}
-}
-
-static void
-do_copy (gpointer data, gpointer user_data)
-{
-	EBook *book;
-	EContact *contact;
-	ContactCopyProcess *process;
-
-	process = user_data;
-	contact = data;
-
-	book = process->destination;
-
-	process->count ++;
-	e_book_async_add_contact(book, contact, contact_added_cb, process);
-}
-
-static void
-got_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ContactCopyProcess *process;
-	process = closure;
-	if (status == E_BOOK_ERROR_OK) {
-		process->destination = book;
-		g_object_ref (book);
-		g_list_foreach (process->contacts,
-				do_copy,
-				process);
-	}
-	process_unref (process);
-}
-
-void
-eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean delete_from_source, GtkWindow *parent_window)
-{
-#if 0
-	EBook *dest;
-	const char *allowed_types[] = { "contacts/*", NULL };
-	GNOME_Evolution_Folder *folder;
-	static char *last_uri = NULL;
-	ContactCopyProcess *process;
-	char *desc;
-
-	if (contacts == NULL)
-		return;
-
-	if (last_uri == NULL)
-		last_uri = g_strdup ("");
-
-	if (contacts->next == NULL) {
-		if (delete_from_source)
-			desc = _("Move contact to");
-		else
-			desc = _("Copy contact to");
-	} else {
-		if (delete_from_source)
-			desc = _("Move contacts to");
-		else
-			desc = _("Copy contacts to");
-	}
-
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   parent_window,
-						   desc, last_uri, allowed_types,
-						   &folder);
-
-	if (!folder)
-		return;
-
-	if (strcmp (last_uri, folder->evolutionUri) != 0) {
-		g_free (last_uri);
-		last_uri = g_strdup (folder->evolutionUri);
-	}
-
-	process = g_new (ContactCopyProcess, 1);
-	process->count = 1;
-	process->source = source;
-	g_object_ref (source);
-	process->contacts = contacts;
-	process->destination = NULL;
-
-	if (delete_from_source)
-		process->done_cb = delete_contacts;
-	else
-		process->done_cb = NULL;
-
-	dest = e_book_new ();
-	e_book_async_load_uri (dest, folder->physicalUri, got_book_cb, process);
-
-	CORBA_free (folder);
-#endif
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
-
-void
-eab_send_contact_list (GList *contacts, EABDisposition disposition)
-{
-#if notyet
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-
-	if (contacts == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	composer_server = bonobo_activation_activate_from_id (COMPOSER_OAFID, 0, NULL, &ev);
-
-	if (disposition == EAB_DISPOSITION_AS_TO) {
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		int to_i, bcc_i;
-		GList *iter;
-		gint to_length = 0, bcc_length = 0;
-
-		/* Figure out how many addresses of each kind we have. */
-		for (iter = contacts; iter != NULL; iter = g_list_next (iter)) {
-			EContact *contact = E_CONTACT (iter->data);
-			if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-				gint len = card->email ? e_list_length (card->email) : 0;
-				if (e_card_evolution_list_show_addresses (card))
-					to_length += len;
-				else
-					bcc_length += len;
-			} else {
-				if (card->email != NULL)
-					++to_length;
-			}
-		}
-
-		/* Now I have to make a CORBA sequences that represents a recipient list with
-		   the right number of entries, for the cards. */
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_length;
-		to_list->_length = to_length;
-		if (to_length > 0) {
-			to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to_length);
-		}
-
-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		cc_list->_maximum = cc_list->_length = 0;
-		
-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		bcc_list->_maximum = bcc_length;
-		bcc_list->_length = bcc_length;
-		if (bcc_length > 0) {
-			bcc_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc_length);
-		}
-
-		to_i = 0;
-		bcc_i = 0;
-		while (cards != NULL) {
-			ECard *card = cards->data;
-			EIterator *iterator;
-			gchar *name, *addr;
-			gboolean is_list, is_hidden, free_name_addr;
-			GNOME_Evolution_Composer_Recipient *recipient;
-
-			if (card->email != NULL) {
-
-				is_list = e_card_evolution_list (card);
-				is_hidden = is_list && !e_card_evolution_list_show_addresses (card);
-			
-				for (iterator = e_list_get_iterator (card->email); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-					
-					if (is_hidden) {
-						recipient = &(bcc_list->_buffer[bcc_i]);
-						++bcc_i;
-					} else {
-						recipient = &(to_list->_buffer[to_i]);
-						++to_i;
-					}
-					
-					name = "";
-					addr = "";
-					free_name_addr = FALSE;
-					if (e_iterator_is_valid (iterator)) {
-						
-						if (is_list) {
-							/* We need to decode the list entries, which are XMLified EABDestinations. */
-							EABDestination *dest = eab_destination_import (e_iterator_get (iterator));
-							if (dest != NULL) {
-								name = g_strdup (eab_destination_get_name (dest));
-								addr = g_strdup (eab_destination_get_email (dest));
-								free_name_addr = TRUE;
-								g_object_unref (dest);
-							}
-							
-						} else { /* is just a plain old card */
-							if (card->name)
-								name = e_card_name_to_string (card->name);
-							addr = g_strdup ((char *) e_iterator_get (iterator));
-							free_name_addr = TRUE;
-						}
-					}
-					
-					recipient->name    = CORBA_string_dup (name ? name : "");
-					recipient->address = CORBA_string_dup (addr ? addr : "");
-					
-					if (free_name_addr) {
-						g_free ((gchar *) name);
-						g_free ((gchar *) addr);
-					}
-					
-					/* If this isn't a list, we quit after the first (i.e. the default) address. */
-					if (!is_list)
-						break;
-					
-				}
-				g_object_unref (iterator);
-			}
-
-			cards = g_list_next (cards);
-		}
-
-		subject = CORBA_string_dup ("");
-
-		GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, subject, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	} else if (disposition == EAB_DISPOSITION_AS_ATTACHMENT) {
-		CORBA_char *content_type, *filename, *description;
-		GNOME_Evolution_Composer_AttachmentData *attach_data;
-		CORBA_boolean show_inline;
-		char *tempstr;
-
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		
-		content_type = CORBA_string_dup ("text/x-vcard");
-		filename = CORBA_string_dup ("");
-
-		if (cards->next) {
-			description = CORBA_string_dup (_("Multiple VCards"));
-		} else {
-			char *file_as;
-
-			g_object_get(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 = eab_contact_list_to_string (cards);
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
-		attach_data->_maximum = attach_data->_length = strlen (tempstr);
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-		strcpy (attach_data->_buffer, tempstr);
-		g_free (tempstr);
-
-		GNOME_Evolution_Composer_attachData (composer_server, 
-						     content_type, filename, description,
-						     show_inline, attach_data,
-						     &ev);
-	
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-	
-		CORBA_free (content_type);
-		CORBA_free (filename);
-		CORBA_free (description);
-		CORBA_free (attach_data);
-
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_list->_length = 0;
-		
-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		cc_list->_maximum = cc_list->_length = 0;
-
-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		bcc_list->_maximum = bcc_list->_length = 0;
-
-		if (!cards || cards->next) {
-			subject = CORBA_string_dup ("Contact information");
-		} else {
-			ECard *card = cards->data;
-			const gchar *tempstr2;
-
-			tempstr2 = NULL;
-			g_object_get(card,
-				     "file_as", &tempstr2,
-				     NULL);
-			if (!tempstr2 || !*tempstr2)
-				g_object_get(card,
-					     "full_name", &tempstr2,
-					     NULL);
-			if (!tempstr2 || !*tempstr2)
-				g_object_get(card,
-					     "org", &tempstr2,
-					     NULL);
-			if (!tempstr2 || !*tempstr2) {
-				EList *list;
-				EIterator *iterator;
-				g_object_get(card,
-					     "email", &list,
-					     NULL);
-				iterator = e_list_get_iterator (list);
-				if (e_iterator_is_valid (iterator)) {
-					tempstr2 = e_iterator_get (iterator);
-				}
-				g_object_unref (iterator);
-			}
-
-			if (!tempstr2 || !*tempstr2)
-				tempstr = g_strdup_printf ("Contact information");
-			else
-				tempstr = g_strdup_printf ("Contact information for %s", tempstr2);
-			subject = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-		}
-		
-		GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, subject, &ev);
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-#endif
-}
-
-void
-eab_send_contact (EContact *contact, EABDisposition disposition)
-{
-	GList *list;
-	list = g_list_prepend (NULL, contact);
-	eab_send_contact_list (list, disposition);
-	g_list_free (list);
-}
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
deleted file mode 100644
index 24a0a78577..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-gui-util.h
- * Copyright (C) 2001-2003  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_UTIL_H__
-#define __E_ADDRESSBOOK_UTIL_H__
-
-#include <gtk/gtkwindow.h>
-#include <libebook/e-book.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-G_BEGIN_DECLS
-
-void                eab_error_dialog              (const gchar *msg,
-						   EBookStatus  status);
-gint                eab_prompt_save_dialog        (GtkWindow   *parent);
-
-EContactEditor     *eab_show_contact_editor       (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-EContactListEditor *eab_show_contact_list_editor  (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-void                eab_show_multiple_contacts    (EBook       *book,
-						   GList       *list,
-						   gboolean     editable);
-void                eab_transfer_contacts         (EBook       *source,
-						   GList       *contacts, /* adopted */
-						   gboolean     delete_from_source,
-						   GtkWindow   *parent_window);
-
-void                eab_contact_save              (char *title,
-						   EContact *contact,
-						   GtkWindow *parent_window);
-
-void                eab_contact_list_save         (char *title,
-						   GList *list,
-						   GtkWindow *parent_window);
-
-typedef enum {
-	EAB_DISPOSITION_AS_ATTACHMENT,
-	EAB_DISPOSITION_AS_TO,
-} EABDisposition;
-
-void                eab_send_contact              (EContact       *contact,
-						   EABDisposition  disposition);
-void                eab_send_contact_list         (GList          *contacts,
-						   EABDisposition  disposition);
-
-G_END_DECLS
-
-#endif /* __E_ADDRESSBOOK_UTIL_H__ */
diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list
deleted file mode 100644
index 2b34707dbb..0000000000
--- a/addressbook/gui/widgets/eab-marshal.list
+++ /dev/null
@@ -1,11 +0,0 @@
-INT:POINTER
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:OBJECT
-NONE:ENUM
-NONE:INT,INT
-NONE:INT
-NONE:UINT
-NONE:DOUBLE
-INT:POINTER
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
deleted file mode 100644
index 6e2ad6a603..0000000000
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ /dev/null
@@ -1,1236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-popup-control.c
- *
- * Copyright (C) 2001-2003, Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 <string.h>
-#include "addressbook.h"
-#include "eab-popup-control.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 <libebook/e-book-async.h>
-#include <addressbook/util/eab-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/eab-contact-display.h>
-#include <addressbook/gui/widgets/eab-gui-util.h>
-#include "e-util/e-gui-utils.h"
-
-static void eab_popup_control_set_name (EABPopupControl *pop, const gchar *name);
-static void eab_popup_control_set_email (EABPopupControl *pop, const gchar *email);
-
-/*
- * 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_get_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_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 (gpointer closure, GObject *where_object_was)
-{
-	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 *bbox;
-
-	wiz->body          = gtk_vbox_new (FALSE, 2);
-	wiz->vbox          = gtk_vbox_new (FALSE, 2);
-	wiz->ok_button     = gtk_button_new_from_stock (GTK_STOCK_OK);
-	wiz->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-
-	wiz->ok_cb      = NULL;
-	wiz->cleanup_cb = NULL;
-	wiz->closure    = NULL;
-
-	wiz->destroy_cb      = NULL;
-	wiz->destroy_closure = NULL;
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox),
-				   GTK_BUTTONBOX_END);
-
-	gtk_box_pack_start (GTK_BOX (bbox), wiz->cancel_button, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (bbox), wiz->ok_button, FALSE, TRUE, 0);
-
-	gtk_box_set_spacing (GTK_BOX (bbox),
-			     10 /* ugh */);
-
-	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), bbox, FALSE, TRUE, 2);
-
-	gtk_widget_show_all (wiz->body);
-
-	g_signal_connect (wiz->ok_button,
-			  "clicked",
-			  G_CALLBACK (mini_wizard_ok_cb),
-			  wiz);
-	g_signal_connect (wiz->cancel_button,
-			  "clicked",
-			  G_CALLBACK (mini_wizard_cancel_cb),
-			  wiz);
-
-	g_object_weak_ref (G_OBJECT (wiz->body),
-			   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
- * contact.
- */
-
-#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 *) g_object_get_data (G_OBJECT (w), "addr");
-
-	menu->current_selection = addr;
-}
-
-static void
-email_menu_add_option (EMailMenu *menu, char *addr)
-{
-	GtkWidget *menu_item;
-
-	g_return_if_fail (menu != NULL);
-	if (addr == NULL)
-		return;
-
-	menu->options = g_list_append (menu->options, addr);
-
-	menu_item = gtk_menu_item_new_with_label (addr);
-	g_object_set_data (G_OBJECT (menu_item), "addr", addr);
-	gtk_widget_show_all (menu_item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu->option_menu))), menu_item);
-
-	g_signal_connect (menu_item,
-			  "activate",
-			  G_CALLBACK (menu_activate_cb),
-			  menu);
-}
-
-static void
-email_menu_add_options_from_contact (EMailMenu *menu, EContact *contact, const gchar *extra_addr)
-{
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-
-	/* 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_contact_get (contact, E_CONTACT_EMAIL_1));
-	email_menu_add_option (menu, e_contact_get (contact, E_CONTACT_EMAIL_2));
-	email_menu_add_option (menu, e_contact_get (contact, E_CONTACT_EMAIL_3));
-	email_menu_add_option (menu, g_strdup (extra_addr));
-	email_menu_add_option (menu, EMPTY_ENTRY);
-}
-
-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;
-	EContact *contact;
-	EMailMenu *primary;
-	EMailMenu *email2;
-	EMailMenu *email3;
-};
-
-static void
-email_table_cleanup_cb (gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	if (et == NULL)
-		return;
-
-	g_object_unref (et->contact);
-	email_menu_free (et->primary);
-	email_menu_free (et->email2);
-	email_menu_free (et->email3);
-
-	g_free (et);
-}
-
-static void
-email_table_from_contact (EMailTable *et)
-{
-	g_return_if_fail (et != NULL);
-
-	email_menu_set_option (et->primary, e_contact_get_const (et->contact, E_CONTACT_EMAIL_1));
-	email_menu_set_option (et->email2,  e_contact_get_const (et->contact, E_CONTACT_EMAIL_2));
-	email_menu_set_option (et->email3,  e_contact_get_const (et->contact, E_CONTACT_EMAIL_3));
-}
-
-static void
-email_table_to_contact (EMailTable *et)
-{
-	gchar *curr;
-
-	g_return_if_fail (et != NULL);
-
-	curr = et->primary->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_1, curr);
-
-	curr = et->email2->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_2, curr);
-
-	curr = et->email3->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_contact_set (et->contact, E_CONTACT_EMAIL_3, curr);
-}
-
-static void
-email_table_save_contact_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EContact *contact = E_CONTACT (closure);
-
-	if (status == E_BOOK_ERROR_OK) {
-		e_book_async_commit_contact (book, contact, NULL, NULL);
-	}
-	if (book)
-		g_object_unref (book);
-	g_object_unref (contact);
-}
-
-static void
-email_table_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	email_table_to_contact (et);
-
-	g_object_ref (et->contact);
-
-	addressbook_load_default_book (email_table_save_contact_cb, et->contact);
-
-	mini_wizard_destroy (wiz);
-}
-
-static void
-email_table_init (MiniWizard *wiz, EContact *contact, 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 (contact && E_IS_CONTACT (contact));
-
-	et = g_new (EMailTable, 1);
-
-	et->contact = contact;
-	g_object_ref (et->contact);
-
-	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_contact (et->primary, et->contact, extra_address);
-	email_menu_add_options_from_contact (et->email2,  et->contact, extra_address);
-	email_menu_add_options_from_contact (et->email3,  et->contact, extra_address);
-
-	email_table_from_contact (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_contact_get (et->contact, E_CONTACT_FULL_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 contacts
- * and decide which one you want to add the e-mail address to.
- */
-
-typedef struct _ContactPicker ContactPicker;
-struct _ContactPicker {
-	GtkWidget *body;
-	GtkWidget *list;
-	GtkListStore *model;
-	GList *contacts;
-	gchar *new_name;
-	gchar *new_email;
-
-	EContact *current_contact;
-};
-
-enum {
-	COLUMN_ACTION,
-	COLUMN_CONTACT
-};
-
-static void
-contact_picker_selection_changed (GtkTreeSelection *selection, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	ContactPicker *pick = (ContactPicker *) wiz->closure;
-	gboolean selected;
-	GtkTreeIter iter;
-
-	selected = gtk_tree_selection_get_selected (selection, NULL, &iter);
-
-	gtk_widget_set_sensitive (wiz->ok_button, selected);
-
-	if (selected) {
-		gtk_tree_model_get (GTK_TREE_MODEL (pick->model), &iter,
-				    COLUMN_CONTACT, &pick->current_contact,
-				    -1);
-	}
-	else {
-		pick->current_contact = NULL;
-	}
-}
-
-static void
-contact_picker_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	ContactPicker *pick = (ContactPicker *) closure;
-
-	if (pick->current_contact == NULL) {
-		e_contact_quick_add (pick->new_name, pick->new_email, NULL, NULL);
-		mini_wizard_destroy (wiz);
-	} else {
-		email_table_init (wiz, pick->current_contact, pick->new_email);
-	}
-}
-
-static void
-contact_picker_cleanup_cb (gpointer closure)
-{
-	ContactPicker *pick = (ContactPicker *) closure;
-
-	g_list_foreach (pick->contacts, (GFunc) g_object_unref, NULL);
-	g_list_free (pick->contacts);
-
-	g_free (pick->new_name);
-	g_free (pick->new_email);
-}
-
-static void
-free_str (gpointer      data,
-	  GObject      *where_the_object_was)
-{
-	g_free (data);
-}
-
-static void
-contact_picker_init (MiniWizard *wiz, const GList *contacts, const gchar *new_name, const gchar *new_email)
-{
-	ContactPicker *pick;
-	gchar *str;
-	GtkWidget *w;
-	GtkTreeIter iter;
-
-	pick = g_new (ContactPicker, 1);
-
-	pick->body  = gtk_vbox_new (FALSE, 2);
-
-	pick->model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
-
-	pick->list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (pick->model));
-
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (pick->list), TRUE);
-
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (pick->list),
-						     COLUMN_ACTION,
-						     _("Select an Action"),
-						     gtk_cell_renderer_text_new (),
-						     "text", COLUMN_ACTION,
-						     NULL);
-
-	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (pick->list)),
-				     GTK_SELECTION_SINGLE);
-
-	str = g_strdup_printf (_("Create a new contact \"%s\""), new_name);
-	gtk_list_store_append (pick->model, &iter);
-	gtk_list_store_set (pick->model, &iter,
-			    COLUMN_ACTION, str,
-			    COLUMN_CONTACT, NULL,
-			    -1);
-	g_object_weak_ref (G_OBJECT (pick->model), free_str, str);
-
-	pick->contacts = NULL;
-	while (contacts) {
-		EContact *contact = (EContact *) contacts->data;
-		gchar *name_str = e_contact_get (contact, E_CONTACT_FULL_NAME);
-
-		pick->contacts = g_list_append (pick->contacts, contact);
-		g_object_ref (contact);
-
-		str = g_strdup_printf (_("Add address to existing contact \"%s\""), name_str);
-		gtk_list_store_append (pick->model, &iter);
-		gtk_list_store_set (pick->model, &iter,
-				    COLUMN_ACTION, str,
-				    COLUMN_CONTACT, contact,
-				    -1);
-		g_free (name_str);
-
-		g_object_weak_ref (G_OBJECT (pick->model), free_str, str);
-
-		contacts = g_list_next (contacts);
-	}
-
-	pick->new_name  = g_strdup (new_name);
-	pick->new_email = g_strdup (new_email);
-
-	pick->current_contact = NULL;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-
-	/* Connect some signals & callbacks */
-
-	wiz->ok_cb      = contact_picker_ok_cb;
-	wiz->cleanup_cb = contact_picker_cleanup_cb;
-
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pick->list)),
-			  "changed", G_CALLBACK (contact_picker_selection_changed),
-			  wiz);
-
-	/* Build our widget */
-
-	w = gtk_label_new (new_email);
-	gtk_box_pack_start (GTK_BOX (pick->body), w, FALSE, TRUE, 3);
-
-	gtk_box_pack_start (GTK_BOX (pick->body), pick->list, 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 EABPopupControl widget begins here.
- */
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static GtkObjectClass *parent_class;
-
-static void eab_popup_control_dispose (GObject *);
-static void eab_popup_control_query   (EABPopupControl *);
-
-
-static void
-eab_popup_control_class_init (EABPopupControlClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = eab_popup_control_dispose;
-}
-
-static void
-eab_popup_control_init (EABPopupControl *pop)
-{
-	pop->transitory = TRUE;
-}
-
-static void
-eab_popup_control_cleanup (EABPopupControl *pop)
-{
-	if (pop->contact) {
-		g_object_unref (pop->contact);
-		pop->contact = NULL;
-	}
-
-	if (pop->scheduled_refresh) {
-		g_source_remove (pop->scheduled_refresh);
-		pop->scheduled_refresh = 0;
-	}
-
-	if (pop->query_tag) {
-#if notyet
-		e_book_simple_query_cancel (pop->book, pop->query_tag);
-#endif
-		pop->query_tag = 0;
-	}
-
-	if (pop->book) {
-		g_object_unref (pop->book);
-		pop->book = NULL;
-	}
-
-	g_free (pop->name);
-	pop->name = NULL;
-
-	g_free (pop->email);
-	pop->email = NULL;
-}
-
-static void
-eab_popup_control_dispose (GObject *obj)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (obj);
-
-	eab_popup_control_cleanup (pop);
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (obj);
-}
-
-GType
-eab_popup_control_get_type (void)
-{
-	static GType pop_type = 0;
-
-	if (!pop_type) {
-		static const GTypeInfo pop_info =  {
-			sizeof (EABPopupControlClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) eab_popup_control_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EABPopupControl),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) eab_popup_control_init,
-		};
-
-		pop_type = g_type_register_static (gtk_event_box_get_type (), "EABPopupControl", &pop_info, 0);
-	}
-
-	return pop_type;
-}
-
-static void
-eab_popup_control_refresh_names (EABPopupControl *pop)
-{
-	if (pop->name_widget) {
-		if (pop->name && *pop->name) {
-			gtk_label_set_text (GTK_LABEL (pop->name_widget), pop->name);
-			gtk_widget_show (pop->name_widget);
-		} else {
-			gtk_widget_hide (pop->name_widget);
-		}
-	}
-
-	if (pop->email_widget) {
-		if (pop->email && *pop->email) {
-			gtk_label_set_text (GTK_LABEL (pop->email_widget), pop->email);
-			gtk_widget_show (pop->email_widget);
-		} else {
-			gtk_widget_hide (pop->email_widget);
-		}
-	}
-
-	eab_popup_control_query (pop);
-}
-
-static gint
-refresh_timeout_cb (gpointer ptr)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (ptr);
-	eab_popup_control_refresh_names (pop);
-	pop->scheduled_refresh = 0;
-	return 0;
-}
-
-static void
-eab_popup_control_schedule_refresh (EABPopupControl *pop)
-{
-	if (pop->scheduled_refresh == 0)
-		pop->scheduled_refresh = g_timeout_add (20, refresh_timeout_cb, pop);
-}
-
-/* If we are handed something of the form "Foo <bar@bar.com>",
-   do the right thing. */
-static gboolean
-eab_popup_control_set_free_form (EABPopupControl *pop, const gchar *txt)
-{
-	gchar *lt, *gt = NULL;
-
-	g_return_val_if_fail (pop && EAB_IS_POPUP_CONTROL (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);
-		eab_popup_control_set_name (pop, name);
-		eab_popup_control_set_email (pop, email);
-
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-static void
-eab_popup_control_set_name (EABPopupControl *pop, const gchar *name)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	/* We only allow the name to be set once. */
-	if (pop->name)
-		return;
-
-	if (!eab_popup_control_set_free_form (pop, name)) {
-		pop->name = g_strdup (name);
-		if (pop->name)
-			g_strstrip (pop->name);
-	}
-
-	eab_popup_control_schedule_refresh (pop);
-}
-
-static void
-eab_popup_control_set_email (EABPopupControl *pop, const gchar *email)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	/* We only allow the e-mail to be set once. */
-	if (pop->email)
-		return;
-
-	if (!eab_popup_control_set_free_form (pop, email)) {
-		pop->email = g_strdup (email);
-		if (pop->email)
-			g_strstrip (pop->email);
-	}
-
-	eab_popup_control_schedule_refresh (pop);
-}
-
-void
-eab_popup_control_construct (EABPopupControl *pop)
-{
-	GtkWidget *vbox, *name_holder;
-	GdkColor color = { 0x0, 0xffff, 0xffff, 0xffff };
-
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (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);
-		g_object_unref (style);
-	}
-
-	pop->generic_view = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (pop->generic_view), name_holder);
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->generic_view, TRUE, TRUE, 0);
-	gtk_widget_show_all (pop->generic_view);
-
-	pop->query_msg = gtk_label_new (_("Querying Addressbook..."));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->query_msg, TRUE, TRUE, 0);
-	gtk_widget_show (pop->query_msg);
-
-	/* Build ContactDisplay */
-	pop->contact_display = eab_contact_display_new ();
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->contact_display, 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);
-}
-
-static GtkWidget *
-eab_popup_new (void)
-{
-	EABPopupControl *pop = g_object_new (EAB_TYPE_POPUP_CONTROL, NULL);
-	eab_popup_control_construct (pop);
-	return GTK_WIDGET (pop);
-}
-
-static void
-emit_event (EABPopupControl *pop, const char *event)
-{
-	if (pop->es) {
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_BOOLEAN);
-		BONOBO_ARG_SET_BOOLEAN (arg, TRUE);
-		bonobo_event_source_notify_listeners_full (pop->es,
-							   "GNOME/Evolution/Addressbook/AddressPopup",
-							   "Event",
-							   event,
-							   arg, NULL);
-		bonobo_arg_release (arg);
-	}	
-}
-
-static void
-contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_ERROR_OK) {
-		EABPopupControl *pop = EAB_POPUP_CONTROL (closure);
-		EContactEditor *ce = eab_show_contact_editor (book, pop->contact, FALSE, TRUE);
-		eab_popup_control_cleanup (pop);
-		emit_event (pop, "Destroy");
-		e_contact_editor_raise (ce);
-	}
-
-	if (book)
-		g_object_unref (book);
-}
-
-static void
-edit_contact_info_cb (GtkWidget *button, EABPopupControl *pop)
-{
-	emit_event (pop, "Hide");
-
-	addressbook_load_default_book (contact_editor_cb, pop);
-}
-
-static void
-eab_popup_control_display_contact (EABPopupControl *pop, EContact *contact)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	g_return_if_fail (pop->contact == NULL);
-
-	pop->contact = contact;
-	g_object_ref (pop->contact);
-
-	eab_contact_display_render (EAB_CONTACT_DISPLAY (pop->contact_display),
-				    contact,
-				    EAB_CONTACT_DISPLAY_RENDER_COMPACT);
-	gtk_widget_show (pop->contact_display);
-	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);
-	g_signal_connect (b,
-			  "clicked",
-			  G_CALLBACK (edit_contact_info_cb),
-			  pop);
-	gtk_widget_show (b);
-}
-
-static void
-add_contacts_cb (GtkWidget *button, EABPopupControl *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);
-
-	}
-	eab_popup_control_cleanup (pop);
-	emit_event (pop, "Destroy");
-}
-
-static void
-eab_popup_control_no_matches (EABPopupControl *pop)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	b = e_button_new_with_stock_icon (_("Add to Contacts"), "gtk-add");
-
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), b, TRUE, TRUE, 0);
-	g_signal_connect (b,
-			  "clicked",
-			  G_CALLBACK (add_contacts_cb),
-			  pop);
-	gtk_widget_show (b);
-}
-
-static void
-wizard_destroy_cb (MiniWizard *wiz, gpointer closure)
-{
-	gtk_widget_destroy (GTK_WIDGET (closure));
-}
-
-static void
-eab_popup_control_ambiguous_email_add (EABPopupControl *pop, const GList *contacts)
-{
-	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_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);
-
-	contact_picker_init (wiz, contacts, pop->name, pop->email);
-
-	eab_popup_control_cleanup (pop);
-	emit_event (pop, "Destroy");
-
-	gtk_container_add (GTK_CONTAINER (win), wiz->body);
-	gtk_widget_show_all (win);
-}
-
-static void
-eab_popup_control_multiple_matches (EABPopupControl *pop, const GList *contacts)
-{
-	pop->multiple_matches = TRUE;
-
-	eab_popup_control_ambiguous_email_add (pop, contacts);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*
- *  Addressbook Query Fun
- */
-
-static void
-name_only_query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABPopupControl *pop;
-
-	if (status != E_BOOK_ERROR_OK)
-		return;
-
-	pop = EAB_POPUP_CONTROL (closure);
-
-	pop->query_tag = 0;
-
-	if (contacts == NULL) {
-		eab_popup_control_no_matches (pop);
-	} else {
-		eab_popup_control_ambiguous_email_add (pop, contacts);
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABPopupControl *pop;
-
-	if (status != E_BOOK_ERROR_OK)
-		return;
-
-	pop = EAB_POPUP_CONTROL (closure);
-
-	pop->query_tag = 0;
-	gtk_widget_hide (pop->query_msg);
-
-	if (contacts == 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 = eab_name_and_email_query (book, pop->name, NULL, name_only_query_cb, pop);
-		} else {
-			eab_popup_control_no_matches (pop);
-		}
-		
-	} else {
-		if (g_list_length ((GList *) contacts) == 1)
-			eab_popup_control_display_contact (pop, E_CONTACT (contacts->data));
-		else
-			eab_popup_control_multiple_matches (pop, contacts);
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-	}
-}
-
-static void
-start_query (EBook *book, EBookStatus status, gpointer closure)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (closure);
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_popup_control_no_matches (pop);
-		if (book)
-			g_object_unref (book);
-		return;
-	}
-	
-#if notyet
-	if (pop->query_tag)
-		e_book_simple_query_cancel (book, pop->query_tag);
-#endif
-
-	if (pop->book != book) {
-		g_object_ref (book);
-		if (pop->book)
-			g_object_unref (pop->book);
-		pop->book = book;
-	}
-		
-	pop->query_tag = eab_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
-
-	g_object_unref (pop);
-}
-
-static void
-eab_popup_control_query (EABPopupControl *pop)
-{
-	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
-
-	g_object_ref (pop);
-
-	addressbook_load_default_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)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		eab_popup_control_set_name (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case PROPERTY_EMAIL:
-		eab_popup_control_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)
-{
-	EABPopupControl *pop = EAB_POPUP_CONTROL (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 ();
-	}
-}
-
-BonoboControl *
-eab_popup_control_new (void)
-{
-        BonoboControl *control;
-        BonoboPropertyBag *bag;
-	EABPopupControl *addy;
-	GtkWidget *w;
-
-	w = eab_popup_new ();
-	addy = EAB_POPUP_CONTROL (w);
-
-	control = bonobo_control_new (w);
-	gtk_widget_show (w);
-
-        bag = bonobo_property_bag_new (get_prop, set_prop, w);
-        bonobo_property_bag_add (bag, "name", PROPERTY_NAME,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-        bonobo_property_bag_add (bag, "email", PROPERTY_EMAIL,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-	bonobo_property_bag_add (bag, "transitory", PROPERTY_TRANSITORY,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-
-        bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (bag)), NULL);
-        bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	addy->es = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				     BONOBO_OBJECT (addy->es));
-
-        return control;
-}
diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h
deleted file mode 100644
index 2feb3ac7d0..0000000000
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-popup-control.h
- *
- * Copyright (C) 2001-2003, Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_POPUP_CONTROL_H__
-#define __EAB_POPUP_CONTROL_H__
-
-#include <bonobo/bonobo-event-source.h>
-#include <gtk/gtk.h>
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-#define EAB_TYPE_POPUP_CONTROL        (eab_popup_control_get_type ())
-#define EAB_POPUP_CONTROL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_POPUP_CONTROL, EABPopupControl))
-#define EAB_POPUP_CONTROL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EAB_TYPE_POPUP_CONTROL, EABPopupControlClass))
-#define EAB_IS_POPUP_CONTROL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_POPUP_CONTROL))
-#define EAB_IS_POPUP_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_POPUP_CONTROL))
-
-typedef struct _EABPopupControl EABPopupControl;
-typedef struct _EABPopupControlClass EABPopupControlClass;
-
-struct _EABPopupControl {
-	GtkEventBox parent;
-
-	gchar *name;
-	gchar *email;
-
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *query_msg;
-	
-	GtkWidget *main_vbox;
-	GtkWidget *generic_view;
-	GtkWidget *contact_display;
-
-	gboolean transitory;
-
-	guint scheduled_refresh;
-	EBook *book;
-	guint query_tag;
-	gboolean multiple_matches;
-	EContact *contact;
-
-	BonoboEventSource *es;
-};
-
-struct _EABPopupControlClass {
-	GtkEventBoxClass parent_class;
-};
-
-GType eab_popup_control_get_type (void);
-
-void eab_popup_control_construct (EABPopupControl *);
-
-BonoboControl *eab_popup_control_new (void);
-
-G_END_DECLS
-
-#endif /* __EAB_POPUP_CONTROL_H__ */
-
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
deleted file mode 100644
index c161333f15..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * eab-vcard-control.c
- *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *    Chris Lahey <clahey@ximian.com>
- *    Chris Toshok <toshok@ximian.com>
- */
-
-#include <config.h>
-#include <string.h>
-
-#include <gtk/gtk.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 <gal/util/e-util.h>
-
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/gui/widgets/eab-contact-display.h>
-#include <addressbook/util/eab-book-util.h>
-
-#include "eab-vcard-control.h"
-#include "eab-contact-merging.h"
-
-typedef struct {
-	EABContactDisplay *display;
-	GList *card_list;
-	GtkWidget *label;
-	EABContactDisplayRenderMode render_mode;
-} EABVCardControl;
-
-#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	GList *list;
-	char *vcard;
-	EABVCardControl *vcard_control = data;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	e_free_object_list (vcard_control->card_list);
-	list = eab_contact_list_from_string (vcard);
-	g_free(vcard);
-	vcard_control->card_list = list;
-	if (list) {
-		eab_contact_display_render (vcard_control->display, E_CONTACT (list->data),
-					    vcard_control->render_mode);
-	}
-	if (list && list->next) {
-		char *message;
-		int length = g_list_length (list) - 1;
-		if (length > 1) {
-			message = g_strdup_printf (_("and %d other contacts."), length);
-		} else {
-			message = g_strdup_printf (_("and one other contact."));
-		}
-		gtk_label_set_text (GTK_LABEL (vcard_control->label), message);
-		g_free (message);
-		gtk_widget_show (vcard_control->label);
-	} else {
-		gtk_widget_hide (vcard_control->label);
-	}
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EABVCardControl *vcard_control = data;
-	char             *vcard;
-	int               length;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	vcard = eab_contact_list_to_string (vcard_control->card_list);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = closure;
-	if (status == E_BOOK_ERROR_OK) {
-		GList *p;
-		for (p = list; p; p = p->next) {
-			/* XXX argh, more passing of NULL's for callbacks */
-			eab_merging_book_add_contact (book, E_CONTACT (p->data), NULL, NULL);
-		}
-	}
-	if (book)
-		g_object_unref (book);
-	e_free_object_list (list);
-}
-
-static void
-save_in_addressbook(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	GList *list, *p;
-
-	list = g_list_copy (vcard_control->card_list);
-
-	for (p = list; p; p = p->next)
-		g_object_ref (p->data);
-
-	addressbook_load_default_book (book_open_cb, list);
-}
-
-static void
-toggle_full_vcard(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	char *label;
-
-	if (!vcard_control->card_list)
-		return;
-
-	if (vcard_control->render_mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-		label = _("Show Full VCard");
-	}
-	else {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
-		label = _("Show Compact VCard");
-	}
-
-	gtk_button_set_label (GTK_BUTTON (button), label);
-	eab_contact_display_render (vcard_control->display, E_CONTACT (vcard_control->card_list->data),
-				    vcard_control->render_mode);
-}
-
-static void
-free_struct (gpointer data, GObject *where_object_was)
-{
-	EABVCardControl *vcard_control = data;
-	e_free_object_list (vcard_control->card_list);
-	g_free (vcard_control);
-}
-
-BonoboControl *
-eab_vcard_control_new (void)
-{
-	BonoboControl       *control;
-	BonoboPersistStream *stream;
-	GtkWidget	    *display;
-	GtkWidget           *button1, *button2;
-	GtkWidget           *label;
-	GtkWidget           *table;
-
-	EABVCardControl    *vcard_control = g_new (EABVCardControl, 1);
-
-	printf ("inside eab_vcard_control_new\n");
-
-	vcard_control->card_list = NULL;
-	vcard_control->display = NULL;
-	vcard_control->label = NULL;
-
-	vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-
-	/* Create the control. */
-
-	display = eab_contact_display_new ();
-	gtk_widget_show (display);
-	vcard_control->display = EAB_CONTACT_DISPLAY (display);
-
-	/* This is intentionally not shown. */
-	label = gtk_label_new ("");
-	vcard_control->label = label;
-
-	button1 = gtk_button_new_with_label(_("Show Full VCard"));
-	g_signal_connect (button1, "clicked",
-			  G_CALLBACK (toggle_full_vcard), vcard_control);
-	gtk_widget_show (button1);
-
-	button2 = gtk_button_new_with_label(_("Save in addressbook"));
-	g_signal_connect (button2, "clicked",
-			  G_CALLBACK (save_in_addressbook), vcard_control);
-	gtk_widget_show (button2);
-
-	table = gtk_table_new (6, 6, FALSE);
-	gtk_table_attach (GTK_TABLE (table), display, 0, 6, 3, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 3, 2, 3, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), button1, 0, 1, 1, 2, 0, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), button2, 1, 2, 1, 2, 0, 0, 0, 0);
-	gtk_widget_show (table);
-
-	control = bonobo_control_new (table);
-
-	g_object_weak_ref (G_OBJECT (control), free_struct, vcard_control);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_content_types,
-					    VCARD_CONTROL_ID,
-					    vcard_control);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return control;
-}
diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h
deleted file mode 100644
index 5f6643c1ca..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __EAB_VCARD_CONTROL_H__
-#define __EAB_VCARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *eab_vcard_control_new (void);
-
-#endif /* __EAB_VCARD_CONTROL_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 212ac79b53..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ /dev/null
@@ -1,85 +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-i18n.h>
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE GAL_VIEW_FACTORY_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_class_init      (GObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_minicard_parent_class    = g_type_class_ref (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;
-}
-
-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 (g_object_new (GAL_TYPE_VIEW_FACTORY_MINICARD, NULL));
-}
-
-/**
- * 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);
-}
-
-E_MAKE_TYPE(gal_view_factory_minicard, "GalViewFactoryMinicard", GalViewFactoryMinicard, gal_view_factory_minicard_class_init, gal_view_factory_minicard_init, PARENT_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 02eea99e47..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_TYPE_VIEW_FACTORY_MINICARD        (gal_view_factory_minicard_get_type ())
-#define GAL_VIEW_FACTORY_MINICARD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicard))
-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicardClass))
-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_FACTORY_MINICARD))
-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_FACTORY_MINICARD))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryMinicard;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryMinicardClass;
-
-/* Standard functions */
-GType           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-factory-treeview.c b/addressbook/gui/widgets/gal-view-factory-treeview.c
deleted file mode 100644
index b14c8dec59..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-treeview.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8
-       -*- */
-/*
- * gal-view-factory-treeview.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include "gal-view-factory-treeview.h"
-#include "gal-view-treeview.h"
-
-#define PARENT_TYPE GAL_VIEW_FACTORY_TYPE
-
-static GalViewFactoryClass *gal_view_factory_treeview_parent_class;
-
-static const char *
-gal_view_factory_treeview_get_title       (GalViewFactory *factory)
-{
-	return _("GTK Tree View");
-}
-
-static GalView *
-gal_view_factory_treeview_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_treeview_new(name);
-}
-
-static const char *
-gal_view_factory_treeview_get_type_code (GalViewFactory *factory)
-{
-	return "treeview";
-}
-
-static void
-gal_view_factory_treeview_class_init      (GObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_treeview_parent_class    = g_type_class_ref (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_treeview_get_title;
-	view_factory_class->new_view            = gal_view_factory_treeview_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_treeview_get_type_code;
-}
-
-static void
-gal_view_factory_treeview_init            (GalViewFactoryTreeView *factory)
-{
-}
-
-/**
- * gal_view_treeview_new
- *
- * A new GalViewFactory for creating TreeView views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryTreeView.
- */
-GalViewFactory *
-gal_view_factory_treeview_new        (void)
-{
-	return gal_view_factory_treeview_construct (g_object_new (GAL_TYPE_VIEW_FACTORY_TREEVIEW, NULL));
-}
-
-/**
- * gal_view_treeview_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryTreeView.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryTreeView.
- */
-GalViewFactory *
-gal_view_factory_treeview_construct  (GalViewFactoryTreeView *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
-
-E_MAKE_TYPE(gal_view_factory_treeview, "GalViewFactoryTreeView", GalViewFactoryTreeView, gal_view_factory_treeview_class_init, gal_view_factory_treeview_init, PARENT_TYPE)
diff --git a/addressbook/gui/widgets/gal-view-factory-treeview.h b/addressbook/gui/widgets/gal-view-factory-treeview.h
deleted file mode 100644
index 4795c6d3aa..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-treeview.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-treeview.c: A View Factory
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_TREEVIEW_H_
-#define _GAL_VIEW_FACTORY_TREEVIEW_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_TYPE_VIEW_FACTORY_TREEVIEW        (gal_view_factory_treeview_get_type ())
-#define GAL_VIEW_FACTORY_TREEVIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_TREEVIEW, GalViewFactoryTreeView))
-#define GAL_VIEW_FACTORY_TREEVIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_FACTORY_TREEVIEW, GalViewFactoryTreeViewClass))
-#define GAL_IS_VIEW_FACTORY_TREEVIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_FACTORY_TREEVIEW))
-#define GAL_IS_VIEW_FACTORY_TREEVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_FACTORY_TREEVIEW))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryTreeView;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryTreeViewClass;
-
-/* Standard functions */
-GType           gal_view_factory_treeview_get_type   (void);
-GalViewFactory *gal_view_factory_treeview_new        (void);
-GalViewFactory *gal_view_factory_treeview_construct  (GalViewFactoryTreeView *factory);
-
-#endif /* _GAL_VIEW_FACTORY_TREEVIEW_H_ */
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
deleted file mode 100644
index da60497cdb..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.c: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-minicard.h"
-#include <libxml/parser.h>
-#include <gal/util/e-xml-utils.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-#define d(x) x
-
-static GalViewClass *gal_view_minicard_parent_class;
-
-static void
-gal_view_minicard_edit            (GalView *view, GtkWindow *parent_window)
-{
-	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */
-}
-
-static void  
-gal_view_minicard_load (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *root = xmlDocGetRootElement(doc);
-		GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);
-		xmlFreeDoc(doc);
-	}
-}
-
-static void
-gal_view_minicard_save (GalView *view,
-			const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode (NULL, "EMinicardViewState");
-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_MINICARD (view)->column_width);
-	xmlDocSetRootElement(doc, root);
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-}
-
-static const char *
-gal_view_minicard_get_title       (GalView *view)
-{
-	return GAL_VIEW_MINICARD(view)->title;
-}
-
-static void
-gal_view_minicard_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_MINICARD(view)->title);
-	GAL_VIEW_MINICARD(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_minicard_get_type_code (GalView *view)
-{
-	return "minicard";
-}
-
-static GalView *
-gal_view_minicard_clone       (GalView *view)
-{
-	GalViewMinicard *gvm, *new;
-
-	gvm = GAL_VIEW_MINICARD(view);
-
-	new               = g_object_new (GAL_TYPE_VIEW_MINICARD, NULL);
-	new->title        = g_strdup (gvm->title);
-	new->column_width = gvm->column_width;
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_dispose         (GObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-
-	if (view->title != NULL) {
-		gal_view_minicard_detach (view);
-		g_free(view->title);
-		view->title = NULL;
-	}
-
-	if (G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose)
-		(* G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose) (object);
-}
-
-static void
-gal_view_minicard_class_init      (GObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_minicard_parent_class  = g_type_class_ref (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->dispose         = gal_view_minicard_dispose      ;
-}
-
-static void
-gal_view_minicard_init      (GalViewMinicard *gvm)
-{
-	gvm->title = NULL;
-	gvm->column_width = 150.0;
-
-	gvm->emvw = NULL;
-	gvm->emvw_column_width_changed_id = 0;
-}
-
-/**
- * gal_view_minicard_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewMinicard.  This is primarily for use by
- * GalViewFactoryMinicard.
- *
- * Returns: The new GalViewMinicard.
- */
-GalView *
-gal_view_minicard_new (const gchar *title)
-{
-	return gal_view_minicard_construct (g_object_new (GAL_TYPE_VIEW_MINICARD, NULL), 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);
-}
-
-GType
-gal_view_minicard_get_type        (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (GalViewMinicardClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) gal_view_minicard_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (GalViewMinicard),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) gal_view_minicard_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalViewMinicard", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-column_width_changed (EMinicardViewWidget *w, double width, GalViewMinicard *view)
-{
-	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
-	if (view->column_width != width) {
-		view->column_width = width;
-		gal_view_changed(GAL_VIEW(view));
-	}
-}
-
-void
-gal_view_minicard_attach (GalViewMinicard *view, EMinicardViewWidget *emvw)
-{
-	gal_view_minicard_detach (view);
-
-	view->emvw = emvw;
-
-	g_object_ref (view->emvw);
-
-	g_object_set (view->emvw,
-		      "column_width", view->column_width,
-		      NULL);
-
-	view->emvw_column_width_changed_id =
-		g_signal_connect(view->emvw, "column_width_changed",
-				 G_CALLBACK (column_width_changed), view);
-}
-
-void
-gal_view_minicard_detach (GalViewMinicard *view)
-{
-	if (view->emvw == NULL)
-		return;
-	if (view->emvw_column_width_changed_id) {
-		g_signal_handler_disconnect (view->emvw,
-					     view->emvw_column_width_changed_id);
-		view->emvw_column_width_changed_id = 0;
-	}
-	g_object_unref (view->emvw);
-	view->emvw = NULL;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index e586012f73..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,45 +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 <gal/menus/gal-view.h>
-#include <e-minicard-view-widget.h>
-
-#define GAL_TYPE_VIEW_MINICARD        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_MINICARD, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_MINICARD, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_MINICARD))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_MINICARD))
-
-typedef struct {
-	GalView              base;
-
-	char                *title;
-	double               column_width;
-
-	EMinicardViewWidget *emvw;
-	guint                emvw_column_width_changed_id;
-} GalViewMinicard;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GType    gal_view_minicard_get_type   (void);
-GalView *gal_view_minicard_new        (const gchar         *title);
-GalView *gal_view_minicard_construct  (GalViewMinicard     *view,
-				       const gchar         *title);
-void     gal_view_minicard_attach     (GalViewMinicard     *view,
-				       EMinicardViewWidget *emvw);
-void     gal_view_minicard_detach     (GalViewMinicard     *view);
-
-#endif /* _GAL_VIEW_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-treeview.c b/addressbook/gui/widgets/gal-view-treeview.c
deleted file mode 100644
index e18ae6341b..0000000000
--- a/addressbook/gui/widgets/gal-view-treeview.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-treeview.c: An TreeView View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-treeview.h"
-#include <libxml/parser.h>
-#include <gal/util/e-xml-utils.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-#define d(x) x
-
-static GalViewClass *gal_view_treeview_parent_class;
-
-static void
-gal_view_treeview_edit            (GalView *view, GtkWindow *parent_window)
-{
-	/* GalViewTreeView *treeview_view = GAL_VIEW_TREEVIEW(view); */
-}
-
-static void  
-gal_view_treeview_load (GalView *view,
-			const char *filename)
-{
-#if 0
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *root = xmlDocGetRootElement(doc);
-		GAL_VIEW_TREEVIEW (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);
-		xmlFreeDoc(doc);
-	}
-#endif
-}
-
-static void
-gal_view_treeview_save (GalView *view,
-			const char *filename)
-{
-#if 0
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode (NULL, "ETreeViewViewState");
-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_TREEVIEW (view)->column_width);
-	xmlDocSetRootElement(doc, root);
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-#endif
-}
-
-static const char *
-gal_view_treeview_get_title       (GalView *view)
-{
-	return GAL_VIEW_TREEVIEW(view)->title;
-}
-
-static void
-gal_view_treeview_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_TREEVIEW(view)->title);
-	GAL_VIEW_TREEVIEW(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_treeview_get_type_code (GalView *view)
-{
-	return "treeview";
-}
-
-static GalView *
-gal_view_treeview_clone       (GalView *view)
-{
-	GalViewTreeView *gvm, *new;
-
-	gvm = GAL_VIEW_TREEVIEW(view);
-
-	new               = g_object_new (GAL_TYPE_VIEW_TREEVIEW, NULL);
-	new->title        = g_strdup (gvm->title);
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_treeview_dispose         (GObject *object)
-{
-	GalViewTreeView *view = GAL_VIEW_TREEVIEW(object);
-
-	if (view->title != NULL) {
-		gal_view_treeview_detach (view);
-		g_free(view->title);
-		view->title = NULL;
-	}
-
-	if (G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose)
-		(* G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose) (object);
-}
-
-static void
-gal_view_treeview_class_init      (GObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_treeview_parent_class  = g_type_class_ref (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_treeview_edit         ;
-	gal_view_class->load          = gal_view_treeview_load         ;
-	gal_view_class->save          = gal_view_treeview_save         ;
-	gal_view_class->get_title     = gal_view_treeview_get_title    ;
-	gal_view_class->set_title     = gal_view_treeview_set_title    ;
-	gal_view_class->get_type_code = gal_view_treeview_get_type_code;
-	gal_view_class->clone         = gal_view_treeview_clone        ;
-
-	object_class->dispose         = gal_view_treeview_dispose      ;
-}
-
-static void
-gal_view_treeview_init      (GalViewTreeView *gvm)
-{
-	gvm->title = NULL;
-
-	gvm->tree = NULL;
-}
-
-/**
- * gal_view_treeview_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewTreeView.  This is primarily for use by
- * GalViewFactoryTreeView.
- *
- * Returns: The new GalViewTreeView.
- */
-GalView *
-gal_view_treeview_new (const gchar *title)
-{
-	return gal_view_treeview_construct (g_object_new (GAL_TYPE_VIEW_TREEVIEW, NULL), title);
-}
-
-/**
- * gal_view_treeview_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewTreeView.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewTreeView.
- */
-GalView *
-gal_view_treeview_construct  (GalViewTreeView *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GType
-gal_view_treeview_get_type        (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info =  {
-			sizeof (GalViewTreeViewClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) gal_view_treeview_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (GalViewTreeView),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) gal_view_treeview_init,
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalViewTreeView", &info, 0);
-	}
-
-	return type;
-}
-
-#if 0
-static void
-column_width_changed (ETable *table, double width, GalViewMinicard *view)
-{
-	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
-	if (view->column_width != width) {
-		view->column_width = width;
-		gal_view_changed(GAL_VIEW(view));
-	}
-}
-#endif
-
-void
-gal_view_treeview_attach (GalViewTreeView *view, GtkTreeView *tree)
-{
-#if 0
-	gal_view_treeview_detach (view);
-
-	view->emvw = emvw;
-
-	g_object_ref (view->emvw);
-
-	g_object_set (view->emvw,
-		      "column_width", view->column_width,
-		      NULL);
-
-	view->emvw_column_width_changed_id =
-		g_signal_connect(view->emvw, "column_width_changed",
-				 G_CALLBACK (column_width_changed), view);
-#endif
-}
-
-void
-gal_view_treeview_detach (GalViewTreeView *view)
-{
-#if 0
-	if (view->emvw == NULL)
-		return;
-	if (view->emvw_column_width_changed_id) {
-		g_signal_handler_disconnect (view->emvw,
-					     view->emvw_column_width_changed_id);
-		view->emvw_column_width_changed_id = 0;
-	}
-	g_object_unref (view->emvw);
-	view->emvw = NULL;
-#endif
-}
diff --git a/addressbook/gui/widgets/gal-view-treeview.h b/addressbook/gui/widgets/gal-view-treeview.h
deleted file mode 100644
index a0313856a6..0000000000
--- a/addressbook/gui/widgets/gal-view-treeview.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-treeview.h: An TreeView View
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_TREEVIEW_H_
-#define _GAL_VIEW_TREEVIEW_H_
-
-#include <gal/menus/gal-view.h>
-#include <gtk/gtktreeview.h>
-
-#define GAL_TYPE_VIEW_TREEVIEW        (gal_view_treeview_get_type ())
-#define GAL_VIEW_TREEVIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_TREEVIEW, GalViewTreeView))
-#define GAL_VIEW_TREEVIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_TREEVIEW, GalViewTreeViewClass))
-#define GAL_IS_VIEW_TREEVIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_TREEVIEW))
-#define GAL_IS_VIEW_TREEVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_TREEVIEW))
-
-typedef struct {
-	GalView              base;
-
-	char                *title;
-
-	GtkTreeView         *tree;
-} GalViewTreeView;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewTreeViewClass;
-
-/* Standard functions */
-GType    gal_view_treeview_get_type   (void);
-GalView *gal_view_treeview_new        (const gchar         *title);
-GalView *gal_view_treeview_construct  (GalViewTreeView     *view,
-				       const gchar         *title);
-void     gal_view_treeview_attach     (GalViewTreeView     *view,
-				       GtkTreeView *tree);
-void     gal_view_treeview_detach     (GalViewTreeView     *view);
-
-#endif /* _GAL_VIEW_TREEVIEW_H_ */
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
deleted file mode 100644
index 66f003fe2c..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-
-#include "config.h"
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-static void destroy_callback(gpointer data, GObject *where_object_was)
-{
-  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 );
-  g_object_get(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;
-	g_object_get(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 );
-  g_signal_connect( canvas, "reflow",
-		    G_CALLBACK ( 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 */
-  g_object_weak_ref (app, destroy_callback, app);
-
-  g_signal_connect( canvas, "size_allocate",
-		    G_CALLBACK ( 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 8da93df0b8..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-ecpsdir    = $(privdatadir)/ecps
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES =				\
-	libecontactprint.la
-
-libecontactprint_la_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 =	\
-	libecontactprint.la					\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	libecontactprint.la					\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
-
-
-EXTRA_DIST = 		\
-	$(glade_DATA)	\
-	$(ecps_DATA)
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index c7bd68163f..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <time.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 9.5)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_utf8_sized (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	gnome_print_setfont(pc, font);
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static gint
-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, EContact *contact, gboolean as_return)
-{
-	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_contact_get(contact, E_CONTACT_ADDRESS_LABEL_WORK);
-	linelist = ecpe_break(address);
-	if (as_return)
-		font = gnome_font_find ("Sans", 9);
-	else
-		font = gnome_font_find ("Sans", 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);
-	g_object_unref(font);
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-}
-
-static void
-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	GnomePrintConfig *config;
-	EContact *contact = NULL;
-	GtkWidget *preview;
-
-	contact = g_object_get_data(G_OBJECT(dialog), "contact");
-
-	switch( button ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
-		master = gnome_print_job_new (config);
-		pc = gnome_print_job_get_context( master );
-
-		ecpe_print(pc, contact, FALSE);
-		
-		gnome_print_job_print(master);
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
-		master = gnome_print_job_new (config);
-		pc = gnome_print_job_get_context( master );
-
-		ecpe_print(pc, contact, FALSE);
-		
-		preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-		g_object_unref(contact);
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_envelope_dialog_new(EContact *contact)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(contact);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_signal_connect(dialog,
-			 "clicked", G_CALLBACK(e_contact_print_envelope_button), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(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;
-	EContact *contact;
-
-	if (list == NULL)
-		return NULL;
-
-	dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(list->data);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_signal_connect(dialog,
-			 "clicked", G_CALLBACK(e_contact_print_envelope_button), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(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 a7a8492638..0000000000
--- a/addressbook/printing/e-contact-print-envelope.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-#include <gtk/gtkwidget.h>
-#include <libebook/e-contact.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(EContact *contact);
-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 436aaddff0..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-contact-print-style-editor.h"
-
-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);
-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);
-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy        (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD
-};
-
-GtkType
-e_contact_print_style_editor_get_type (void)
-{
-  static GtkType contact_print_style_editor_type = 0;
-
-  if (!contact_print_style_editor_type)
-    {
-      static const GtkTypeInfo contact_print_style_editor_info =
-      {
-        "EContactPrintStyleEditor",
-        sizeof (EContactPrintStyleEditor),
-        sizeof (EContactPrintStyleEditorClass),
-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,
-        (GtkObjectInitFunc) e_contact_print_style_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
-    }
-
-  return contact_print_style_editor_type;
-}
-
-static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkVBoxClass *vbox_class;
-
-  object_class = (GtkObjectClass*) klass;
-  vbox_class = (GtkVBoxClass *) klass;
-
-  parent_class = gtk_type_class (gtk_vbox_get_type ());
-  
-  object_class->set_arg = e_contact_print_style_editor_set_arg;
-  object_class->get_arg = e_contact_print_style_editor_get_arg;
-  object_class->destroy = e_contact_print_style_editor_destroy;
-}
-
-#if 0
-static void
-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
-{
-	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
-			 left, right, top, bottom,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-}
-#endif
-
-static void
-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
-{
-	GladeXML *gui;
-
-	/*   e_contact_print_style_editor->card = NULL;*/
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL, 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);
-
-	if (e_contact_print_style_editor->gui != NULL) {
-		g_object_unref(e_contact_print_style_editor->gui);
-		e_contact_print_style_editor->gui = NULL;
-	}
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-GtkWidget*
-e_contact_print_style_editor_new (char *filename)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));
-	return widget;
-}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-	
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
-	switch (arg_id) {
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
deleted file mode 100644
index e4604d551c..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gtk/gtkvbox.h>
-#include <glade/glade.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactPrintStyleEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
- */
-
-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-
-
-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;
-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;
-
-struct _EContactPrintStyleEditor
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-};
-
-struct _EContactPrintStyleEditorClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType    e_contact_print_style_editor_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
deleted file mode 100644
index b7082b41f6..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <glib.h>
-#include <libgnomeprint/gnome-font.h>
-
-typedef struct _EContactPrintStyle EContactPrintStyle;
-typedef enum _EContactPrintType EContactPrintType;
-
-enum _EContactPrintType {
-	E_CONTACT_PRINT_TYPE_CARDS,
-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,
-	E_CONTACT_PRINT_TYPE_PHONE_LIST
-};
-
-struct _EContactPrintStyle
-{
-	gchar *title;
-	EContactPrintType type;
-	gboolean sections_start_new_page;
-	guint num_columns;
-	guint blank_forms;
-	gboolean letter_tabs;
-	gboolean letter_headings;
-	GnomeFont *headings_font;
-	GnomeFont *body_font;
-	gboolean print_using_grey;
-	gint paper_type;
-	gdouble paper_width;
-	gdouble paper_height;
-	gint paper_source;
-	gdouble top_margin;
-	gdouble left_margin;
-	gdouble bottom_margin;
-	gdouble right_margin;
-	gint page_size;
-	gdouble page_width;
-	gdouble page_height;
-	gboolean orientation_portrait;
-	GnomeFont *header_font;
-	gchar *left_header;
-	gchar *center_header;
-	gchar *right_header;
-	GnomeFont *footer_font;
-	gchar *left_footer;
-	gchar *center_footer;
-	gchar *right_footer;
-	gboolean reverse_on_even_pages;
-};
-
-#endif /* E_CONTACT_PRINT_TYPES_H */
-
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
deleted file mode 100644
index 1a9b83c62d..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-print.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-font.h>
-#include <libgnomeprint/gnome-print-job.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libebook/e-book-async.h>
-#include <libebook/e-contact.h>
-#include <addressbook/util/eab-destination.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintJob     *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 *contacts;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_utf8(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_utf8(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_utf8_sized(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_utf8(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_utf8(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_utf8(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_utf8(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	unsigned char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_utf8(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_utf8(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_utf8(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	gnome_print_beginpage (ctxt->pc, NULL);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_contact_size(EContact *contact, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	const 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;
-
-	file_as = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-
-	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_CONTACT_FILE_AS; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_contact_get(contact, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_contact_pretty_name (field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-
-	/* g_message ("%s %g", e_card_simple_get (simple, E_CARD_SIMPLE_FIELD_FILE_AS), height); */
-	return height;
-}
-
-
-static void
-e_contact_print_contact (EContact *contact, 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;
-
-	file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
-	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);
-	g_free (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_CONTACT_FILE_AS; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_contact_get(contact, field);
-
-		if (string && !strncmp (string, "<?xml", 4)) {
-			EABDestination *dest = eab_destination_import (string);
-			if (dest != NULL) {
-				gchar *new_string = g_strdup (eab_destination_get_address (dest));
-				g_free (string);
-				string = new_string;
-				g_object_unref (dest);
-			}
-		}
-
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_contact_pretty_name (field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_contact_pretty_name (field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EBookViewStatus status, EContactPrintContext *ctxt)
-{
-	GList *contacts = ctxt->contacts;
-
-	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;
-
-	gnome_print_beginpage (ctxt->pc, NULL);
-
-	for(; contacts; contacts = contacts->next) {
-		EContact *contact = contacts->data;
-		guchar *file_as;
-		gchar *letter_str = NULL;
-
-		file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
-
-		if (file_as != NULL) {
-			letter_str = g_strndup (file_as, g_utf8_next_char (file_as) - (gchar *) file_as);
-		}
-		if ( file_as && (!ctxt->character || g_utf8_collate (ctxt->character, letter_str) != 0) ) {
-			g_free (ctxt->character);
-			ctxt->character = g_strdup (letter_str);
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_contact_size(contact, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_contact_size(contact, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		g_free (letter_str);
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_contact(contact, ctxt);
-		ctxt->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(ctxt->character);
-	if (book_view)
-		g_object_unref(book_view);
-	if (ctxt->type == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_job_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_job_print(ctxt->master);
-	}
-	g_object_unref(ctxt->pc);
-	g_object_unref(ctxt->master);
-	if (ctxt->book)
-		g_object_unref(ctxt->book);
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->contacts, (GFunc) g_object_unref, NULL);
-	g_list_free(ctxt->contacts);
-	g_object_unref(ctxt->style->headings_font);
-	g_object_unref(ctxt->style->body_font);
-	g_object_unref(ctxt->style->header_font);
-	g_object_unref(ctxt->style->footer_font);
-	g_object_unref(ctxt->letter_heading_font);
-	g_object_unref(ctxt->letter_tab_font);
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-contact_compare (EContact *contact1, EContact *contact2)
-{
-	if (contact1 && contact2) {
-		const char *file_as1, *file_as2;
-		file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS);
-		file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS);
-
-		if (file_as1 && file_as2)
-			return g_utf8_collate(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_contact_get_const(contact1, E_CONTACT_UID), e_contact_get_const(contact2, E_CONTACT_UID));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_contact(EBookView *book_view, const GList *contacts, EContactPrintContext *ctxt)
-{
-	for(; contacts; contacts = contacts->next) {
-		EContact *contact = contacts->data;
-		g_object_ref(contact);
-		ctxt->contacts = g_list_insert_sorted(ctxt->contacts, contact, (GCompareFunc) contact_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	g_object_ref(book_view);
-
-	g_signal_connect(book_view,
-			 "contacts_added",
-			 G_CALLBACK(create_contact),
-			 ctxt);
-
-	g_signal_connect(book_view,
-			 "sequence_complete",
-			 G_CALLBACK(complete_sequence),
-			 ctxt);
-
-	e_book_view_start (book_view);
-}
-
-static void
-e_contact_do_print_contacts (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_async_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-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_contacts( book, query, ctxt);
-		break;
-	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_find_from_full_name( data );
-		if ( font ) {
-			g_object_unref(*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_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOLD, FALSE, 8);
-	style->body_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-
-	style->header_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-
-	style->footer_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->children; 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_response(GtkWidget *dialog, gint response_id, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintJob *master;
-	GnomePrintConfig *config;
-	GnomePrintContext *pc;
-	gboolean uses_book = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "uses_book"));
-	gboolean uses_list = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "uses_list"));
-	EBook *book = NULL;
-	char *query = NULL;
-	EContact *contact = NULL;
-	GList *contact_list = NULL;
-	gdouble font_size;
-
-
-	if (uses_book) {
-		book = g_object_get_data(G_OBJECT(dialog), "book");
-		query = g_object_get_data(G_OBJECT(dialog), "query");
-	}
-	else if (uses_list) {
-		contact_list = g_object_get_data(G_OBJECT(dialog), "contact_list");
-	}
-	else {
-		contact = g_object_get_data(G_OBJECT(dialog), "contact");
-	}
-	switch( response_id ) {
-	case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
-		master = gnome_print_job_new( config );
-		pc = gnome_print_job_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_DIALOG_RESPONSE_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-		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));
-#endif
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->contacts = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		}
-		else if (uses_list) {
-			ctxt->contacts = contact_list;
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		else {
-			ctxt->contacts = g_list_append(NULL, contact);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		gtk_widget_destroy (dialog);
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
-		config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
-		master = gnome_print_job_new( config );
-		pc = gnome_print_job_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_DIALOG_RESPONSE_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-		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));
-#endif
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->contacts = NULL;
-			g_object_ref(book);
-			e_contact_do_print(book, ctxt->query, ctxt);
-		}
-		else if (uses_list) {
-			ctxt->contacts = g_list_copy (contact_list);
-			g_list_foreach (ctxt->contacts, (GFunc)g_object_ref, NULL);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		else {
-			ctxt->contacts = g_list_append(NULL, contact);
-			g_object_ref(contact);
-			complete_sequence(NULL, E_BOOK_VIEW_STATUS_OK, ctxt);
-		}
-		break;
-	case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
-		if (uses_book)
-			g_object_unref(book);
-		else if (uses_list)
-			e_free_object_list (contact_list);
-		else
-			g_object_unref(contact);
-		g_free(query);
-		gtk_widget_destroy (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(NULL, _("Print contacts"), 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);
-
-	g_object_ref(book);
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (TRUE));
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (FALSE));
-	g_object_set_data(G_OBJECT(dialog), "book", book);
-	g_object_set_data(G_OBJECT(dialog), "query", g_strdup(query));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_close), NULL);
-	return dialog;
-}
-
-void
-e_contact_print_preview(EBook *book, char *query)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintJob *master;
-	GnomePrintContext *pc;
-	GnomePrintConfig *config;
-	gdouble font_size;
-
-	master = gnome_print_job_new(NULL);
-	config = gnome_print_job_get_config (master);
-	gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1);
-	pc = gnome_print_job_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_DIALOG_RESPONSE_PREVIEW;
-
-	font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-	ctxt->letter_heading_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-	ctxt->letter_tab_font = gnome_font_find (gnome_font_get_name(ctxt->style->headings_font), font_size);
-
-		ctxt->pc = pc;
-#warning FIXME gnome_print_multipage_new_from_sizes
-#if 0
-	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));
-#endif
-	ctxt->book = book;
-	ctxt->query = g_strdup(query);
-	ctxt->contacts = NULL;
-	g_object_ref(book);
-	e_contact_do_print(book, ctxt->query, ctxt);
-}
-
-GtkWidget *
-e_contact_print_contact_dialog_new(EContact *contact)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new(NULL, _("Print contact"), GNOME_PRINT_DIALOG_COPIES);
-
-	contact = e_contact_duplicate(contact);
-	g_object_set_data(G_OBJECT(dialog), "contact", contact);
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (FALSE));
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (FALSE));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_contact_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	GList *copied_list;
-	GList *l;
-
-	if (list == NULL)
-		return NULL;
-
-	copied_list = g_list_copy (list);
-	for (l = copied_list; l; l = l->next)
-		l->data = e_contact_duplicate (E_CONTACT (l->data));
-
-	dialog = gnome_print_dialog_new(NULL, _("Print contact"), GNOME_PRINT_DIALOG_COPIES);
-
-	g_object_set_data(G_OBJECT(dialog), "contact_list", copied_list);
-	g_object_set_data(G_OBJECT(dialog), "uses_list", GINT_TO_POINTER (TRUE));
-	g_object_set_data(G_OBJECT(dialog), "uses_book", GINT_TO_POINTER (FALSE));
-	g_signal_connect(dialog,
-			 "response", G_CALLBACK(e_contact_print_response), NULL);
-	g_signal_connect(dialog,
-			 "close", G_CALLBACK(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 d1721e3509..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2018 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
-
-<glade-interface>
-  <widget class="GtkDialog" id="print-edit-style">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">Page Setup:</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">no</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="homogeneous">no</property>
-        <property name="spacing">8</property>
-        <property name="visible">yes</property>
-
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <property name="spacing">8</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkButton" id="button1">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="button2">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-apply</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="button3">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">no</property>
-            <property name="fill">yes</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkVBox" id="vbox-contact-print-style-editor">
-            <property name="homogeneous">no</property>
-            <property name="spacing">5</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkHBox" id="hbox2">
-                <property name="border_width">5</property>
-                <property name="homogeneous">no</property>
-                <property name="spacing">16</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkLabel" id="label8">
-                    <property name="label" translatable="yes">Style name:</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkEntry" id="label-style-name">
-                    <property name="can_focus">yes</property>
-                    <property name="editable">no</property>
-                    <property name="text" translatable="yes"></property>
-                    <property name="max-length">0</property>
-                    <property name="visibility">yes</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-
-            <child>
-              <widget class="GtkNotebook" id="notebook1">
-                <property name="can_focus">yes</property>
-                <property name="show_tabs">yes</property>
-                <property name="show_border">yes</property>
-                <property name="tab_pos">GTK_POS_TOP</property>
-                <property name="scrollable">no</property>
-                <property name="tab_hborder">2</property>
-                <property name="tab_vborder">2</property>
-                <property name="enable-popup">no</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkVBox" id="vbox2">
-                    <property name="border_width">5</property>
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">5</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame5">
-                            <property name="label" translatable="yes">Preview:</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <placeholder />
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkHBox" id="hbox1">
-                        <property name="homogeneous">yes</property>
-                        <property name="spacing">7</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame6">
-                            <property name="label" translatable="yes">Options</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkAlignment" id="alignment4">
-                                <property name="xalign">0</property>
-                                <property name="yalign">0</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkTable" id="table1">
-                                    <property name="border_width">8</property>
-                                    <property name="homogeneous">no</property>
-                                    <property name="row_spacing">0</property>
-                                    <property name="column_spacing">0</property>
-                                    <property name="n-rows">6</property>
-                                    <property name="n-columns">5</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label5">
-                                        <property name="label" translatable="yes">Include:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label4">
-                                        <property name="label" translatable="yes">Sections:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment2">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Immediately follow each other</property>
-                                            <property name="active">yes</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCheckButton" id="checkbutton1">
-                                        <property name="can_focus">yes</property>
-                                        <property name="label" translatable="yes">Letter tabs on side</property>
-                                        <property name="active">no</property>
-                                        <property name="draw_indicator">yes</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">4</property>
-                                        <property name="bottom_attach">5</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCheckButton" id="checkbutton2">
-                                        <property name="can_focus">yes</property>
-                                        <property name="label" translatable="yes">Headings for each letter</property>
-                                        <property name="active">no</property>
-                                        <property name="draw_indicator">yes</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">5</property>
-                                        <property name="bottom_attach">6</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment3">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Start on a new page</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label6">
-                                        <property name="label" translatable="yes">Number of columns:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label7">
-                                        <property name="label" translatable="yes">Blank forms at end:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment6">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkSpinButton" id="spinbutton2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">0</property>
-                                            <property name="numeric">no</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="wrap">no</property>
-                                            <property name="snap_to_ticks">no</property>
-                                            <property name="visible">yes</property>
-                                            <property name="adjustment">2 0 100 1 10 10</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment5">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkSpinButton" id="spinbutton1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="climb_rate">1</property>
-                                            <property name="digits">0</property>
-                                            <property name="numeric">no</property>
-                                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                            <property name="wrap">no</property>
-                                            <property name="width-request">45</property>
-                                            <property name="snap_to_ticks">no</property>
-                                            <property name="visible">yes</property>
-                                            <property name="adjustment">1 0 100 1 10 10</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="bottom_attach">3</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">2</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkVBox" id="vbox3">
-                            <property name="homogeneous">no</property>
-                            <property name="spacing">8</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkFrame" id="frame7">
-                                <property name="label" translatable="yes">Fonts</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkTable" id="table2">
-                                    <property name="border_width">8</property>
-                                    <property name="homogeneous">no</property>
-                                    <property name="row_spacing">13</property>
-                                    <property name="column_spacing">8</property>
-                                    <property name="n-rows">2</property>
-                                    <property name="n-columns">2</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment7">
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">1</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkButton" id="button6">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">F_ont...</property>
-                                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                                            <property name="visible">yes</property>
-                                            <property name="use_underline">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment8">
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">1</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkButton" id="button5">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">_Font...</property>
-                                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                                            <property name="width-request">90</property>
-                                            <property name="visible">yes</property>
-                                            <property name="use_underline">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkVBox" id="vbox4">
-                                        <property name="homogeneous">no</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label10">
-                                            <property name="label" translatable="yes">Headings</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry3">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes">10 pt. Tahoma</property>
-                                            <property name="width-request">100</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="bottom_attach">1</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">expand|fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkVBox" id="vbox5">
-                                        <property name="homogeneous">no</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label9">
-                                            <property name="label" translatable="yes">Body</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes">8 pt. Tahoma</property>
-                                            <property name="width-request">100</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="right_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_padding">0</property>
-                                        <property name="y_padding">0</property>
-                                        <property name="x_options">expand|fill</property>
-                                        <property name="y_options">fill</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">yes</property>
-                                <property name="fill">yes</property>
-                              </packing>
-                            </child>
-
-                            <child>
-                              <widget class="GtkFrame" id="frame8">
-                                <property name="label" translatable="yes">Shading</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkCheckButton" id="checkbutton3">
-                                    <property name="can_focus">yes</property>
-                                    <property name="label" translatable="yes">Print using gray shading</property>
-                                    <property name="active">no</property>
-                                    <property name="draw_indicator">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">yes</property>
-                                <property name="fill">yes</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label1">
-                    <property name="label" translatable="yes">Format</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkHBox" id="hbox3">
-                    <property name="homogeneous">yes</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkVBox" id="vbox6">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame9">
-                            <property name="label" translatable="yes">Paper</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox16">
-                                <property name="border_width">10</property>
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox17">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label21">
-                                        <property name="label" translatable="yes">Type:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                                        <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkTreeView" id="clist1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="headers-visible">no</property>
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkLabel" id="label26">
-                                                <property name="child_name">CList:title</property>
-                                                <property name="label" translatable="yes">label26</property>
-                                                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                                <property name="wrap">no</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="yalign">0.5</property>
-                                                <property name="xpad">0</property>
-                                                <property name="ypad">0</property>
-                                                <property name="visible">yes</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="hscrollbar">
-                                          <widget class="GtkHScrollbar" id="convertwidget1">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="vscrollbar">
-                                          <widget class="GtkVScrollbar" id="convertwidget2">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox18">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label24">
-                                        <property name="label" translatable="yes">Dimensions:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox5">
-                                        <property name="homogeneous">yes</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label27">
-                                            <property name="label" translatable="yes">Width:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry9">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label28">
-                                            <property name="label" translatable="yes">Height:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry10">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox19">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label25">
-                                        <property name="label" translatable="yes">Paper source:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkCombo" id="combo1">
-                                        <property name="value_in_list">no</property>
-                                        <property name="case_sensitive">no</property>
-                                        <property name="enable_arrow_keys">yes</property>
-                                        <property name="enable_arrows_always">no</property>
-                                        <property name="allow_empty">yes</property>
-                                        <property name="visible">yes</property>
-
-                                        <child internal-child="entry">
-                                          <widget class="GtkEntry" id="combo-entry1">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="list">
-                                          <widget class="GtkList" id="convertwidget3">
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkListItem" id="convertwidget4">
-                                                <property name="visible">yes</property>
-
-                                                <child>
-                                                  <widget class="GtkLabel" id="convertwidget5">
-                                                    <property name="label" translatable="yes"></property>
-                                                    <property name="xalign">0.0</property>
-                                                    <property name="visible">yes</property>
-                                                  </widget>
-                                                </child>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame10">
-                            <property name="label" translatable="yes">Margins</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkTable" id="table4">
-                                <property name="border_width">15</property>
-                                <property name="homogeneous">yes</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">9</property>
-                                <property name="n-rows">2</property>
-                                <property name="n-columns">4</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label29">
-                                    <property name="label" translatable="yes">Top:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label30">
-                                    <property name="label" translatable="yes">Bottom:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label31">
-                                    <property name="label" translatable="yes">Left:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry11">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry12">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry13">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry14">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="width-request">1</property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">expand|fill</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label32">
-                                    <property name="label" translatable="yes">Right:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_padding">0</property>
-                                    <property name="y_padding">0</property>
-                                    <property name="x_options">fill</property>
-                                    <property name="y_options">expand|fill</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkVBox" id="vbox7">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame11">
-                            <property name="label" translatable="yes">Page</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox8">
-                                <property name="border_width">10</property>
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox20">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label33">
-                                        <property name="label" translatable="yes">Size:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                                        <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkTreeView" id="clist2">
-                                            <property name="can_focus">yes</property>
-                                            <property name="headers-visible">no</property>
-                                            <property name="visible">yes</property>
-
-                                            <child>
-                                              <widget class="GtkLabel" id="label35">
-                                                <property name="child_name">CList:title</property>
-                                                <property name="label" translatable="yes">label26</property>
-                                                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                                <property name="wrap">no</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="yalign">0.5</property>
-                                                <property name="xpad">0</property>
-                                                <property name="ypad">0</property>
-                                                <property name="visible">yes</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="hscrollbar">
-                                          <widget class="GtkHScrollbar" id="convertwidget6">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-
-                                        <child internal-child="vscrollbar">
-                                          <widget class="GtkVScrollbar" id="convertwidget7">
-                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox21">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">0</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkLabel" id="label34">
-                                        <property name="label" translatable="yes">Dimensions:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                        <property name="wrap">no</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="xpad">0</property>
-                                        <property name="ypad">0</property>
-                                        <property name="visible">yes</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">no</property>
-                                        <property name="fill">no</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox6">
-                                        <property name="homogeneous">yes</property>
-                                        <property name="spacing">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label36">
-                                            <property name="label" translatable="yes">Width:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry15">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkLabel" id="label37">
-                                            <property name="label" translatable="yes">Height:</property>
-                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                            <property name="wrap">no</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="yalign">0.5</property>
-                                            <property name="xpad">0</property>
-                                            <property name="ypad">0</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">no</property>
-                                            <property name="fill">no</property>
-                                          </packing>
-                                        </child>
-
-                                        <child>
-                                          <widget class="GtkEntry" id="entry16">
-                                            <property name="can_focus">yes</property>
-                                            <property name="editable">yes</property>
-                                            <property name="text" translatable="yes"></property>
-                                            <property name="width-request">1</property>
-                                            <property name="max-length">0</property>
-                                            <property name="visibility">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="padding">0</property>
-                                            <property name="expand">yes</property>
-                                            <property name="fill">yes</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkFrame" id="frame12">
-                            <property name="label" translatable="yes">Orientation</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkHBox" id="hbox4">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">10</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <placeholder />
-                                </child>
-
-                                <child>
-                                  <widget class="GtkVBox" id="vbox9">
-                                    <property name="homogeneous">no</property>
-                                    <property name="spacing">5</property>
-                                    <property name="visible">yes</property>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment9">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">1</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton3">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Portrait</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment10">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <property name="visible">yes</property>
-
-                                        <child>
-                                          <widget class="GtkRadioButton" id="radiobutton4">
-                                            <property name="can_focus">yes</property>
-                                            <property name="label" translatable="yes">Landscape</property>
-                                            <property name="active">no</property>
-                                            <property name="draw_indicator">yes</property>
-                                            <property name="visible">yes</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="padding">0</property>
-                                        <property name="expand">yes</property>
-                                        <property name="fill">yes</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">yes</property>
-                                    <property name="fill">yes</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">yes</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label2">
-                    <property name="label" translatable="yes">Paper</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkVBox" id="vbox10">
-                    <property name="border_width">8</property>
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkTable" id="table5">
-                        <property name="homogeneous">yes</property>
-                        <property name="row_spacing">4</property>
-                        <property name="column_spacing">4</property>
-                        <property name="n-rows">4</property>
-                        <property name="n-columns">3</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment15">
-                            <property name="xalign">0</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkButton" id="button11">
-                                <property name="can_focus">yes</property>
-                                <property name="label" translatable="yes">F_ont...</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="visible">yes</property>
-                                <property name="use_underline">yes</property>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text10">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">expand|fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text11">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text12">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text13">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">expand|fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text14">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">5</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkTextView" id="text15">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">no</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
-                            <property name="height-request">50</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment16">
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox14">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label14">
-                                    <property name="label" translatable="yes">Header</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry7">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment17">
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">1</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkVBox" id="vbox15">
-                                <property name="homogeneous">no</property>
-                                <property name="spacing">0</property>
-                                <property name="visible">yes</property>
-
-                                <child>
-                                  <widget class="GtkLabel" id="label15">
-                                    <property name="label" translatable="yes">Footer:</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">no</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-
-                                <child>
-                                  <widget class="GtkEntry" id="entry8">
-                                    <property name="can_focus">yes</property>
-                                    <property name="editable">yes</property>
-                                    <property name="text" translatable="yes"></property>
-                                    <property name="max-length">0</property>
-                                    <property name="visibility">yes</property>
-                                    <property name="visible">yes</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">no</property>
-                                    <property name="fill">no</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="right_attach">1</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">expand|fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-
-                        <child>
-                          <widget class="GtkAlignment" id="alignment14">
-                            <property name="xalign">0</property>
-                            <property name="yalign">1</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <widget class="GtkButton" id="button10">
-                                <property name="can_focus">yes</property>
-                                <property name="label" translatable="yes">_Font...</property>
-                                <property name="relief">GTK_RELIEF_NORMAL</property>
-                                <property name="visible">yes</property>
-                                <property name="use_underline">yes</property>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="bottom_attach">1</property>
-                            <property name="x_padding">0</property>
-                            <property name="y_padding">0</property>
-                            <property name="x_options">fill</property>
-                            <property name="y_options">fill</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkHBox" id="hbox7">
-                        <property name="homogeneous">no</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">yes</property>
-
-                        <child>
-                          <widget class="GtkToolbar" id="toolbar1">
-                            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-                            <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
-                            <property name="visible">yes</property>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-
-                            <child>
-                              <placeholder />
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">yes</property>
-                            <property name="fill">no</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GtkCheckButton" id="checkbutton4">
-                        <property name="can_focus">yes</property>
-                        <property name="label" translatable="yes">Reverse on even pages</property>
-                        <property name="active">no</property>
-                        <property name="draw_indicator">yes</property>
-                        <property name="visible">yes</property>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-
-                <child>
-                  <widget class="GtkLabel" id="label3">
-                    <property name="label" translatable="yes">Header/Footer</property>
-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                    <property name="wrap">no</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">yes</property>
-            <property name="fill">yes</property>
-          </packing>
-        </child>
-      </widget>
-      <packing>
-        <property name="padding">4</property>
-        <property name="expand">yes</property>
-        <property name="fill">yes</property>
-      </packing>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index 4edc948082..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-void e_contact_print_preview(EBook *book, char *query);
-GtkWidget *e_contact_print_contact_dialog_new(EContact *card);
-GtkWidget *e_contact_print_contact_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index ef76c0b46e..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 980750a6b2..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 0bb19aa92e..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index f49625434e..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <bonobo/bonobo-main.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_program_init ("Contact Print Style Editor Test", VERSION,
-		      LIBGNOMEUI_MODULE,
-		      argc, argv,
-		      NULL);
-
-  glade_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 */
-  g_signal_connect( app, "destroy",
-		    G_CALLBACK ( destroy_callback ),
-		    ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  bonobo_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
deleted file mode 100644
index a1dede7bde..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-main.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_program_init ("Contact Print Test", VERSION,
-		      LIBGNOMEUI_MODULE,
-		      argc, argv,
-		      NULL);
-
-  glade_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);
-  g_signal_connect(print, "close", G_CALLBACK(test_close), NULL);
-
-  bonobo_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/tools/.cvsignore b/addressbook/tools/.cvsignore
deleted file mode 100644
index 25963ae030..0000000000
--- a/addressbook/tools/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-evolution-addressbook-export
-evolution-addressbook-abuse
-evolution-addressbook-clean
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
deleted file mode 100644
index fe76abcc08..0000000000
--- a/addressbook/tools/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-privlibexec_SCRIPTS =					\
-	csv2vcard					\
-	evolution-addressbook-clean
-
-bin_PROGRAMS =			\
-	evolution-addressbook-export	
-
-noinst_PROGRAMS= evolution-addressbook-abuse
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook-tools\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBDIR=\""$(libdir)"\"			\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(GNOME_FULL_CFLAGS)
-
-evolution_addressbook_export_SOURCES =				\
-	evolution-addressbook-export.c				\
-	evolution-addressbook-export-list-cards.c 		\
-	evolution-addressbook-export-list-folders.c		\
-	evolution-addressbook-export.h
-
-evolution_addressbook_export_LDADD =				\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_addressbook_abuse_LDADD =				\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-EXTRA_DIST = $(privlibexec_SCRIPTS) \
-	evolution-addressbook-clean.in
-
-CLEANFILES= evolution-addressbook-clean
-
-evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
-           < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
-          && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
diff --git a/addressbook/tools/csv2vcard b/addressbook/tools/csv2vcard
deleted file mode 100755
index b968fbd9c3..0000000000
--- a/addressbook/tools/csv2vcard
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/usr/bin/perl -w
-#
-# cvs2vcard - Script to convert Outlook CSV files into VCard files
-# suitable to be imported into Evolution.
-#
-# Copyright (C) 2001 Ximian, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public
-# License as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Author: Michael MacDonald <mjmac@ximian.com>
-#
-
-use strict;
-use diagnostics;
-use Text::ParseWords;
-
-sub usage
-{
-  print STDERR << "--EndOfUsage";
-
-Takes a CSV-formatted list of contacts from Outlook and attempts to
-convert it into a list of VCards suitable for import into Evolution.
-
-Usage: $0 [infile outfile]
-
---EndOfUsage
-
-  exit;
-}
-
-sub is_recognized_format
-{
-  my $line = shift;
-
-  # Making some assumptions here...  Prolly OK.
-  return $line =~ /(First Name|Middle Name|Last Name)/; 
-}
-
-sub map_columns
-{
-  my $line = shift;
-
-  my @names = parse_line(',', 0, $line);
-
-  my $ctr = 0;
-  my %fieldmap = map { $_ => $ctr++ } @names;
-
-  return %fieldmap;
-}
-
-sub build_vcard_attr_from_def
-{
-  my ($def, $fields, $map) = @_;
-
-  # Valid chars for lookup (from Outlook CSV) are
-  # A-Za-z0-9_-'/
-  # Valid chars for formatting of attr are
-  # \s,|
-  my @lookup = map { s/=0A$//; s/[^\w\s\-'\/]//; $_; } split /[\s,]*\|[\s,]*/, $def;
-
-  foreach my $el (@lookup) {
-    unless (defined($map->{ $el })) {
-      print STDERR "$el is undefined\n";
-      next;
-    }
-    if (defined($fields->[$map->{ $el }])) {
-      unless ($fields->[$map->{ $el }] =~ /(^$|0\/0\/00)/) {
-        $def =~ s/$el/$fields->[$map->{ $el }]/;
-      } else {
-        $def =~ s/((?<=\|)\s*)?$el(\s*?(?=\|))?(=0A)?,?//;
-      }
-    } else {
-      $def =~ s/((?<=\|)\s*)?$el(\s*?(?=\|))?(=0A)?,?//;
-    }
-  }
-  # Get rid of field delimiters
-  $def =~ s/\|//g;
-  # Snip off any trailing semicolons or whitespace
-  $def =~ s/[\s;]*$//;
-
-  return $def;
-}
-
-sub build_vcard_from_line {
-  my ($line, %map) = @_;
-  my %vcard;
-
-  my @fields = parse_line(',', 0, $line);
-
-  my %vcard_def = ( FN => 'Title |First Name |Middle Name |Last Name |Suffix',
-		    N => 'Last Name| Suffix|;First Name|;Middle Name|;Title',
-		   'ADR;WORK'  => 'PO Box|;Business Street 2|;Business Street|;Business City|;Business State|;Business Postal Code|;Business Country',
-		   'LABEL;QUOTED-PRINTABLE;WORK' => 'PO Box |Business Street=0A|Business Street 2=0A|Business City,| Business State| Business Postal Code=0A|Business Country',
-		   'TEL;WORK;VOICE' => 'Business Phone',
-		   'TEL;WORK;VOICE2' => 'Business Phone 2',
-		   'TEL;WORK;FAX' => 'Business Fax',
-		   'TEL;WORK;COMPANY' => 'Company Main Phone',
-		   'ADR;HOME'  => ';Home Street 2|;Home Street|;Home City|;Home State|;Home Postal Code|;Home Country',
-		   'LABEL;QUOTED-PRINTABLE;HOME' => 'Home Street=0A|Home Street 2=0A|Home City,| Home State| Home Postal Code=0A|Home Country',
-		   'TEL;HOME;VOICE' => 'Home Phone',
-		   'TEL;HOME;VOICE2' => 'Home Phone 2',
-		   'TEL;HOME;FAX' => 'Home Fax',
-		   'ADR;POSTAL'  => ';Other Street 2|;Other Street|;Other City|;Other State|;Other Postal Code|;Other Country',
-		   'LABEL;QUOTED-PRINTABLE;POSTAL' => 'Other Street=0A|Other Street 2=0A|Other City,| Other State| Other Postal Code=0A|Other Country',
-		   'TEL;VOICE' => 'Other Phone',
-		   'TEL;FAX' => 'Other Fax',
-		   'TEL;CELL' => 'Mobile Phone',
-		   'TEL;CAR' => 'Car Phone',
-		   'TEL;PAGER' => 'Pager',
-		   'TEL;PREF' => 'Primary Phone',
-		   'TEL;ISDN' => 'ISDN',
-		   'TEL;X-EVOLUTION-CALLBACK' => 'Callback',
-		   'TEL;X-EVOLUTION-TTYTDD' => 'TTY/TDD Phone',
-		   'TEL;X-EVOLUTION-TELEX' => 'Telex',
-		   'TEL;X-EVOLUTION-RADIO' => 'Radio Phone',
-		   'EMAIL;INTERNET' => 'E-mail Address',
-		   'EMAIL;INTERNET2' => 'E-mail 2 Address',
-		   'EMAIL;INTERNET3' => 'E-mail 3 Address',
-		    ORG => 'Company|;Department',
-		    TITLE => 'Job Title',
-		    ROLE => 'Profession',
-                   'X-EVOLUTION-ASSISTANT' => "Assistant's Name",
-		   'TEL;X-EVOLUTION-ASSISTANT' => "Assistant's Phone",
-		   'X-EVOLUTION-SPOUSE' => 'Spouse',
-                   'X-EVOLUTION-ANNIVERSARY' => 'Anniversary',
-                   'X-EVOLUTION-MANAGER' => "Manager's Name",
-                   'X-EVOLUTION-OFFICE' => 'Office Location',
-		    BDAY => 'Birthday',
-		    NOTE => 'Notes',
-		    FBURL => 'Internet Free Busy',
-		    URL => 'Web Page',
-                   );
-
-  foreach my $key (keys(%vcard_def)) {
-    my $attr = build_vcard_attr_from_def($vcard_def{ $key }, \@fields, \%map);
-    if (defined($attr)) {
-      $vcard{ $key } = $attr unless ($attr =~ /^$/);
-    }
-  } 
-
-  return %vcard;
-}
-
-sub print_vcard_to_fh
-{
-  my ($fh, %vcard) = @_;
- 
-  print $fh "BEGIN:VCARD\n";
-  foreach my $key (keys(%vcard)) {
-    # Dirty hack because Evolution's vcard stores multiple email addrs
-    # with same sttribute, hence key collision.  Bleah.
-    # Ugh!  Same deal for multiple phones... (eg. bus. phone)
-    #
-    # And finally, while we're special-casing...  Outlook exports dates
-    # differently, so munge 'em if we find 'em.
-    if ($key =~ /EMAIL;INTERNET/o) {
-      (my $temp = $key) =~ s/\d$//;
-      print $fh "$temp:$vcard{ $key }\n";
-    } elsif ($key =~ /TEL;(HOME|WORK)/o) {
-      (my $temp = $key) =~ s/\d$//;
-      print $fh "$temp:$vcard{ $key }\n";
-    } elsif ($key =~ /(BDAY|X\-EVOLUTION\-ANNIVERSARY)/o) {
-      my $temp = $vcard{ $key };
-      if ($temp =~ /(\d\d)\/(\d\d)\/(\d\d)/) {
-        # Y2k !!  MS Didn't learn anything.
-        # Hope no one was born before 1915
-        if ((1900 + $3) < 1915) {
-          print $fh "$key:20$3-$1-$2\n";
-        } else {
-          print $fh "$key:19$3-$1-$2\n";
-        }
-      } else {
-        # Something's funky...  Just delete the attribute
-        print STDERR "Couldn't figure out what to do with $key:$vcard{ $key }\n";
-        delete($vcard{ $key });
-      } 
-    } else {
-      print $fh "$key:$vcard{ $key }\n";
-    }
-  }
-  print $fh "END:VCARD\n\n";
-}
-
-my $in  = $ARGV[0];
-my $out = $ARGV[1];
-
-usage() unless(defined($in) && defined($out));
-
-open (IN, $in)
-  or die "Can't open($in): $!\n";
-
-open (OUT, ">$out")
-  or die "Can't open($out): $!\n";
-
-my $linectr = 0;
-my %map;
-
-while (my $line = <IN>) {
-  $line =~ s/\r//g;
-  $line =~ s/\n$//;
-  if ($linectr == 0) {
-    $linectr++;
-    usage() unless is_recognized_format($line);
-    %map = map_columns($line);
-    #if ($line =~ /\r\n$/) {
-    #  print STDERR "Apparenlty found DOS-style EOL indicators...\n";
-      $/ = "\r\n";
-    #}
-  } else {
-    $linectr++;
-    while ($line =~ /^(("([^"]|\n|"")*")?,)*"([^"]|\n|"")*$/) {
-      my $temp = $line;
-      $line = <IN>;
-      $line =~ s/\r//g;
-      $line =~ s/\n$//;
-      $line = "$temp $line";
-    }
-    my %vcard = build_vcard_from_line($line, %map);
-    print_vcard_to_fh(\*OUT, %vcard);
-  }
-}  
-
-close(IN);
-close(OUT);
diff --git a/addressbook/tools/evolution-addressbook-abuse.c b/addressbook/tools/evolution-addressbook-abuse.c
deleted file mode 100644
index 3446e15938..0000000000
--- a/addressbook/tools/evolution-addressbook-abuse.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo/bonobo-main.h>
-
-#include <backend/ebook/e-book.h>
-#include <gnome.h>
-
-#define CONTACTS_TO_ADD 2000
-
-static gchar *
-make_random_string (void)
-{
-	const gchar *elements = " abcdefghijklmnopqrstuvwxyz1234567890  ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	gint len = strlen (elements);
-	gint i, N = 5 + (random () % 10);
-	gchar *str = g_malloc (N+1);
-
-	for (i = 0; i < N; ++i) {
-		str[i] = elements[random () % len];
-	}
-	str[i] = '\0';
-
-	return str;
-}
-
-static gchar *
-make_random_vcard (void)
-{
-	gchar *fa = make_random_string ();
-	gchar *name = make_random_string ();
-	gchar *email = make_random_string ();
-	gchar *org = make_random_string ();
-
-	gchar *vcard;
-
-	vcard = g_strdup_printf ("BEGIN:VCARD\n"
-				 "X-EVOLUTION-FILE-AS:%s\n"
-				 "N:%s\n"
-				 "EMAIL;INTERNET:%s\n"
-				 "ORG:%s\n"
-				 "END:VCARD",
-				 fa, name, email, org);
-	g_free (fa);
-	g_free (name);
-	g_free (email);
-	g_free (org);
-
-	return vcard;
-}
-
-int
-main (int argc, char *argv[])
-{
-	EBook *book;
-	int i;
-
-	if (getenv ("ABUSE_THE_WOMBAT") == NULL) {
-		g_print ("You probably don't want to use this program.\n"
-			 "It isn't very nice.\n");
-		exit(0);
-	}
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-abuse", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    NULL);
-
-	if (!e_book_get_default_addressbook (&book, NULL)) {
-		g_warning ("couldn't open addressbook");
-		exit (1);
-	}
-
-	for (i = 0; i < CONTACTS_TO_ADD; ++i) {
-		gchar *vcard = make_random_vcard ();
-		EContact *contact = e_contact_new_from_vcard (vcard);
-		g_message ("adding %d", i);
-		if (!e_book_add_contact (book, contact, NULL)) {
-			g_warning ("something went wrong...");
-			exit (1);
-		}
-		g_free (vcard);
-		g_object_unref (contact);
-	}
-
-	return 0;
-}
diff --git a/addressbook/tools/evolution-addressbook-clean.in b/addressbook/tools/evolution-addressbook-clean.in
deleted file mode 100644
index b7ee7ba167..0000000000
--- a/addressbook/tools/evolution-addressbook-clean.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/perl -w
-
-sub do_system
-{
-    my ($command) = @_;
-    system ($command);
-    if ($? != 0) {
-	die "Command failed: $command";
-    }
-}
-
-$filename = `@EVOLUTION_TOOLSDIR@/evolution-addressbook-export`;
-if ($? != 0) {
-    $! = $?;
-    die $!;
-}
-
-$HOME = $ENV{"HOME"};
-
-system ("@EVOLUTION_TOOLSDIR@/killev");
-do_system ("/bin/mv ${HOME}/evolution/local/Contacts/addressbook.db ${HOME}/evolution/local/Contacts/addressbook-backup.db");
-do_system ("@EVOLUTION_TOOLSDIR@/evolution-addressbook-import --input-file $filename");
-do_system ("/bin/rm $filename");
-
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
deleted file mode 100644
index c51393d047..0000000000
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ /dev/null
@@ -1,780 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-cards.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
-
-#include <ebook/e-book.h>
-#include <ebook/e-card-simple.h>
-#include <ebook/e-book-util.h>
-
-#include "evolution-addressbook-export.h"
-
-#define COMMA_SEPARATOR ","
-
-typedef enum _CARD_FORMAT CARD_FORMAT;
-typedef enum _DeliveryAddressField DeliveryAddressField;
-typedef enum _ECardSimpleFieldCSV ECardSimpleFieldCSV;
-typedef struct _ECardCSVFieldData ECardCSVFieldData;
-
-enum _CARD_FORMAT
-{
-	CARD_FORMAT_CSV,
-	CARD_FORMAT_VCARD
-};
-
-enum _DeliveryAddressField
-{
-	DELIVERY_ADDRESS_STREET,
-	DELIVERY_ADDRESS_EXT,
-	DELIVERY_ADDRESS_CITY,
-	DELIVERY_ADDRESS_REGION,
-	DELIVERY_ADDRESS_CODE,
-	DELIVERY_ADDRESS_COUNTRY
-};
-
-enum _ECardSimpleFieldCSV
-{
-	E_CARD_SIMPLE_FIELD_CSV_FILE_AS,
-	E_CARD_SIMPLE_FIELD_CSV_FULL_NAME,
-	E_CARD_SIMPLE_FIELD_CSV_EMAIL,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_ASSISTANT,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_CALLBACK,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_COMPANY,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME,
-	E_CARD_SIMPLE_FIELD_CSV_ORG,
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS, */
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_STREET,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_EXT,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_CITY,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_REGION,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_POSTCODE,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_COUNTRY,
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME, */
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_STREET,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_EXT,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_CITY,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_REGION,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_POSTCODE,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_COUNTRY,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_MOBILE,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_CAR,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS_FAX,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME_FAX,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS_2,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME_2,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_ISDN,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_OTHER,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_OTHER_FAX,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_PAGER,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_RADIO,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_TELEX,
-	E_CARD_SIMPLE_FIELD_CSV_PHONE_TTYTDD,
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER, */
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_STREET,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_EXT,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_CITY,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_REGION,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_POSTCODE,
-	E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_COUNTRY,
-	E_CARD_SIMPLE_FIELD_CSV_EMAIL_2,
-	E_CARD_SIMPLE_FIELD_CSV_EMAIL_3,
-	E_CARD_SIMPLE_FIELD_CSV_URL,
-	E_CARD_SIMPLE_FIELD_CSV_ORG_UNIT,
-	E_CARD_SIMPLE_FIELD_CSV_OFFICE,
-	E_CARD_SIMPLE_FIELD_CSV_TITLE,
-	E_CARD_SIMPLE_FIELD_CSV_ROLE,
-	E_CARD_SIMPLE_FIELD_CSV_MANAGER,
-	E_CARD_SIMPLE_FIELD_CSV_ASSISTANT,
-	E_CARD_SIMPLE_FIELD_CSV_NICKNAME,
-	E_CARD_SIMPLE_FIELD_CSV_SPOUSE,
-	E_CARD_SIMPLE_FIELD_CSV_NOTE,
-	E_CARD_SIMPLE_FIELD_CSV_CALURI,
-	E_CARD_SIMPLE_FIELD_CSV_FBURL,
-	/*E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY, */
-	E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_YEAR,
-	E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_MONTH,
-	E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_DAY,
-	/*E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE, */
-	E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_YEAR,
-	E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_MONTH,
-	E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_DAY,
-	E_CARD_SIMPLE_FIELD_CSV_MAILER,
-	E_CARD_SIMPLE_FIELD_CSV_NAME_OR_ORG,
-	E_CARD_SIMPLE_FIELD_CSV_CATEGORIES,
-	E_CARD_SIMPLE_FIELD_CSV_FAMILY_NAME,
-	E_CARD_SIMPLE_FIELD_CSV_GIVEN_NAME,
-	E_CARD_SIMPLE_FIELD_CSV_ADDITIONAL_NAME,
-	E_CARD_SIMPLE_FIELD_CSV_NAME_SUFFIX,
-	E_CARD_SIMPLE_FIELD_CSV_WANTS_HTML,
-	E_CARD_SIMPLE_FIELD_CSV_IS_LIST,
-	E_CARD_SIMPLE_FIELD_CSV_LAST
-};
-
-struct _ECardCSVFieldData
-{
-	gint csv_field;
-	gint simple_field;
-	gchar *csv_name;
-};
-
-#define NOMAP -1
-static ECardCSVFieldData csv_field_data[] = {
-	{E_CARD_SIMPLE_FIELD_CSV_FILE_AS, E_CARD_SIMPLE_FIELD_FILE_AS, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_FULL_NAME, E_CARD_SIMPLE_FIELD_CSV_FULL_NAME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_EMAIL, E_CARD_SIMPLE_FIELD_EMAIL, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_PRIMARY, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	 ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_ASSISTANT,
-	 E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS,
-	 E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_CALLBACK,
-	 E_CARD_SIMPLE_FIELD_PHONE_CALLBACK, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_COMPANY, E_CARD_SIMPLE_FIELD_PHONE_COMPANY,
-	 ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME, E_CARD_SIMPLE_FIELD_PHONE_HOME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_ORG, E_CARD_SIMPLE_FIELD_ORG, ""},
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS, */
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_STREET, NOMAP,
-	 "Business Address"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_EXT, NOMAP,
-	 "Business Address2"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_CITY, NOMAP,
-	 "Business Address City"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_REGION, NOMAP,
-	 "Business Address State"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_POSTCODE, NOMAP,
-	 "Business Address PostCode"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_COUNTRY, NOMAP,
-	 "Business Address Country"},
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME, */
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_STREET, NOMAP, "Home Address"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_EXT, NOMAP, "Home Address2"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_CITY, NOMAP, "Home Address City"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_REGION, NOMAP,
-	 "Home Address State"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_POSTCODE, NOMAP,
-	 "Home Address PostCode"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_COUNTRY, NOMAP,
-	 "Home Address Country"},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_MOBILE, E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-	 ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_CAR, E_CARD_SIMPLE_FIELD_PHONE_CAR, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS_FAX,
-	 E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME_FAX,
-	 E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS_2,
-	 E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME_2, E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-	 ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_ISDN, E_CARD_SIMPLE_FIELD_PHONE_ISDN, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_OTHER, E_CARD_SIMPLE_FIELD_PHONE_OTHER, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_OTHER_FAX,
-	 E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_PAGER, E_CARD_SIMPLE_FIELD_PHONE_PAGER, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_RADIO, E_CARD_SIMPLE_FIELD_PHONE_RADIO, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_TELEX, E_CARD_SIMPLE_FIELD_PHONE_TELEX, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_PHONE_TTYTDD, E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,
-	 ""},
-	/*E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER, */
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_STREET, NOMAP, "Other Address"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_EXT, NOMAP, "Other Address2"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_CITY, NOMAP,
-	 "Other Address City"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_REGION, NOMAP,
-	 "Other Address State"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_POSTCODE, NOMAP,
-	 "Other Address PostCode"},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDRESS_OTHER_COUNTRY, NOMAP,
-	 "Other Address Country"},
-	{E_CARD_SIMPLE_FIELD_CSV_EMAIL_2, E_CARD_SIMPLE_FIELD_EMAIL_2, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_EMAIL_3, E_CARD_SIMPLE_FIELD_EMAIL_3, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_URL, E_CARD_SIMPLE_FIELD_URL, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_ORG_UNIT, E_CARD_SIMPLE_FIELD_ORG_UNIT, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_OFFICE, E_CARD_SIMPLE_FIELD_OFFICE, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_TITLE, E_CARD_SIMPLE_FIELD_TITLE, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_ROLE, E_CARD_SIMPLE_FIELD_ROLE, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_MANAGER, E_CARD_SIMPLE_FIELD_MANAGER, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_ASSISTANT, E_CARD_SIMPLE_FIELD_ASSISTANT, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_NICKNAME, E_CARD_SIMPLE_FIELD_NICKNAME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_SPOUSE, E_CARD_SIMPLE_FIELD_SPOUSE, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_NOTE, E_CARD_SIMPLE_FIELD_NOTE, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_CALURI, E_CARD_SIMPLE_FIELD_CALURI, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_FBURL, E_CARD_SIMPLE_FIELD_FBURL, ""},
-	/*E_CARD_SIMPLE_FIELD_ANNIVERSARY, */
-	{E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_YEAR, NOMAP, "Anniversary Year"},
-	{E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_MONTH, NOMAP, "Anniversary Month"},
-	{E_CARD_SIMPLE_FIELD_CSV_ANNIVERSARY_DAY, NOMAP, "Anniversary Day"},
-	/*E_CARD_SIMPLE_FIELD_BIRTH_DATE, */
-	{E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_YEAR, NOMAP, "Birth Year"},
-	{E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_MONTH, NOMAP, "Birth Month"},
-	{E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_DAY, NOMAP, "Birth Day"},
-	{E_CARD_SIMPLE_FIELD_CSV_MAILER, E_CARD_SIMPLE_FIELD_MAILER, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_NAME_OR_ORG, E_CARD_SIMPLE_FIELD_NAME_OR_ORG, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_CATEGORIES, E_CARD_SIMPLE_FIELD_CATEGORIES, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_FAMILY_NAME, E_CARD_SIMPLE_FIELD_FAMILY_NAME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_GIVEN_NAME, E_CARD_SIMPLE_FIELD_GIVEN_NAME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_ADDITIONAL_NAME,
-	 E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_NAME_SUFFIX, E_CARD_SIMPLE_FIELD_NAME_SUFFIX, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_WANTS_HTML, E_CARD_SIMPLE_FIELD_WANTS_HTML, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_IS_LIST, E_CARD_SIMPLE_FIELD_IS_LIST, ""},
-	{E_CARD_SIMPLE_FIELD_CSV_LAST, NOMAP, ""}
-
-};
-
-static GSList *pre_defined_fields;
-
-/*function prototypes*/
-gint e_card_simple_csv_get_simple_field (ECardSimpleFieldCSV csv_field);
-gchar *e_card_simple_csv_get_name (ECardSimpleFieldCSV csv_field);
-gchar *e_card_simple_csv_get (ECardSimple * simple, ECardSimpleFieldCSV csv_field);
-gchar *e_card_simple_csv_get_header_line (GSList * csv_all_fields);
-gchar *e_card_simple_to_csv (ECardSimple * simple, GSList * csv_all_fields);
-gchar *e_card_get_csv (ECard * card, GSList * csv_all_fields);
-gchar *delivery_address_get_sub_field (const ECardDeliveryAddress * delivery_address, DeliveryAddressField sub_field);
-gchar *check_null_pointer (gchar * orig);
-gchar *quote_string (gchar * orig);
-int output_n_cards_file (FILE * outputfile, ECardCursor * cursor, int size, int begin_no, CARD_FORMAT format);
-static void fork_to_background (void);
-static void action_list_cards_get_cursor_cb (EBook * book, EBookStatus status, ECardCursor * cursor, ActionContext * p_actctx);
-static void action_list_cards_open_cb (EBook * book, EBookStatus status, ActionContext * p_actctx);
-static guint action_list_cards_run (ActionContext * p_actctx);
-void set_pre_defined_field (GSList ** pre_defined_fields);
-guint action_list_cards_init (ActionContext * p_actctx);
-
-
-/* function declarations*/
-gint
-e_card_simple_csv_get_simple_field (ECardSimpleFieldCSV csv_field)
-{
-	return csv_field_data[csv_field].simple_field;
-}
-
-gchar *
-e_card_simple_csv_get_name (ECardSimpleFieldCSV csv_field)
-{
-	gint simple_field;
-	gchar *name;
-	gchar *esc_name;
-	gchar *quoted_name;
-
-	ECardSimple *a_simple_card;
-
-	simple_field = e_card_simple_csv_get_simple_field (csv_field);
-
-	if (simple_field != NOMAP) {
-		a_simple_card = E_CARD_SIMPLE (g_object_new (E_TYPE_CARD_SIMPLE, NULL));
-		name = g_strdup (e_card_simple_get_ecard_field (a_simple_card, simple_field));
-		g_object_unref (G_OBJECT (a_simple_card));
-	} else {
-		name = g_strdup (csv_field_data[csv_field].csv_name);
-	}
-	esc_name = g_strescape (name, NULL);
-	g_free (name);
-	quoted_name = quote_string (esc_name);
-	g_free (esc_name);
-	return quoted_name;
-}
-
-
-gchar *
-e_card_simple_csv_get (ECardSimple * simple, ECardSimpleFieldCSV csv_field)
-{
-	gint simple_field;
-	gchar *field_value;
-	gchar *esc_field_value;
-	gchar *quoted_field_value;
-
-	const ECardDeliveryAddress *delivery_address = NULL;
-
-	simple_field = e_card_simple_csv_get_simple_field (csv_field);
-
-	if (simple_field != NOMAP) {
-		field_value = e_card_simple_get (simple, simple_field);
-	} else {
-
-		switch (csv_field) {
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_STREET:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_STREET);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_EXT:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_EXT);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_CITY:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CITY);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_REGION:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_REGION);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_POSTCODE:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CODE);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_COUNTRY:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_COUNTRY);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_STREET:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_STREET);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_EXT:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_EXT);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_CITY:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CITY);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_REGION:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_REGION);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_POSTCODE:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_CODE);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_COUNTRY:
-			delivery_address = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-			field_value = delivery_address_get_sub_field (delivery_address, DELIVERY_ADDRESS_COUNTRY);
-			break;
-		case E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_YEAR:
-			if (simple->card->bday != NULL) {
-				field_value = g_strdup_printf ("%04d", simple->card->bday->year);
-			} else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		case E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_MONTH:
-			if (simple->card->bday != NULL) {
-				field_value = g_strdup_printf ("%02d", simple->card->bday->month);
-			} else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		case E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_DAY:
-			if (simple->card->bday != NULL) {
-				field_value = g_strdup_printf ("%02d", simple->card->bday->day);
-			} else {
-				field_value = g_strdup ("");
-			}
-			break;
-
-		default:
-			field_value = g_strdup ("");
-		}
-	}
-
-	/*checking to avoid the NULL pointer */
-	if (field_value == NULL)
-		field_value =  g_strdup ("");
-
-	esc_field_value = g_strescape (field_value, NULL);
-	g_free (field_value);
-
-	quoted_field_value = quote_string (esc_field_value);
-	g_free (esc_field_value);
-
-	return quoted_field_value;
-}
-
-
-gchar *
-e_card_simple_csv_get_header_line (GSList * csv_all_fields)
-{
-
-	guint field_number;
-	gint csv_field;
-	gchar **field_name_array;
-	gchar *header_line;
-
-	gint loop_counter;
-
-	field_number = g_slist_length (csv_all_fields);
-	field_name_array = g_new0 (gchar *, field_number + 1);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		csv_field = GPOINTER_TO_INT (g_slist_nth_data (csv_all_fields, loop_counter));
-		*(field_name_array + loop_counter) = e_card_simple_csv_get_name (csv_field);
-	}
-
-	header_line = g_strjoinv (COMMA_SEPARATOR, field_name_array);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		g_free (*(field_name_array + loop_counter));
-	}
-	g_free (field_name_array);
-
-	return header_line;
-
-}
-
-
-gchar *
-e_card_simple_to_csv (ECardSimple * simple, GSList * csv_all_fields)
-{
-	guint field_number;
-	gint csv_field;
-	gchar **field_value_array;
-	gchar *aline;
-
-	gint loop_counter;
-
-	field_number = g_slist_length (csv_all_fields);
-	field_value_array = g_new0 (gchar *, field_number + 1);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		csv_field = GPOINTER_TO_INT (g_slist_nth_data (csv_all_fields, loop_counter));
-		*(field_value_array + loop_counter) = e_card_simple_csv_get (simple, csv_field);
-	}
-
-	aline = g_strjoinv (COMMA_SEPARATOR, field_value_array);
-
-	for (loop_counter = 0; loop_counter < field_number; loop_counter++) {
-		g_free (*(field_value_array + loop_counter));
-	}
-	g_free (field_value_array);
-
-	return aline;
-
-}
-
-
-gchar *
-e_card_get_csv (ECard * card, GSList * csv_all_fields)
-{
-	ECardSimple *simple_card;
-	gchar *aline;
-
-	simple_card = e_card_simple_new (card);
-	aline = e_card_simple_to_csv (simple_card, csv_all_fields);
-	g_object_unref (G_OBJECT (simple_card));
-	return aline;
-}
-
-
-gchar *
-check_null_pointer (gchar * orig)
-{
-	gchar *result;
-	if (orig == NULL)
-		result = g_strdup ("");
-	else
-		result = g_strdup (orig);
-	return result;
-}
-
-gchar *delivery_address_get_sub_field (const ECardDeliveryAddress * address, DeliveryAddressField sub_field)
-{
-	gchar *sub_field_value;
-	gchar *str_temp, *str_temp_a;
-	if (address != NULL) {
-		switch (sub_field) {
-		case DELIVERY_ADDRESS_STREET:
-			str_temp_a = check_null_pointer (address->po);
-			str_temp = check_null_pointer (address->street);
-			sub_field_value = g_strdup_printf ("%s %s", str_temp_a, str_temp);
-			g_free (str_temp);
-			g_free (str_temp_a);
-			break;
-		case DELIVERY_ADDRESS_EXT:
-			sub_field_value = check_null_pointer (address->ext);
-			break;
-		case DELIVERY_ADDRESS_CITY:
-			sub_field_value = check_null_pointer (address->city);
-			break;
-		case DELIVERY_ADDRESS_REGION:
-			sub_field_value = check_null_pointer (address->region);
-			break;
-		case DELIVERY_ADDRESS_CODE:
-			sub_field_value = check_null_pointer (address->code);
-			break;
-		case DELIVERY_ADDRESS_COUNTRY:
-			sub_field_value = check_null_pointer (address->country);
-			break;
-		default:
-			sub_field_value = g_strdup ("");
-		}
-	} else {
-		sub_field_value = g_strdup ("");
-	}
-	return sub_field_value;
-}
-
-gchar *
-quote_string (gchar *orig)
-{
-	if (orig == NULL)
-		return g_strdup ("\"\"");
-	return g_strdup_printf("\"%s\"", orig);
-}
-
-int
-output_n_cards_file (FILE * outputfile, ECardCursor * cursor, int size, int begin_no, CARD_FORMAT format)
-{
-	int i;
-	if (format == CARD_FORMAT_VCARD) {
-		for (i = begin_no; i < size + begin_no; i++) {
-			ECard *card = e_card_cursor_get_nth (cursor, i);
-			gchar *vcard = e_card_get_vcard_assume_utf8 (card);
-			fprintf (outputfile, "%s\n", vcard);
-			g_free (vcard);
-			g_object_unref (G_OBJECT (card));
-		}
-	} else if (format == CARD_FORMAT_CSV) {
-		gchar *csv_fields_name = e_card_simple_csv_get_header_line (pre_defined_fields);
-		fprintf (outputfile, "%s\n", csv_fields_name);
-		g_free (csv_fields_name);
-
-		for (i = begin_no; i < size + begin_no; i++) {
-			ECard *card = e_card_cursor_get_nth (cursor, i);
-			gchar *csv = e_card_get_csv (card, pre_defined_fields);
-			fprintf (outputfile, "%s\n", csv);
-			g_free (csv);
-			g_object_unref (G_OBJECT (card));
-
-		}
-	}
-
-	return SUCCESS;
-
-}
-
-static void
-fork_to_background (void)
-{
-	pid_t pid;
-	pid = fork ();
-	if (pid == -1) {
-		/* ouch, fork() failed */
-		perror ("fork");
-		exit (-1);
-	} else if (pid == 0) {
-		/* child */
-		/*contunue */
-
-	} else {
-		/* parent exit,  note the use of _exit() instead of exit() */
-		_exit (-1);
-	}
-}
-
-
-
-
-static void
-action_list_cards_get_cursor_cb (EBook * book, EBookStatus status, ECardCursor * cursor, ActionContext * p_actctx)
-{
-	FILE *outputfile;
-	long length;
-	int IsFirstOne;
-	int series_no;
-	gchar *file_series_name;
-	CARD_FORMAT format;
-	int size;
-
-	length = e_card_cursor_get_length (cursor);
-
-	if (length <= 0) {
-		g_warning ("Couldn't load addressbook correctly!!!! %s####", p_actctx->action_list_cards.addressbook_folder_uri);
-		exit (-1);
-	}
-
-
-	if (p_actctx->action_list_cards.async_mode == FALSE) {	/* normal mode */
-
-		if (p_actctx->action_list_cards.output_file == NULL) {
-			outputfile = stdout;
-		} else {
-			/* fopen output file */
-			if (!(outputfile = fopen (p_actctx->action_list_cards.output_file, "w"))) {
-				g_warning (_("Can not open file"));
-				exit (-1);
-			}
-		}
-
-		if (p_actctx->action_list_cards.IsVCard == TRUE)
-			format = CARD_FORMAT_VCARD;
-		else
-			format = CARD_FORMAT_CSV;
-
-		output_n_cards_file (outputfile, cursor, length, 0, format);
-
-
-
-		if (p_actctx->action_list_cards.output_file != NULL) {
-			fclose (outputfile);
-		}
-	}
-
-
-	/*async mode */
-	else {
-
-		size = p_actctx->action_list_cards.file_size;
-		IsFirstOne = TRUE;
-		series_no = 0;
-
-		do {
-			/* whether it is the last file */
-			if ((series_no + 1) * size >= length) {	/*last one */
-				file_series_name = g_strdup_printf ("%s.end", p_actctx->action_list_cards.output_file);
-
-			} else {	/*next one */
-				file_series_name =
-					g_strdup_printf ("%s.%04d", p_actctx->action_list_cards.output_file, series_no);
-			}
-
-			if (!(outputfile = fopen (file_series_name, "w"))) {
-				g_warning (_("Can not open file"));
-				exit (-1);
-			}
-
-
-			if (p_actctx->action_list_cards.IsVCard == TRUE)
-				format = CARD_FORMAT_VCARD;
-			else
-				format = CARD_FORMAT_CSV;
-			output_n_cards_file (outputfile, cursor, size, series_no * size, format);
-
-			fclose (outputfile);
-
-			series_no++;
-
-			if (IsFirstOne == TRUE) {
-				fork_to_background ();
-				IsFirstOne = FALSE;
-			}
-
-
-		}
-		while (series_no * size < length);
-		g_free (file_series_name);
-	}
-
-	bonobo_main_quit ();
-}
-
-
-
-
-static void
-action_list_cards_open_cb (EBook * book, EBookStatus status, ActionContext * p_actctx)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		g_warning ("Couldn't load addressbook %s", p_actctx->action_list_cards.addressbook_folder_uri);
-		exit (-1);
-	}
-	e_book_get_cursor (book, "(contains \"full_name\" \"\")", (EBookCursorCallback)action_list_cards_get_cursor_cb, p_actctx);
-}
-
-
-static guint
-action_list_cards_run (ActionContext * p_actctx)
-{
-	EBook *book;
-	book = e_book_new ();
-	
-	if (p_actctx->action_list_cards.addressbook_folder_uri != NULL) {
-		e_book_load_uri (book, p_actctx->action_list_cards.addressbook_folder_uri,
-				 (EBookCallback)action_list_cards_open_cb, p_actctx);
-	} else {
-		e_book_load_default_book (book, (EBookCallback)action_list_cards_open_cb, p_actctx);
-	}
-	return SUCCESS;
-}
-
-
-void
-set_pre_defined_field (GSList ** pre_defined_fields)
-{
-	*pre_defined_fields = NULL;
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_GIVEN_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_FAMILY_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_FULL_NAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_NICKNAME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_EMAIL));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_EMAIL_2));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_WANTS_HTML));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_PHONE_HOME));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_PHONE_BUSINESS_FAX));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_PHONE_PAGER));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_PHONE_MOBILE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_STREET));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_EXT));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_CITY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_REGION));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_POSTCODE));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_HOME_COUNTRY));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_STREET));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_EXT));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_CITY));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_REGION));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_POSTCODE));
-	*pre_defined_fields =
-		g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ADDRESS_BUSINESS_COUNTRY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_TITLE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_OFFICE));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_ORG));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_URL));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_CALURI));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_YEAR));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_MONTH));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_BIRTH_DATE_DAY));
-	*pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CARD_SIMPLE_FIELD_CSV_NOTE));
-}
-
-guint
-action_list_cards_init (ActionContext * p_actctx)
-{
-	g_idle_add ((GSourceFunc) action_list_cards_run, p_actctx);
-	set_pre_defined_field (&pre_defined_fields);
-
-	return SUCCESS;
-}
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
deleted file mode 100644
index 8922422a8f..0000000000
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export-list-folders.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
-
-#include <ebook/e-book.h>
-#include <ebook/e-book-util.h>
-
-#include "evolution-addressbook-export.h"
-
-static void
-action_list_folders_get_cursor_cb (EBook * book, EBookStatus status, ECardCursor * cursor, ActionContext * p_actctx)
-{
-	FILE *outputfile;
-	long length;
-	const char *uri;
-	char *name;
-
-	uri = e_book_get_default_book_uri ();
-	length = e_card_cursor_get_length (cursor);
-
-	/*Fix me *
-	   can not get name, should be a bug of e-book.Anyway, should set a default name.
-	 */
-	/*name = e_book_get_name (book); */
-	name = g_strdup (_("Contacts"));
-
-	if (p_actctx->action_list_folders.output_file == NULL) {
-		printf ("\"%s\",\"%s\",%d\n", uri, name, (int) length);
-	} else {
-		/*output to a file */
-		if (!(outputfile = fopen (p_actctx->action_list_folders.output_file, "w"))) {
-			g_warning (_("Can not open file"));
-			exit (-1);
-		}
-		fprintf (outputfile, "\"%s\",\"%s\",%d\n", uri, name, (int) length);
-		fclose (outputfile);
-	}
-
-	g_free (name);
-	g_object_unref (G_OBJECT (book));
-	bonobo_main_quit ();
-}
-
-static void
-action_list_folders_open_cb (EBook * book, EBookStatus status, ActionContext * p_actctx)
-{
-	if (E_BOOK_STATUS_SUCCESS ==  status) {
-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", 
-				   (EBookCursorCallback)action_list_folders_get_cursor_cb, p_actctx);
-	} else {
-		g_object_unref (G_OBJECT (book));
-		g_warning (_("Can not load URI"));
-		exit (-1);
-	}
-}
-
-static guint
-action_list_folders_run (ActionContext * p_actctx)
-{
-	EBook *book;
-	book = e_book_new ();
-
-	e_book_load_default_book (book, (EBookCallback)action_list_folders_open_cb, p_actctx);
-	return SUCCESS;
-}
-
-guint
-action_list_folders_init (ActionContext * p_actctx)
-{
-	g_idle_add ((GSourceFunc) action_list_folders_run, p_actctx);
-
-	return SUCCESS;
-}
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
deleted file mode 100644
index a61880ed14..0000000000
--- a/addressbook/tools/evolution-addressbook-export.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <gnome.h>
-
-#include <ebook/e-book.h>
-
-#include "evolution-addressbook-export.h"
-
-int
-main (int argc, char **argv)
-{
-	ActionContext actctx;
-	GnomeProgram *program;
-	poptContext context;
-	const gchar **argvn;
-
-	int current_action = ACTION_NOTHING;
-	int IsCSV = FALSE;
-	int IsVCard = FALSE;
-
-	/*** popttable */
-	char *output_file = NULL;
-	int list_folders_mode = FALSE;
-	char *output_format = NULL;
-	char *addressbook_folder_uri = NULL;
-	int async_mode = FALSE;
-	int file_size = 0;
-
-	struct poptOption options[] = {
-		{"output", '\0', POPT_ARG_STRING, &output_file, 0, N_("Specify the output file instead of standard output"),
-		 N_("OUTPUTFILE")},
-		{"list-addressbook-folders", 'l', POPT_ARG_NONE, &list_folders_mode, 0, N_("List local addressbook folders"),
-		 NULL},
-		{"format", '\0', POPT_ARG_STRING, &output_format, 0, N_("Show cards as vcard or csv file"), N_("[vcard|csv]")},
-		{"async", 'a', POPT_ARG_NONE, &async_mode, 0, N_("Export in asynchronous mode "), NULL},
-		{"size", '\0', POPT_ARG_INT, &file_size, 0,
-		 N_("The number of cards in one output file in asychronous mode,default size 100."), N_("NUMBER")},
-		{NULL, '\0', 0, NULL, 0, NULL, NULL}
-	};
-	/* popttable end ** */
-
-	/*i18n-lize */
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	program =
-		gnome_program_init (PACKAGE, VERSION, GNOME_BONOBO_MODULE, argc, argv, GNOME_PARAM_POPT_TABLE, options,
-				    GNOME_PARAM_NONE);
-
-	/* Parsing Parameter */
-	g_object_get (program, "popt-context", &context, NULL);
-	argvn = poptGetArgs (context);
-	if (!argvn) {
-		addressbook_folder_uri = NULL;
-	} else { /* there at lease is a one argument, and that should be addressbook folder uri */
-		addressbook_folder_uri = g_strdup (*argvn);
-	}
-        poptFreeContext (context);
-
-	if (list_folders_mode != FALSE) {
-		current_action = ACTION_LIST_FOLDERS;
-		/* check there should not be addressbook-folder-uri , and async and size , output_format */
-		if (addressbook_folder_uri != NULL || async_mode != FALSE || output_format != NULL || file_size != 0) {
-			g_warning (_("Command line arguments error, please use --help option to see the usage."));
-			exit (-1);
-		}
-	} else {
-
-		current_action = ACTION_LIST_CARDS;
-
-		/* check the output format */
-		if (output_format == NULL) {
-			IsVCard = TRUE;
-		} else {
-			IsCSV = !strcmp (output_format, "csv");
-			IsVCard = !strcmp (output_format, "vcard");
-			if (IsCSV == FALSE && IsVCard == FALSE) {
-				g_warning (_("Only support csv or vcard format."));
-				exit (-1);
-			}
-		}
-
-		/*check async and output file */
-		if (async_mode == TRUE) {
-			/* check have to output file , set default file_size */
-			if (output_file == NULL) {
-				g_warning (_("In async mode, output must be file."));
-				exit (-1);
-			}
-			if (file_size == 0)
-				file_size = DEFAULT_SIZE_NUMBER;
-		} else {
-			/*check no file_size */
-			if (file_size != 0) {
-				g_warning (_("In normal mode, there should not need size option."));
-				exit (-1);
-			}
-		}
-	}
-
-	/* do actions */
-	if (current_action == ACTION_LIST_FOLDERS) {
-		actctx.action_type = current_action;
-		if (output_file == NULL) {
-			actctx.action_list_folders.output_file = NULL;
-		} else {
-			actctx.action_list_folders.output_file = g_strdup (output_file);
-		}
-		action_list_folders_init (&actctx);
-	} else if (current_action == ACTION_LIST_CARDS) {
-		actctx.action_type = current_action;
-		if (output_file == NULL) {
-			actctx.action_list_cards.output_file = NULL;
-		} else {
-			actctx.action_list_cards.output_file = g_strdup (output_file);
-		}
-		actctx.action_list_cards.IsCSV = IsCSV;
-		actctx.action_list_cards.IsVCard = IsVCard;
-		actctx.action_list_cards.addressbook_folder_uri = g_strdup (addressbook_folder_uri);
-		actctx.action_list_cards.async_mode = async_mode;
-		actctx.action_list_cards.file_size = file_size;
-
-		action_list_cards_init (&actctx);
-
-	} else {
-		g_warning (_("Impossible internal error."));
-		exit (-1);
-	}
-
-	bonobo_main ();
-
-	/*FIXME:should free actctx's some char* field, such as output_file! but since the program will end, so that will not cause mem leak.  */
-
-	return 0;
-}
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
deleted file mode 100644
index 13749aed61..0000000000
--- a/addressbook/tools/evolution-addressbook-export.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
- *
- */
-
-#ifndef _EVOLUTION_ADDRESSBOOK_EXPORT_H_
-#define _EVOLUTION_ADDRESSBOOK_EXPORT_H__
-
-#include <glib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define SUCCESS 0
-#define FAILED  -1
-
-#define ACTION_NOTHING       0
-#define ACTION_LIST_FOLDERS  1
-#define ACTION_LIST_CARDS    2
-
-#define DEFAULT_SIZE_NUMBER 100
-
-union _ActionContext
-{
-
-	guint action_type;
-
-	struct
-	{
-		gint action_type;
-		gchar *output_file;
-	}
-	action_list_folders;
-
-	struct
-	{
-		gint action_type;
-		gchar *output_file;
-		gint IsCSV;
-		gint IsVCard;
-		gchar *addressbook_folder_uri;
-		gint async_mode;
-		gint file_size;
-	}
-	action_list_cards;
-};
-
-typedef union _ActionContext ActionContext;
-
-
-/* action_list_folders */
-guint action_list_folders_init (ActionContext * p_actctx);
-
-/*action list cards*/
-guint action_list_cards_init (ActionContext * p_actctx);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _EVOLUTION_ADDRESSBOOK_EXPORT_H_ */
diff --git a/addressbook/tools/evolution-addressbook-import.c b/addressbook/tools/evolution-addressbook-import.c
deleted file mode 100644
index 28871efd96..0000000000
--- a/addressbook/tools/evolution-addressbook-import.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <backend/ebook/e-book-async.h>
-#include <gnome.h>
-
-static int exec_ref_count = 0;
-
-static void
-ref_executable (void)
-{
-	exec_ref_count ++;
-}
-
-static void
-unref_executable (void)
-{
-	exec_ref_count --;
-	if (exec_ref_count == 0)
-		g_main_loop_quit (0);
-}
-
-static void
-add_cb (EBook *book, EBookStatus status, const char *id, gpointer closure)
-{
-	switch (status) {
-	case E_BOOK_ERROR_OK:
-		unref_executable ();
-		break;
-	default:
-		g_main_loop_quit (NULL);
-		break;
-	}
-}
-
-static void
-use_addressbook (EBook *book, gpointer closure)
-{
-	GList *cards, *list;
-	char *filename = closure;
-
-	if (book == NULL)
-		g_error (_("Error loading default addressbook."));
-
-	cards = e_card_load_cards_from_file (filename);
-
-	ref_executable ();
-
-	for (list = cards; list; list = list->next) {
-		ref_executable ();
-		e_book_add_card (book, list->data, add_cb, closure);
-	}
-	sync();
-
-	unref_executable ();
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *filename = NULL;
-
-	struct poptOption options[] = {
-		{ "input-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Input File"), NULL },
-		POPT_AUTOHELP
-		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
-	};
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-addressbook-import", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv, 
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    GNOME_PARAM_POPT_TABLE, options,
-			    NULL);
-
-	if (filename == NULL) {
-		g_error (_("No filename provided."));
-	}
-
-	e_book_async_get_default_addressbook (use_addressbook, filename);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/util/.cvsignore b/addressbook/util/.cvsignore
deleted file mode 100644
index 6205c6f3ab..0000000000
--- a/addressbook/util/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-eab-marshal.c
-eab-marshal.h
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
deleted file mode 100644
index 6cb70de06a..0000000000
--- a/addressbook/util/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-INCLUDES =						\
-	-DPREFIX=\"$(prefix)\"				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DDATADIR=\"$(datadir)\"			\
-	-DLIBDIR=\"$(libdir)\"				\
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-        $(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-noinst_LTLIBRARIES = libeabutil.la
-
-libeabutil_la_SOURCES =					\
-	eab-marshal.c					\
-	eab-destination.c				\
-	eab-destination.h				\
-	eab-book-util.c					\
-	eab-book-util.h
-
-libeabutil_la_LIBADD =					\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-MARSHAL_GENERATED = eab-marshal.c eab-marshal.h
-@EVO_MARSHAL_RULE@
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES    = $(BUILT_SOURCES)
-
-EXTRA_DIST = 		\
-	eab-marshal.list
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
deleted file mode 100644
index 2c80d6f8a1..0000000000
--- a/addressbook/util/eab-book-util.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-util.c
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "eab-book-util.h"
-
-#include <string.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <e-util/e-config-listener.h>
-
-EConfigListener *
-eab_get_config_database ()
-{
-	static EConfigListener *config_db;
-
-	if (config_db == NULL)
-		config_db = e_config_listener_new ();
-
-	return config_db;
-}
-
-/*
- *
- * Specialized Queries
- *
- */
-
-guint
-eab_name_and_email_query (EBook *book,
-			  const gchar *name,
-			  const gchar *email,
-			  EBookContactsCallback cb,
-			  gpointer closure)
-{
-	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)
-		name_query = g_strdup_printf ("(or (beginswith \"file_as\" \"%s\") (beginswith \"full_name\" \"%s\"))", name, name);
-
-	/* 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;
-
-	tag = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (email_query);
-	g_free (name_query);
-	g_free (query);
-
-	return tag;
-}
-
-/*
- * Simple nickname query
- */
-guint
-eab_nickname_query (EBook                 *book,
-		    const char            *nickname,
-		    EBookContactsCallback  cb,
-		    gpointer               closure)
-{
-	gchar *query;
-	guint retval;
-
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-	g_return_val_if_fail (nickname != NULL, 0);
-
-	/* The empty-string case shouldn't generate a warning. */
-	if (! *nickname)
-		return 0;
-
-	query = g_strdup_printf ("(is \"nickname\" \"%s\")", nickname);
-
-	retval = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (query);
-
-	return retval;
-}
-
-GList*
-eab_contact_list_from_string (const char *str)
-{
-	GList *contacts = NULL;
-	GString *gstr = g_string_new ("");
-	char *p = (char*)str;
-	char *q;
-	char *blank_line;
-
-	while (*p) {
-		if (*p != '\r') g_string_append_c (gstr, *p);
-		
-		p++;
-	}
-
-	p = g_string_free (gstr, FALSE);
-	q = p;
-	do {
-		char *temp;
-
-		blank_line = strstr (q, "\n\n");
-		if (blank_line) {
-			temp = g_strndup (q, blank_line - q);
-		}
-		else {
-			temp = g_strdup (q);
-		}
-
-		contacts = g_list_append (contacts, e_contact_new_from_vcard (temp));
-
-		g_free (temp);
-
-		if (blank_line)
-			q = blank_line + 2;
-		else
-			q = NULL;
-	} while (blank_line);
-
-	g_free (p);
-
-	return contacts;
-}
-
-char*
-eab_contact_list_to_string (GList *contacts)
-{
-	GString *str = g_string_new ("");
-	GList *l;
-
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		char *vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-		g_string_append (str, vcard_str);
-		if (l->next)
-			g_string_append (str, "\r\n");
-	}
-
-	return g_string_free (str, FALSE);
-}
-
-#if notyet
-/*
- *  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 *contacts, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-	
-	info->cb (book, 
-		  info->email,
-		  contacts && (status == E_BOOK_ERROR_OK) ? E_CONTACT (contacts->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
-eab_query_address_default (const gchar *email,
-			   EABHaveAddressCallback 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_default_book (have_address_book_open_cb, info);
-}
-#endif
-
-/* bad place for this i know. */
-int
-e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len)
-{
-	gchar *s1 = g_utf8_casefold(str1, len);
-	gchar *s2 = g_utf8_casefold(str2, len);
-	int rv;
-
-	rv = g_utf8_collate (s1, s2);
-
-	g_free (s1);
-	g_free (s2);
-
-	return rv;
-}
-
-int
-e_utf8_casefold_collate (const gchar *str1, const gchar *str2)
-{
-	return e_utf8_casefold_collate_len (str1, str2, -1);
-}
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
deleted file mode 100644
index 7fda98adf3..0000000000
--- a/addressbook/util/eab-book-util.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.h
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __EAB_UTIL_H__
-#define __EAB_UTIL_H__
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <libebook/e-book-async.h>
-#include "e-util/e-config-listener.h"
-
-G_BEGIN_DECLS
-
-typedef void (*EABHaveAddressCallback) (EBook *book, const gchar *addr, EContact *contact, gpointer closure);
-
-/* config database interface. */
-EConfigListener       *eab_get_config_database       (void);
-
-/* Specialized Name/Email Queries */
-guint                  eab_name_and_email_query      (EBook                    *book,
-						      const char               *name,
-						      const char               *email,
-						      EBookContactsCallback     cb,
-						      gpointer                  closure);
-guint                  eab_nickname_query            (EBook                    *book,
-						      const char               *nickname,
-						      EBookContactsCallback     cb,
-						      gpointer                  closure);
-
-GList                 *eab_contact_list_from_string (const char *str);
-char                  *eab_contact_list_to_string    (GList *contacts);
-
-/* Returns the EContact associated to email in the callback,
-   or NULL if no match is found in the default address book. */
-void                   eab_query_address_default     (const gchar              *email,
-						      EABHaveAddressCallback  cb,
-						      gpointer                  closure);
-
-int                    e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len);
-int                    e_utf8_casefold_collate (const gchar *str1, const gchar *str2);
-
-G_END_DECLS
-
-#endif /* __EAB_UTIL_H__ */
-
diff --git a/addressbook/util/eab-destination.c b/addressbook/util/eab-destination.c
deleted file mode 100644
index 07557b1455..0000000000
--- a/addressbook/util/eab-destination.c
+++ /dev/null
@@ -1,1569 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-destination.c
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 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 "eab-destination.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <libebook/e-book.h>
-#include "eab-marshal.h"
-#include "eab-book-util.h"
-#include <gal/widgets/e-unicode.h>
-
-#include <glib.h>
-#include <libxml/xmlmemory.h>
-#include <camel/camel-internet-address.h>
-
-#define d(x)
-
-enum {
-	CHANGED,
-	CONTACT_LOADED,
-	LAST_SIGNAL
-};
-
-guint eab_destination_signals[LAST_SIGNAL] = { 0 };
-
-struct _EABDestinationPrivate {
-	gchar *raw;
-
-	gchar *book_uri;
-	gchar *uid;
-	EContact *contact;
-	gint email_num;
-
-	gchar *name;
-	gchar *email;
-	gchar *addr;
-	gchar *textrep;
-
-	GList *list_dests;
-
-	guint html_mail_override : 1;
-	guint wants_html_mail : 1;
-
-	guint show_addresses : 1;
-
-	guint contact_loaded : 1;
-	guint cannot_load : 1;
-	guint auto_recipient : 1;
-	guint pending_contact_load;
-
-	guint pending_change : 1;
-
-	EBook *book;
-
-	gint freeze_count;
-};
-
-static void eab_destination_clear_contact    (EABDestination *);
-static void eab_destination_clear_strings (EABDestination *);
-
-/* the following prototypes were in e-destination.h, but weren't used
-   by anything in evolution...  let's make them private for now. */
-static gboolean       eab_destination_is_valid           (const EABDestination *);
-static void           eab_destination_set_contact_uid    (EABDestination *, const gchar *uid, gint email_num); 
-static void           eab_destination_set_book_uri       (EABDestination *, const gchar *uri); 
-static gboolean       eab_destination_from_contact       (const EABDestination *);
-static const gchar   *eab_destination_get_book_uri       (const EABDestination *);
-static const gchar   *eab_destination_get_contact_uid    (const EABDestination *);
-static xmlNodePtr     eab_destination_xml_encode         (const EABDestination *dest);
-static gboolean       eab_destination_xml_decode         (EABDestination *dest, xmlNodePtr node);
-
-static GObjectClass *parent_class;
-
-static void
-eab_destination_dispose (GObject *obj)
-{
-	EABDestination *dest = EAB_DESTINATION (obj);
-
-	if (dest->priv) {
-		eab_destination_clear (dest);
-
-		if (dest->priv->book)
-			g_object_unref (dest->priv->book);
-
-		g_free (dest->priv);
-		dest->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (obj);
-}
-
-static void
-eab_destination_class_init (EABDestinationClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-
-	object_class->dispose = eab_destination_dispose;
-
-	eab_destination_signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABDestinationClass, changed),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-
-	eab_destination_signals[CONTACT_LOADED] =
-		g_signal_new ("contact_loaded",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EABDestinationClass, contact_loaded),
-			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
-			      G_TYPE_NONE, 0);
-}
-
-static void
-eab_destination_init (EABDestination *dest)
-{
-	dest->priv = g_new0 (struct _EABDestinationPrivate, 1);
-
-	dest->priv->cannot_load = FALSE;
-	dest->priv->auto_recipient = FALSE;
-	dest->priv->pending_contact_load = 0;
-}
-
-GType
-eab_destination_get_type (void)
-{
-	static GType dest_type = 0;
-
-	if (!dest_type) {
-		GTypeInfo dest_info = {
-			sizeof (EABDestinationClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc)  eab_destination_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (EABDestination),
-			0,    /* n_preallocs */
-			(GInstanceInitFunc) eab_destination_init
-		};
-
-		dest_type = g_type_register_static (G_TYPE_OBJECT, "EABDestination", &dest_info, 0);
-	}
-
-	return dest_type;
-}
-
-EABDestination *
-eab_destination_new (void)
-{
-	return g_object_new (EAB_TYPE_DESTINATION, NULL);
-}
-
-static void
-eab_destination_freeze (EABDestination *dest)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count >= 0);
-	
-	dest->priv->freeze_count++;
-}
-
-static void
-eab_destination_thaw (EABDestination *dest)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count > 0);
-	
-	dest->priv->freeze_count--;
-	if (dest->priv->freeze_count == 0 && dest->priv->pending_change)
-		eab_destination_changed (dest);
-}
-
-void
-eab_destination_changed (EABDestination *dest)
-{
-	if (dest->priv->freeze_count == 0) {
-		g_signal_emit (dest, eab_destination_signals[CHANGED], 0);
-		dest->priv->pending_change = FALSE;
-		dest->priv->cannot_load = FALSE;
-	
-	} else {
-		dest->priv->pending_change = TRUE;
-	}
-}
-
-EABDestination *
-eab_destination_copy (const EABDestination *dest)
-{
-	EABDestination *new_dest;
-	GList *iter;
-
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-
-	new_dest = eab_destination_new ();
-
-        new_dest->priv->book_uri           = g_strdup (dest->priv->book_uri);
-        new_dest->priv->uid                = g_strdup (dest->priv->uid);
-        new_dest->priv->name               = g_strdup (dest->priv->name);
-        new_dest->priv->email              = g_strdup (dest->priv->email);
-        new_dest->priv->addr               = g_strdup (dest->priv->addr);
-        new_dest->priv->email_num          = dest->priv->email_num;
-
-	new_dest->priv->contact     = dest->priv->contact;
-	if (new_dest->priv->contact)
-		g_object_ref (new_dest->priv->contact);
-
-	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,
-							    eab_destination_copy (EAB_DESTINATION (iter->data)));
-	}
-
-	return new_dest;
-}
-
-static void
-eab_destination_clear_contact (EABDestination *dest)
-{
-	g_free (dest->priv->book_uri);
-	dest->priv->book_uri = NULL;
-	g_free (dest->priv->uid);
-	dest->priv->uid = NULL;
-	
-	dest->priv->contact = NULL;
-	dest->priv->email_num = -1;
-	
-	g_list_foreach (dest->priv->list_dests, (GFunc) g_object_unref, NULL);
-	g_list_free (dest->priv->list_dests);
-	dest->priv->list_dests = NULL;
-	
-	dest->priv->cannot_load = FALSE;
-	
-	eab_destination_cancel_contact_load (dest);
-	
-	eab_destination_changed (dest);
-}
-
-static void
-eab_destination_clear_strings (EABDestination *dest)
-{
-	g_free (dest->priv->raw);
-	dest->priv->raw = NULL;
-	
-	g_free (dest->priv->name);
-	dest->priv->name = NULL;
-	
-	g_free (dest->priv->email);
-	dest->priv->email = NULL;
-	
-	g_free (dest->priv->addr);
-	dest->priv->addr = NULL;
-	
-	g_free (dest->priv->textrep);
-	dest->priv->textrep = NULL;
-	
-	eab_destination_changed (dest);
-}
-
-void
-eab_destination_clear (EABDestination *dest)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	
-	eab_destination_freeze (dest);
-	
-	eab_destination_clear_contact (dest);
-	eab_destination_clear_strings (dest);
-	
-	eab_destination_thaw (dest);
-}
-
-static gboolean
-nonempty (const gchar *s)
-{
-	gunichar c;
-	while (*s) {
-		c = g_utf8_get_char (s);
-		if (!g_unichar_isspace (c))
-			return TRUE;
-		s = g_utf8_next_char (s);
-	}
-	return FALSE;
-}
-
-gboolean
-eab_destination_is_empty (const EABDestination *dest)
-
-{
-	struct _EABDestinationPrivate *p;
-	
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), TRUE);
-	
-	p = dest->priv;
-	
-	return !(p->contact != NULL
-		 || (p->book_uri && *p->book_uri)
-		 || (p->uid && *p->uid)
-		 || (p->raw && nonempty (p->raw))
-		 || (p->name && nonempty (p->name))
-		 || (p->email && nonempty (p->email))
-		 || (p->addr && nonempty (p->addr))
-		 || (p->list_dests != NULL));
-}
-
-gboolean
-eab_destination_is_valid (const EABDestination *dest)
-{
-	const char *email;
-	
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), FALSE);
-	
-	if (eab_destination_from_contact (dest))
-		return TRUE;
-	
-	email = eab_destination_get_email (dest);
-	
-	/* FIXME: if we really wanted to get fancy here, we could
-           check to make sure that the address was valid according to
-           rfc822's addr-spec grammar. */
-	
-	return email && *email && strchr (email, '@');
-}
-
-gboolean
-eab_destination_equal (const EABDestination *a, const EABDestination *b)
-{
-	const struct _EABDestinationPrivate *pa, *pb;
-	const char *na, *nb;
-	
-	g_return_val_if_fail (EAB_IS_DESTINATION (a), FALSE);
-	g_return_val_if_fail (EAB_IS_DESTINATION (b), FALSE);
-	
-	if (a == b)
-		return TRUE;
-	
-	pa = a->priv;
-	pb = b->priv;
-	
-	/* Check equality of contacts. */
-	if (pa->contact || pb->contact) {
-		if (! (pa->contact && pb->contact))
-			return FALSE;
-		
-		if (pa->contact == pb->contact || !strcmp (e_contact_get_const (pa->contact, E_CONTACT_UID),
-							   e_contact_get_const (pb->contact, E_CONTACT_UID)))
-			return TRUE;
-		
-		return FALSE;
-	}
-	
-	/* Just in case name returns NULL */
-	na = eab_destination_get_name (a);
-	nb = eab_destination_get_name (b);
-	if ((na || nb) && !(na && nb && ! e_utf8_casefold_collate (na, nb)))
-		return FALSE;
-	
-	if (!g_ascii_strcasecmp (eab_destination_get_email (a), eab_destination_get_email (b)))
-		return TRUE;
-	else
-		return FALSE;
-}
-
-void
-eab_destination_set_contact (EABDestination *dest, EContact *contact, gint email_num)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	g_return_if_fail (contact && E_IS_CONTACT (contact));
-	
-	if (dest->priv->contact != contact || dest->priv->email_num != email_num) {
-		/* We have to freeze/thaw around these operations so that the 'changed'
-		   signals don't cause the EABDestination's internal state to be altered
-		   before we can finish setting ->contact && ->email_num. */
-		eab_destination_freeze (dest);
-		eab_destination_clear (dest);
-		
-		dest->priv->contact = contact;
-		g_object_ref (dest->priv->contact);
-		
-		dest->priv->email_num = email_num;
-		
-		eab_destination_changed (dest);
-		eab_destination_thaw (dest);
-	}
-}
-
-static void
-eab_destination_set_book_uri (EABDestination *dest, const gchar *uri)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	g_return_if_fail (uri != NULL);
-	
-	if (dest->priv->book_uri == NULL || strcmp (dest->priv->book_uri, uri)) {
-		g_free (dest->priv->book_uri);
-		dest->priv->book_uri = g_strdup (uri);
-		
-		eab_destination_changed (dest);
-	}
-}
-
-void
-eab_destination_set_contact_uid (EABDestination *dest, const gchar *uid, gint email_num)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	g_return_if_fail (uid != NULL);
-	
-	if (dest->priv->uid == NULL
-	    || strcmp (dest->priv->uid, uid)
-	    || dest->priv->email_num != email_num) {
-		
-		g_free (dest->priv->uid);
-		dest->priv->uid = g_strdup (uid);
-		dest->priv->email_num = email_num;
-		
-		/* If we already have a contact, remove it unless it's uid matches the one
-		   we just set. */
-		if (dest->priv->contact && strcmp (uid,
-						   e_contact_get_const (dest->priv->contact, E_CONTACT_UID))) {
-			g_object_unref (dest->priv->contact);
-			dest->priv->contact = NULL;
-		}
-		
-		eab_destination_changed (dest);
-	}
-}
-
-void
-eab_destination_set_name (EABDestination *dest, const gchar *name)
-{
-	gboolean changed = FALSE;
-	
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	
-	if (name == NULL) {
-		if (dest->priv->name != NULL) {
-			g_free (dest->priv->name);
-			dest->priv->name = NULL;
-			changed = TRUE;
-		}
-	} else if (dest->priv->name == NULL || strcmp (dest->priv->name, name)) {
-		g_free (dest->priv->name);
-		dest->priv->name = g_strdup (name);
-		changed = TRUE;
-	}
-	
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		eab_destination_changed (dest);
-	}
-}
-
-void
-eab_destination_set_email (EABDestination *dest, const gchar *email)
-{
-	gboolean changed = FALSE;
-	
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	
-	if (email == NULL) {
-		if (dest->priv->email != NULL) {
-			g_free (dest->priv->addr);
-			dest->priv->addr = NULL;
-			changed = TRUE;
-		}
-	} else if (dest->priv->email == NULL || strcmp (dest->priv->email, email)) {
-		g_free (dest->priv->email);
-		dest->priv->email = g_strdup (email);
-		changed = TRUE;
-	}
-	
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		eab_destination_changed (dest);
-	}
-}
-
-void
-eab_destination_set_html_mail_pref (EABDestination *dest, gboolean x)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	
-	dest->priv->html_mail_override = TRUE;
-	if (dest->priv->wants_html_mail != x) {
-		dest->priv->wants_html_mail = x;
-		eab_destination_changed (dest);
-	}
-}
-
-gboolean
-eab_destination_contains_contact (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	return dest->priv->contact != NULL;
-}
-
-gboolean
-eab_destination_from_contact (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	return dest->priv->contact != NULL || dest->priv->book_uri != NULL || dest->priv->uid != NULL;
-}
-
-gboolean
-eab_destination_is_auto_recipient (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	
-	return dest->priv->auto_recipient;
-}
-
-void
-eab_destination_set_auto_recipient (EABDestination *dest, gboolean value)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	
-	dest->priv->auto_recipient = value;
-}
-
-typedef struct _UseContact UseContact;
-struct _UseContact {
-	EABDestination *dest;
-	EABDestinationContactCallback cb;
-	gpointer closure;
-};
-
-static void
-use_contact_cb (EContact *contact, gpointer closure)
-{
-	UseContact *uc = (UseContact *) closure;
-	
-	if (contact != NULL && uc->dest->priv->contact == NULL) {
-		uc->dest->priv->contact = contact;
-		g_object_ref (uc->dest->priv->contact);
-		eab_destination_changed (uc->dest);
-	}
-	
-	if (uc->cb) {
-		uc->cb (uc->dest, uc->dest->priv->contact, uc->closure);
-	}
-	
-	/* We held a copy of the destination during the callback. */
-	g_object_unref (uc->dest);
-	g_free (uc);
-}
-
-void
-eab_destination_use_contact (EABDestination *dest, EABDestinationContactCallback cb, gpointer closure)
-{
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	
-	if (dest->priv->contact != NULL) {
-		if (cb)
-			cb (dest, dest->priv->contact, closure);
-	} else if (dest->priv->book_uri != NULL && dest->priv->uid != NULL) {
-		UseContact *uc = g_new (UseContact, 1);
-		
-		uc->dest = dest;
-		/* Hold a reference to the destination during the callback. */
-		g_object_ref (uc->dest);
-		uc->cb = cb;
-		uc->closure = closure;
-#if notyet
-		e_contact_load_uri (dest->priv->book_uri, dest->priv->uid, use_contact_cb, uc);
-#endif
-	} else {
-		if (cb)
-			cb (dest, NULL, closure);
-	}
-}
-
-EContact *
-eab_destination_get_contact (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	return dest->priv->contact;
-}
-
-const gchar *
-eab_destination_get_contact_uid (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->uid)
-		return dest->priv->uid;
-	
-	if (dest->priv->contact)
-		return e_contact_get_const (dest->priv->contact, E_CONTACT_UID);
-	
-	return NULL;
-}
-
-const gchar *
-eab_destination_get_book_uri (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	return dest->priv->book_uri;
-}
-
-gint
-eab_destination_get_email_num (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), -1);
-	
-	if (dest->priv->contact == NULL && (dest->priv->book_uri == NULL || dest->priv->uid == NULL))
-		return -1;
-	
-	return dest->priv->email_num;
-}
-
-const gchar *
-eab_destination_get_name (const EABDestination *dest)
-{
-	struct _EABDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EABDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->name == NULL) {
-		if (priv->contact != NULL) {
-			priv->name = e_contact_get (priv->contact, E_CONTACT_FULL_NAME);
-			
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				priv->name = e_contact_get (priv->contact, E_CONTACT_FILE_AS);
-			}
-			
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				if (e_contact_get (priv->contact, E_CONTACT_IS_LIST))
-					priv->name = g_strdup (_("Unnamed List"));
-				else
-					priv->name = g_strdup (eab_destination_get_email (dest));
-			}
-		} else if (priv->raw != NULL) {
-			CamelInternetAddress *addr = camel_internet_address_new ();
-			
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const char *camel_name = NULL;
-				
-				camel_internet_address_get (addr, 0, &camel_name, NULL);
-				priv->name = g_strdup (camel_name);
-			}
-			
-			camel_object_unref (CAMEL_OBJECT (addr));
-		}
-	}
-	
-	return priv->name;
-}
-
-const gchar *
-eab_destination_get_email (const EABDestination *dest)
-{
-	struct _EABDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EABDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->email == NULL) {
-		if (priv->contact != NULL) {
-			/* Pull the address out of the card. */
-			GList *email = e_contact_get (priv->contact, E_CONTACT_EMAIL);
-			if (email) {
-				char *e = g_list_nth_data (email, priv->email_num);
-
-				if (e)
-					priv->email = g_strdup (e);
-			} 
-			if (email) {
-				g_list_foreach (email, (GFunc)g_free, NULL);
-				g_list_free (email);
-			}
-			
-		} else if (priv->raw != NULL) {
-			CamelInternetAddress *addr = camel_internet_address_new ();
-			
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const gchar *camel_email = NULL;
-				camel_internet_address_get (addr, 0, NULL, &camel_email);
-				priv->email = g_strdup (camel_email);
-			}
-			
-			camel_object_unref (CAMEL_OBJECT (addr));
-		} 
-		
-		/* Force e-mail to be non-null... */
-		if (priv->email == NULL) {
-			priv->email = g_strdup ("");
-		}
-	}
-	
-	return priv->email;
-}
-
-const gchar *
-eab_destination_get_address (const EABDestination *dest)
-{
-	struct _EABDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EABDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->addr == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-		
-		if (eab_destination_is_evolution_list (dest)) {
-			GList *iter = dest->priv->list_dests;
-			
-			while (iter) {
-				EABDestination *list_dest = EAB_DESTINATION (iter->data);
-				
-				if (!eab_destination_is_empty (list_dest)) {
-					camel_internet_address_add (addr, 
-								    eab_destination_get_name (list_dest),
-								    eab_destination_get_email (list_dest));
-				}
-				iter = g_list_next (iter);
-			}
-			
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-		} else if (priv->raw) {
-
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-			}
-		} else {
-			camel_internet_address_add (addr,
-						    eab_destination_get_name (dest),
-						    eab_destination_get_email (dest));
-			
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-		}
-		
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-	
-	return priv->addr;
-}
-
-void
-eab_destination_set_raw (EABDestination *dest, const gchar *raw)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	g_return_if_fail (raw != NULL);
-	
-	if (dest->priv->raw == NULL || strcmp (dest->priv->raw, raw)) {
-		eab_destination_freeze (dest);
-		
-		eab_destination_clear (dest);
-		dest->priv->raw = g_strdup (raw);
-		eab_destination_changed (dest);
-		
-		eab_destination_thaw (dest);
-	}
-}
-
-const gchar *
-eab_destination_get_textrep (const EABDestination *dest, gboolean include_email)
-{
-	const char *name, *email;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->raw)
-		return dest->priv->raw;
-	
-	name  = eab_destination_get_name (dest);
-	email = eab_destination_get_email (dest);
-	
-	if (eab_destination_from_contact (dest) && name != NULL && (!include_email || !email || !*email))
-		return name;
-	
-	/* Make sure that our address gets quoted properly */
-	if (name && email && dest->priv->textrep == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-		
-		camel_internet_address_add (addr, name, email);
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = camel_address_format (CAMEL_ADDRESS (addr));
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-	
-	if (dest->priv->textrep != NULL)
-		return dest->priv->textrep;
-
-	if (email)
-		return email;
-	
-	return "";
-}
-
-gboolean
-eab_destination_is_evolution_list (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->list_dests == NULL
-	    && dest->priv->contact != NULL
-	    && e_contact_get (dest->priv->contact, E_CONTACT_IS_LIST)) {
-		GList *email = e_contact_get (dest->priv->contact, E_CONTACT_EMAIL);
-		if (email) {
-			GList *iter;
-			for (iter = email; iter; iter = iter->next) {
-				EABDestination *list_dest = eab_destination_import ((char *) iter->data);
-
-				if (list_dest)
-					dest->priv->list_dests = g_list_append (dest->priv->list_dests, list_dest);
-			}
-		}
-	}
-	
-	return dest->priv->list_dests != NULL;
-}
-
-gboolean
-eab_destination_list_show_addresses (const EABDestination *dest)
-{
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->contact != NULL)
-		return GPOINTER_TO_UINT (e_contact_get (dest->priv->contact, E_CONTACT_LIST_SHOW_ADDRESSES));
-	
-	return dest->priv->show_addresses;
-}
-
-gboolean
-eab_destination_get_html_mail_pref (const EABDestination *dest)
-{
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	
-	if (dest->priv->html_mail_override || dest->priv->contact == NULL)
-		return dest->priv->wants_html_mail;
-	
-	return e_contact_get (dest->priv->contact, E_CONTACT_WANTS_HTML) ? TRUE : FALSE;
-}
-
-static void
-set_book (EABDestination *dest, EBook *book)
-{
-	if (dest->priv->book && dest->priv->book != book) {
-		g_object_unref (dest->priv->book);
-	}
-		
-	dest->priv->book = book;
-	
-	if (book)
-		g_object_ref (book);
-}
-
-static void
-name_and_email_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABDestination *dest = EAB_DESTINATION (closure);
-	
-	if (status == E_BOOK_ERROR_OK && g_list_length ((GList *) contacts) == 1) {
-		EContact *contact = E_CONTACT (contacts->data);
-		const char *email = eab_destination_get_email (dest);
-		int email_num = 0;
-		
-#if notyet
-		if (eab_destination_is_valid (dest) && email && *email) {
-			email_num = e_contact_email_find_number (contact, eab_destination_get_email (dest));
-		}
-#endif
-		
-		if (email_num >= 0) {
-			const char *book_uri;
-			
-			book_uri = e_book_get_uri (book);
-			
-			dest->priv->contact_loaded = TRUE;
-			eab_destination_set_contact (dest, contact, email_num);
-			eab_destination_set_book_uri (dest, book_uri);
-			g_signal_emit (dest, eab_destination_signals[CONTACT_LOADED], 0);
-		}
-	}
-	
-	if (!dest->priv->contact_loaded)
-		dest->priv->cannot_load = TRUE;
-	
-	g_object_unref (dest); /* drop the reference held by the query */
-}
-
-
-static void
-nickname_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
-{
-	EABDestination *dest = EAB_DESTINATION (closure);
-	
-	if (status == E_BOOK_ERROR_OK) {
-		if (g_list_length ((GList *) contacts) == 1) {
-			const char *book_uri;
-			
-			book_uri = e_book_get_uri (book);
-			
-			dest->priv->contact_loaded = TRUE;
-			eab_destination_set_contact (dest, E_CONTACT (contacts->data), 0); /* Uses primary e-mail by default. */
-			eab_destination_set_book_uri (dest, book_uri);
-			g_signal_emit (dest, eab_destination_signals[CONTACT_LOADED], 0);
-			
-			g_object_unref (dest); /* drop the reference held by the query */
-			
-		} else {
-			/* We can only end up here if we don't look at all like an e-mail address, so
-			   we do a name-only query on the textrep */
-			
-			eab_name_and_email_query (book,
-						  eab_destination_get_textrep (dest, FALSE),
-						  NULL,
-						  name_and_email_cb,
-						  dest);
-		}
-	} else {
-		/* Something went wrong with the query: drop our ref to the destination and return. */
-		g_object_unref (dest);
-	}
-}
-
-static void
-launch_load_contact_query (EABDestination *dest)
-{
-	if (! eab_destination_is_valid (dest)) {
-		/* If it doesn't look like an e-mail address, see if it is a nickname. */
-		eab_nickname_query (dest->priv->book,
-				    eab_destination_get_textrep (dest, FALSE),
-				    nickname_cb,
-				    dest);
-
-	} else {
-		eab_name_and_email_query (dest->priv->book,
-					  eab_destination_get_name (dest),
-					  eab_destination_get_email (dest),
-					  name_and_email_cb,
-					  dest);
-	}
-}
-
-void
-eab_destination_load_contact (EABDestination *dest, EBook *book)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	
-	if (eab_destination_is_evolution_list (dest))
-		return;
-	
-	if (eab_destination_contains_contact (dest))
-		return;
-	
-	if (dest->priv->cannot_load)
-		return;
-	
-	eab_destination_cancel_contact_load (dest);
-	
-	set_book (dest, book);
-	
-	/* Handle the case of an EABDestination containing a contact URL */
-	if (eab_destination_contains_contact (dest)) {
-		eab_destination_use_contact (dest, NULL, NULL);
-		return;
-	}
-	
-	/* We hold a reference to ourselves until our query is complete. */
-	g_object_ref (dest);
-	launch_load_contact_query (dest);
-}
-
-static int
-do_load_delayed (gpointer ptr)
-{
-	EABDestination *dest = EAB_DESTINATION (ptr);
-	
-	eab_destination_load_contact (dest, dest->priv->book);
-	return FALSE;
-}
-
-void
-eab_destination_load_contact_delayed (EABDestination *dest, EBook *book, gint delay)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	
-	if (delay < 0)
-		delay = 500;
-	
-	eab_destination_cancel_contact_load (dest);
-	
-	set_book (dest, book);
-	
-	dest->priv->pending_contact_load = g_timeout_add (delay, do_load_delayed, dest);
-}
-
-void
-eab_destination_cancel_contact_load (EABDestination *dest)
-{
-	g_return_if_fail (EAB_IS_DESTINATION (dest));
-	
-	if (dest->priv->pending_contact_load) {
-		g_source_remove (dest->priv->pending_contact_load);
-		dest->priv->pending_contact_load = 0;
-	}
-}
-
-gboolean
-eab_destination_unload_contact (EABDestination *dest)
-{
-	char *email;
-	
-	g_return_val_if_fail (EAB_IS_DESTINATION (dest), FALSE);
-	
-	if (!eab_destination_contains_contact (dest))
-		return FALSE;
-	
-	email = g_strdup (eab_destination_get_email (dest));
-	
-	if (email == NULL)
-		return FALSE;
-	
-	eab_destination_freeze (dest);
-	eab_destination_clear (dest);
-	eab_destination_set_raw (dest, email);
-	g_free (email);
-	eab_destination_thaw (dest);
-	
-	return TRUE;
-}
-
-/*
- * Destination import/export
- */
-
-gchar *
-eab_destination_get_address_textv (EABDestination **destv)
-{
-	int i, j, len = 0;
-	char **strv;
-	char *str;
-	
-	g_return_val_if_fail (destv, NULL);
-	
-	/* Q: Please tell me this is only for assertion
-           reasons. If this is considered to be ok behavior then you
-           shouldn't use g_return's. Just a reminder ;-) 
-	   
-	   A: Yes, this is just an assertion.  (Though it does find the
-	   length of the vector in the process...)
-	*/
-	while (destv[len]) {
-		g_return_val_if_fail (EAB_IS_DESTINATION (destv[len]), NULL);
-		len++;
-	}
-	
-	strv = g_new0 (char *, len + 1);
-	for (i = 0, j = 0; destv[i]; i++) {
-		if (!eab_destination_is_empty (destv[i])) {
-			const char *addr = eab_destination_get_address (destv[i]);
-			strv[j++] = addr ? (char *) addr : "";
-		}
-	}
-	
-	str = g_strjoinv (", ", strv);
-	
-	g_free (strv);
-	
-	return str;
-}
-
-xmlNodePtr
-eab_destination_xml_encode (const EABDestination *dest)
-{
-	xmlNodePtr dest_node;
-	const char *str;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	dest_node = xmlNewNode (NULL, "destination");
-	
-	str = eab_destination_get_name (dest);
-	if (str)
-		xmlNewTextChild (dest_node, NULL, "name", str);
-	
-	if (!eab_destination_is_evolution_list (dest)) {
-		str = eab_destination_get_email (dest);
-		if (str)
-			xmlNewTextChild (dest_node, NULL, "email", str);
-	} else {
-		GList *iter = dest->priv->list_dests;
-		
-		while (iter) {
-			EABDestination *list_dest = EAB_DESTINATION (iter->data);
-			xmlNodePtr list_node = xmlNewNode (NULL, "list_entry");
-			
-			str = eab_destination_get_name (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "name", str);
-			
-			str = eab_destination_get_email (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "email", str);
-			
-			xmlAddChild (dest_node, list_node);
-			
-			iter = g_list_next (iter);
-		}
-		
-		xmlNewProp (dest_node, "is_list", "yes");
-		xmlNewProp (dest_node, "show_addresses", 
-			    eab_destination_list_show_addresses (dest) ? "yes" : "no");
-	}
-	
-	str = eab_destination_get_book_uri (dest);
-	if (str) {
-		xmlNewTextChild (dest_node, NULL, "book_uri", str);
-	}
-	
-	str = eab_destination_get_contact_uid (dest);
-	if (str) {
-		char buf[16];
-		
-		xmlNodePtr uri_node = xmlNewTextChild (dest_node, NULL, "card_uid", str);
-		g_snprintf (buf, 16, "%d", eab_destination_get_email_num (dest));
-		xmlNewProp (uri_node, "email_num", buf);
-	}
-	
-	xmlNewProp (dest_node, "html_mail", eab_destination_get_html_mail_pref (dest) ? "yes" : "no");
-	
-	xmlNewProp (dest_node, "auto_recipient",
-		    eab_destination_is_auto_recipient (dest) ? "yes" : "no");
-	
-	return dest_node;
-}
-
-gboolean
-eab_destination_xml_decode (EABDestination *dest, xmlNodePtr node)
-{
-	char *name = NULL, *email = NULL, *book_uri = NULL, *card_uid = NULL;
-	gboolean is_list = FALSE, show_addr = FALSE, auto_recip = FALSE;
-	gboolean html_mail = FALSE;
-	GList *list_dests = NULL;
-	int email_num = -1;
-	char *tmp;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), FALSE);
-	g_return_val_if_fail (node != NULL, FALSE);
-	
-	if (strcmp (node->name, "destination"))
-		return FALSE;
-	
-	tmp = xmlGetProp (node, "html_mail");
-	if (tmp) {
-		html_mail = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "is_list");
-	if (tmp) {
-		is_list = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "show_addresses");
-	if (tmp) {
-		show_addr = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "auto_recipient");
-	if (tmp) {
-		auto_recip = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	node = node->xmlChildrenNode;
-	while (node) {
-		if (!strcmp (node->name, "name")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (name);
-			name = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!is_list && !strcmp (node->name, "email")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (email);
-			email = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (is_list && !strcmp (node->name, "list_entry")) {
-			xmlNodePtr subnode = node->xmlChildrenNode;
-			char *list_name = NULL, *list_email = NULL;
-			
-			while (subnode) {
-				if (!strcmp (subnode->name, "name")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_name);
-					list_name = g_strdup (tmp);
-					xmlFree (tmp);
-				} else if (!strcmp (subnode->name, "email")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_email);
-					list_email = g_strdup (tmp);
-					xmlFree (tmp);
-				}
-				
-				subnode = subnode->next;
-			}
-			
-			if (list_name || list_email) {
-				EABDestination *list_dest = eab_destination_new ();
-				
-				if (list_name)
-					eab_destination_set_name (list_dest, list_name);
-				if (list_email)
-					eab_destination_set_email (list_dest, list_email);
-				
-				g_free (list_name);
-				g_free (list_email);
-				
-				list_dests = g_list_append (list_dests, list_dest);
-			}
-		} else if (!strcmp (node->name, "book_uri")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (book_uri);
-			book_uri = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!strcmp (node->name, "card_uid")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (card_uid);
-			card_uid = g_strdup (tmp);
-			xmlFree (tmp);
-			
-			tmp = xmlGetProp (node, "email_num");
-			email_num = atoi (tmp);
-			xmlFree (tmp);
-		}
-		
-		node = node->next;
-	}
-	
-	eab_destination_freeze (dest);
-	
-	eab_destination_clear (dest);
-	
-	if (name) {
-		eab_destination_set_name (dest, name);
-		g_free (name);
-	}
-	if (email) {
-		eab_destination_set_email (dest, email);
-		g_free (email);
-	}
-	if (book_uri) {
-		eab_destination_set_book_uri (dest, book_uri);
-		g_free (book_uri);
-	}
-	if (card_uid) {
-		eab_destination_set_contact_uid (dest, card_uid, email_num);
-		g_free (card_uid);
-	}
-	if (list_dests)
-		dest->priv->list_dests = list_dests;
-	
-	dest->priv->html_mail_override = TRUE;
-	dest->priv->wants_html_mail = html_mail;
-	
-	dest->priv->show_addresses = show_addr;
-	
-	dest->priv->auto_recipient = auto_recip;
-	
-	eab_destination_thaw (dest);
-	
-	return TRUE;
-}
-
-/* FIXME: Make utf-8 safe */
-static gchar *
-null_terminate_and_remove_extra_whitespace (xmlChar *xml_in, gint size)
-{
-	gboolean skip_white = FALSE;
-	char *xml, *r, *w;
-	
-	if (xml_in == NULL || size <= 0) 
-		return NULL;
-	
-	xml = g_strndup (xml_in, size);
-	r = w = xml;
-	
-	while (*r) {
-		if (*r == '\n' || *r == '\r') {
-			skip_white = TRUE;
-		} else {
-			gboolean is_space = isspace (*r);
-			
-			*w = *r;
-			
-			if (!(skip_white && is_space))
-				w++;
-			if (!is_space)
-				skip_white = FALSE;
-		}
-		r++;
-	}
-	
-	*w = '\0';
-	
-	return xml;
-}
-
-gchar *
-eab_destination_export (const EABDestination *dest)
-{
-	xmlNodePtr dest_node;
-	xmlDocPtr dest_doc;
-	xmlChar *buffer = NULL;
-	int size = -1;
-	char *str;
-	
-	g_return_val_if_fail (dest && EAB_IS_DESTINATION (dest), NULL);
-	
-	dest_node = eab_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;
-}
-
-EABDestination *
-eab_destination_import (const gchar *str)
-{
-	EABDestination *dest = NULL;
-	xmlDocPtr dest_doc;
-	
-	if (!(str && *str))
-		return NULL;
-	
-	dest_doc = xmlParseMemory ((char *) str, strlen (str));
-	if (dest_doc && dest_doc->xmlRootNode) {
-		dest = eab_destination_new ();
-		if (! eab_destination_xml_decode (dest, dest_doc->xmlRootNode)) {
-			g_object_unref (dest);
-			dest = NULL;
-		}
-	}
-	xmlFreeDoc (dest_doc);
-	
-	return dest;
-}
-
-gchar *
-eab_destination_exportv (EABDestination **destv)
-{
-	xmlDocPtr destv_doc;
-	xmlNodePtr destv_node;
-	xmlChar *buffer = NULL;
-	int i, size = -1;
-	char *str;
-	
-	if (destv == NULL || *destv == NULL)
-		return NULL;
-	
-	destv_doc  = xmlNewDoc (XML_DEFAULT_VERSION);
-	destv_node = xmlNewNode (NULL, "destinations");
-	xmlDocSetRootElement (destv_doc, destv_node);
-	
-	for (i = 0; destv[i]; i++) {
-		if (! eab_destination_is_empty (destv[i])) {
-			xmlNodePtr dest_node = eab_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;
-}
-
-EABDestination **
-eab_destination_importv (const gchar *str)
-{
-	GPtrArray *dest_array = NULL;
-	xmlDocPtr destv_doc;
-	xmlNodePtr node;
-	EABDestination **destv = NULL;
-	
-	if (!(str && *str))
-		return NULL;
-	
-	destv_doc = xmlParseMemory ((char *)str, strlen (str));
-	if (destv_doc == NULL)
-		return NULL;
-	
-	node = destv_doc->xmlRootNode;
-	
-	if (strcmp (node->name, "destinations"))
-		goto finished;
-	
-	node = node->xmlChildrenNode;
-	
-	dest_array = g_ptr_array_new ();
-	
-	while (node) {
-		EABDestination *dest;
-		
-		dest = eab_destination_new ();
-		if (eab_destination_xml_decode (dest, node) && !eab_destination_is_empty (dest)) {
-			g_ptr_array_add (dest_array, dest);
-		} else {
-			g_object_unref (dest);
-		}
-		
-		node = node->next;
-	}
-	
-	/* we need destv to be NULL terminated */
-	g_ptr_array_add (dest_array, NULL);
-	
-	destv = (EABDestination **) dest_array->pdata;
-	g_ptr_array_free (dest_array, FALSE);
-	
- finished:
-	xmlFreeDoc (destv_doc);
-	
-	return destv;
-}
-
-EABDestination **
-eab_destination_list_to_vector_sized (GList *list, int n)
-{
-	EABDestination **destv;
-	int i = 0;
-	
-	if (n == -1)
-		n = g_list_length (list);
-	
-	if (n == 0)
-		return NULL;
-	
-	destv = g_new (EABDestination *, n + 1);
-	while (list != NULL && i < n) {
-		destv[i] = EAB_DESTINATION (list->data);
-		list->data = NULL;
-		i++;
-		list = g_list_next (list);
-	}
-	destv[i] = NULL;
-	
-	return destv;
-}
-
-EABDestination **
-eab_destination_list_to_vector (GList *list)
-{
-	return eab_destination_list_to_vector_sized (list, -1);
-}
-
-void
-eab_destination_freev (EABDestination **destv)
-{
-	int i;
-	
-	if (destv) {
-		for (i = 0; destv[i] != NULL; ++i) {
-			g_object_unref (destv[i]);
-		}
-		g_free (destv);
-	}
-
-}
-
-#if notyet
-static void
-touch_cb (EBook *book, const gchar *addr, ECard *card, gpointer closure)
-{
-	if (book != NULL && card != NULL) {
-		e_card_touch (card);
-		d(g_message ("Use score for \"%s\" is now %f", addr, e_card_get_use_score (card)));
-		e_book_commit_card (book, card, NULL, NULL);
-	}
-}
-#endif
-
-void
-eab_destination_touch (EABDestination *dest)
-{
-#if notyet
-	const char *email;
-	
-	g_return_if_fail (dest && EAB_IS_DESTINATION (dest));
-	
-	if (!eab_destination_is_auto_recipient (dest)) {
-		email = eab_destination_get_email (dest);
-		
-		if (email)
-			e_book_query_address_default (email, touch_cb, NULL);
-	}
-#endif
-}
-
-void
-eab_destination_touchv (EABDestination **destv)
-{
-#if notyet
-	int i;
-	
-	g_return_if_fail (destv != NULL);
-	
-	for (i = 0; destv[i] != NULL; ++i) {
-		eab_destination_touch (destv[i]);
-	}
-#endif
-}
diff --git a/addressbook/util/eab-destination.h b/addressbook/util/eab-destination.h
deleted file mode 100644
index 2c8e2abc11..0000000000
--- a/addressbook/util/eab-destination.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * eab-destination.h
- *
- * Copyright (C) 2001-2003 Ximian, Inc.
- *
- * Authors: Jon Trowbridge <trow@ximian.com>
- *          Chris Toshok <toshok@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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 <glib.h>
-#include <glib-object.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-book.h>
-#include <libxml/tree.h>
-
-#define EAB_TYPE_DESTINATION           (eab_destination_get_type ())
-#define EAB_DESTINATION(o)             (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_DESTINATION, EABDestination))
-#define EAB_DESTINATION_CLASS(k)       (G_TYPE_CHECK_CLASS_CAST ((k), EAB_TYPE_DESTINATION, EABDestinationClass))
-#define EAB_IS_DESTINATION(o)          (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_DESTINATION))
-#define EAB_IS_DESTINATION_CLASS(k)    (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_DESTINATION))
-#define EAB_DESTINATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EAB_TYPE_DESTINATION, EABDestinationClass))
-
-typedef struct _EABDestination EABDestination;
-typedef struct _EABDestinationClass EABDestinationClass;
-
-typedef void (*EABDestinationContactCallback) (EABDestination *dest, EContact *contact, gpointer closure);
-
-struct _EABDestinationPrivate;
-
-struct _EABDestination {
-	GObject object;
-
-	struct _EABDestinationPrivate *priv;
-};
-
-struct _EABDestinationClass {
-	GObjectClass parent_class;
-
-	void (*changed) (EABDestination *dest);	
-	void (*contact_loaded) (EABDestination *dest);
-};
-
-GType eab_destination_get_type (void);
-
-
-EABDestination  *eab_destination_new                (void);
-void             eab_destination_changed            (EABDestination *);
-EABDestination  *eab_destination_copy               (const EABDestination *);
-void             eab_destination_clear              (EABDestination *);
-
-gboolean         eab_destination_is_empty           (const EABDestination *);
-gboolean         eab_destination_equal              (const EABDestination *a, const EABDestination *b);
-
-void             eab_destination_set_contact        (EABDestination *, EContact *contact, gint email_num);
-
-void             eab_destination_set_name           (EABDestination *, const gchar *name);
-void             eab_destination_set_email          (EABDestination *, const gchar *email);
-
-void             eab_destination_set_html_mail_pref (EABDestination *, gboolean);
-
-gboolean         eab_destination_contains_contact   (const EABDestination *);
-
-gboolean         eab_destination_is_auto_recipient  (const EABDestination *);
-void             eab_destination_set_auto_recipient (EABDestination *, gboolean value);
-
-void             eab_destination_use_contact        (EABDestination *, EABDestinationContactCallback cb, gpointer closure);
-
-EContact        *eab_destination_get_contact        (const EABDestination *);
-gint             eab_destination_get_email_num      (const EABDestination *);
-
-const gchar     *eab_destination_get_name           (const EABDestination *);  /* "Jane Smith" */
-const gchar     *eab_destination_get_email          (const EABDestination *);  /* "jane@assbarn.com" */
-const gchar     *eab_destination_get_address        (const EABDestination *);;  /* "Jane Smith <jane@assbarn.com>" (or a comma-sep set of such for a list) */
-
-void             eab_destination_set_raw            (EABDestination *, const gchar *free_form_string);
-const gchar     *eab_destination_get_textrep        (const EABDestination *, gboolean include_email);  /* "Jane Smith" or "jane@assbarn.com" */
-
-gboolean         eab_destination_is_evolution_list   (const EABDestination *);
-gboolean         eab_destination_list_show_addresses (const EABDestination *);
-
-/* If true, they want HTML mail. */
-gboolean         eab_destination_get_html_mail_pref (const EABDestination *);
-
-void             eab_destination_load_contact         (EABDestination *, EBook *);
-void             eab_destination_load_contact_delayed (EABDestination *, EBook *, gint delay); /* delay < 0: "default" */
-void             eab_destination_cancel_contact_load  (EABDestination *);
-gboolean         eab_destination_unload_contact       (EABDestination *);
-
-gchar           *eab_destination_get_address_textv  (EABDestination **);
-
-gchar           *eab_destination_export             (const EABDestination *);
-EABDestination  *eab_destination_import             (const gchar *str);
-
-gchar           *eab_destination_exportv            (EABDestination **);
-EABDestination **eab_destination_importv            (const gchar *str);
-
-EABDestination **eab_destination_list_to_vector_sized (GList *, int n);
-EABDestination **eab_destination_list_to_vector       (GList *);
-
-void             eab_destination_freev              (EABDestination **);
-
-void             eab_destination_touch              (EABDestination *);
-void             eab_destination_touchv             (EABDestination **);
-
-
-#endif /* __EAB_DESTINATION_H__ */
-
diff --git a/addressbook/util/eab-marshal.list b/addressbook/util/eab-marshal.list
deleted file mode 100644
index 680ea039a3..0000000000
--- a/addressbook/util/eab-marshal.list
+++ /dev/null
@@ -1,5 +0,0 @@
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:STRING
-NONE:INT
diff --git a/art/.cvsignore b/art/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/art/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
\ No newline at end of file
diff --git a/art/16_copy.png b/art/16_copy.png
deleted file mode 100644
index 31ede839ea..0000000000
--- a/art/16_copy.png
+++ /dev/null
diff --git a/art/16_customize.png b/art/16_customize.png
deleted file mode 100644
index 1a0e15ad4e..0000000000
--- a/art/16_customize.png
+++ /dev/null
diff --git a/art/16_cut.png b/art/16_cut.png
deleted file mode 100644
index 5860a9c56f..0000000000
--- a/art/16_cut.png
+++ /dev/null
diff --git a/art/16_paste.png b/art/16_paste.png
deleted file mode 100644
index 56f15c5cc3..0000000000
--- a/art/16_paste.png
+++ /dev/null
diff --git a/art/ChangeLog b/art/ChangeLog
deleted file mode 100644
index e71ea6327d..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2003-12-04  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (buttons_DATA): added stock junk button and notjunk
-	placeholder (until artists have the right one)
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Add flag-for-followup-done.xpm to EXTRA_DIST
-
-2003-12-02  Not Zed  <NotZed@Ximian.com>
-
-	* flag-for-folloup*: Changed the base flag colour to reddish, and
-	created a -done set, the original blue-ish colour.
-
-2003-11-12  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: replace the foobar file
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* listview.xpm: Add calendar list view icon.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: More artwork from Jakub.
-
-2003-09-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* jump.xpm: add icon for the focused jump button.
-
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* appointment-reminder.png:
-	* appointment-reminder-excl.png: Add icons used by the calendar alarm's
-	systray notification. These are also in gnome-icon-theme HEAD, but
-	until we have workable stock packages, we use this.
-
-2003-06-23  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png:
-	* about-box.png: update Copyright info
diff --git a/art/ChangeLog.pre-1-4 b/art/ChangeLog.pre-1-4
deleted file mode 100644
index 9dec5cedc8..0000000000
--- a/art/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,712 +0,0 @@
-2003-06-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (install-data-local) [DEFAULT_BINARY]: Symlink
-	evolution.png to evolution-$(BASE_VERSION).png.  [#43596]
-
-2003-05-27  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png, splash.png: Update copyright info
-
-2003-05-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-
-2003-05-05  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-contacts-plain.png
-	* evolution-contacts.png:
-	* globe.png:
-	* malehead.png:
-	* next-message.png:
-	* previous-message.png:
-	* receive-24.png:
-	* reply-to-all.png:
-	* reply.png:
-	* send-24-receive.png:
-	* send-24.png:
-	* send-16.png:
-	* send-receive.xpm:
-	* send.png: quick fix of the artwork, the rest goes to the
-	  (future) icon theme
-
-2003-04-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add stock-edit-{16,24}.png
-
-2003-03-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png: New artwork from Jakub.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: remove imagesdir, etc, which are now defined in
-	configure.in
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Version using $(BASE_VERSION).
-	(buttonsdir): Likewise.
-	(conduitsdir): Likewise.
-	(install-data-local): New rule to install evolution.png as
-	evolution-$(BASE_VERSION).png.
-	(EXTRA_DIST): Add evolution.png.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (imagesdir): Install images into
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	(buttonsdir): Likewise, these go into
-	$(datadir)/evolution/images/buttons now.
-	(conduits_DATA): Likewise, $(datadir)/evolution/images/conduits.
-
-2002-11-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New work-in-progress splash from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-	* about-box.png: New artwork from Jakub.
-
-2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* settings.png: New.
-	* settings-16.png: New.
-
-2002-10-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* splash.png: New artwork from Jakub.
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* post-reply-24.png: New icon for "Post a Reply" from Jakub.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New artwork from Jakub.
-	
-2002-09-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-settings.png: New icon from Jakub.
-
-2002-09-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-settings.png: use a more gnomeish version
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* contact-list-16.png: New artwork from Jakub.
-	* post-message-16.png: Likewise.
-	* meeting-request-16.png: Likewise.
-
-	* meeting.xpm: Removed.
-
-2002-07-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail.png: New icon for mail (gnome-textfile.png from GNOME 2, by
-	Tuomas' suggestion).
-
-2002-07-23  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox.png,outbox.png: fix the arrows
-	* font.png: the former one was vector style - from gorilla
-	
-2002-07-22    <jpr@ximian.com>
-
-	* Makefile.am: add new image
-
-2002-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* inbox.png, outbox.png: Added final large versions of the Inbox
-	and Outbox icons.
-
-2002-07-09  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): add folder.png, folder-mini.png,
-	public-folder.png, and public-folder-mini.png
-
-	* folder-mini.png: Renamed from local-16.png
-
-	* folder.png, public-folder.png, public-folder-mini.png: New, from
-	Jakub.
-
-2002-07-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): inbox-mini.png instead of
-	inbox-16.png, outbox-mini.png instead of outbox-16.png.  Also add
-	inbox.png and outbox.png.
-	(inbox.png): New.
-	(outbox.png): New.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* schedule-meeting-24.png: New.
-
-2002-04-25  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): font.png: Add for the font config
-	prefs.
-
-2002-04-17  Dan Winship  <danw@ximian.com>
-
-	* monkey-16.png: Replace with an antialiased version
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA), folder-settings.png: Add. (Copied
-	from Unscalable Gorilla because it was handy. Will probably get
-	changed to something else...)
-
-2002-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar-and-tasks-settings.png: New.
-	* composer-settings.png: New.
-	* ldap-settings.png: New.
-	* mail-accounts-settings.png: New.
-	* summary-settings.png: New.
-
-2002-03-25  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Add working-16.png (the GNOME2 stock
-	"wait" icon, from Jakub)
-
-2002-03-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* forward.xpm, reply.xpm, reply_to_all.xpm: Rename the internal
-	structure to coincide with the filenames.
-
-2002-02-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* about-box.png, splash.png: New cool artwork from Jakub.
-	
-2002-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Remove meeting_widget.png from the build since it
-	doesn't seem to be in cvs?
-
-2002-02-20  Jakub Steiner <jimmac@ximian.com>
-
-	* summary_preferences-16.png: menu icon for summary preferences
-	* Makefile.am: added the icon
-
-2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* flag-for-followup.xpm:
-	* flag-for-followup-16.png:
-	* flag-for-followup-48.png: New icons.
-
-	* Makefile.am: Added the new icons...
-
-2002-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install mail-new.xpm, mail-read.xpm and
-	priority-high.xpm in the same place as other bonobo-ui menu
-	pixmaps so we can use these in menus too.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* connect_to_url-16.xpm: new icon
-
-	* new_all_day_event.png: ditto
-
-	* Makefile.am: install and dist new images
-
-2001-12-11  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: A new icon that sucks less.  We still need
-	some Tuomas-love.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* mail-need-reply.xpm: Added a really, really ugly and
-	awful icon to symbolize "message needs a reply".
-
-	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.png: New, updated icon from Tuomas.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): dist the glade data
-
-2001-11-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (gladedir): New.
-	(glade_DATA): Pixmap files required to be installed by the glade
-	files.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Install `evolution.png', not `evolution-icon.png'.
-
-	* evolution.png: Renamed from `evolution-icon.png', removing the
-	old, now unused `evolution.png'.
-
-2001-10-30  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: new style splash 
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* splash.png: Remove the "1" from "1.0 Release Candidate 1" so it
-	looks better.
-
-2001-10-23  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* Makefile.am (appicon_DATA): Changed the filename here too 
-	so the icon gets installed.
-
-	* evolution-icon.png: New icon that scales better.
-
-2001-10-22  Jakub Steiner <jimmac@ximian.com>
-
-	* about-box.png: update the layout a bit
-	* splash.png: update to 0.17 
-
-2001-10-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Add `about-box.png'.
-
-	* about-box.png: New image for the about box from Jakub.
-
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* Makefile.am (images_DATA): add alarm.png for the new alarm
-	notification code.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): change ldap-16.png to ldap-mini.png,
-	and add ldap.png.
-
-2001-10-04  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: bump to 0.16
-	* ldap.png: 48x48 version for shortcut bar
-
-2001-09-25  Iain Holmes  <iain@ximian.com>
-
-	* add task.png
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* remove timezone.png...dunno where it came from.
-
-2001-09-21  Iain Holmes  <iain@ximian.com>
-
-	* install timezone-16.xpm
-
-2001-09-21  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta4
-
-2001-09-08  Jakub Steiner <jimmac@ximian.com>
-
-	* pgp-signature-*: for the pgp signature checking
-	* Makefile.am (images_DATA): add the icon files
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add ldap-16.png.
-
-2001-09-05  Jakub Steiner <jimmac@ximian.com>
-
-	* meeting-request.png: for the inline .ics stuff
-	* Makefile.am (images_DATA): add the icon file
-
-2001-09-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-48.png: for the timezone configuration step in the
-	  first-time-druid
-	* Makefile.am (images_DATA): add the icon file
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: install new file
-
-	* talking-heads.png: new graphic for meeting requests
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added goto-16.png & new_task-16.png.
-	(buttons_DATA): added save-24.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (buttons_DATA): added cut.png, copy.png & paste.png,
-	so we can use them for the tasks toolbar.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added 16_copy.png, 16_customize.png,
-	16_cut.png & 16_paste.png.
-	(buttons_DATA): added new_task.png, which I made from scaling up the
-	smaller task.xpm icon.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Added `delete-message.png'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,
-	so we can use it for the menus. Note that we don't have an icon to
-	use in the toolbar for a new task, and we need one. Jakub?
-
-2001-08-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* wax-seal.png: Added.
-
-	* wax-seal-broken.png: Added.
-
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: marketing spoils the fun. boring splash again.
-	
-2001-08-17  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: Ruperzilla splash
-	
-	* splash-1-0.png: 1.0 candidate
-
-2001-08-16  Jakub Steiner <jimmac@ximian.com>
-
-	* {next,previous}-message.png: use new document template. maybe
-	  still a bit dark.
-	
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* add-attachment.png: get rid of the yellow
-
-	* compose-message.png: the old one seemed too dark to me. This one
-	shares the same document base as the new stuff.
-
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* all_contacts.xpm, new_contact.xpm: Nat wanted something bigger
-	  that would match the new button style. The filename of
-	  all_contacts.xpm is crap, maybe you guys can fix it to be
-	  "new_list.xpm" or something. Didn't want to break things.
-	 
-2001-08-15  Jakub Steiner <jimmac@ximian.com>
-
-	* save-16.png, save-as-16.png: fix bottom. Tuomas didn't like too
-	  much detail.
-
-2001-08-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* goto-24.png: Icon for "Goto date.." -button. Someone could add
-	this into the code?
-
-2001-08-14  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* arrow-[left,right]-24.png: new arrow icons for calendar
-	toolbar..
-
-2001-08-14  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-today-mini.png: new summary tree view icon.
-
-2001-08-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* 16_category_*: removed these files, which are now in gal
-
-2001-08-09  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-receive.xpm: Updated this to have the yellow/green arrows
-	so it matches the style of other icons. Noticed that tasklist
-	scales 16x16 icons larger, so they generally look Bad(tm). (fixes
-	#6475)
-
-2001-08-07  Damon Chaplin  <damon@ximian.com>
-
-	* timezone-16.xpm: copied from the international category icon.
-	It would be better to have 2 different icons for these, but I had
-	to get rid of that square timezone icon!
-
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-trash-mini.png: scaled down Tuomas' trash icon.
-	  tweaked a bit. looks a lot better than the previous one.
-	
-2001-08-07  Jakub Steiner <jimmac@ximian.com>
-
-	* inbox-*, outbox-*: tree view icons * filters.xpm, edit-16.xpm,
-	marlboro_filters.xpm: remove unused * vfolder-16.xpm,
-	delete-message.xpm, undelete-message.xpm: let's not use xpms *
-	evolution-trash-mini.png: new version for edit>delete message,
-	tree view and everything * undelete_message-16.png,
-	folder-move-16.png, open-in-new-window-16.png, folder-copy-16.png:
-	tree view icons * faq-16.png, mark-as-important-16.png: menu icons
-	* Makefile.am (images_DATA): add new icons, change some xpms to
-	pngs
-      
-
-2001-08-03  Jakub Steiner <jimmac@ximian.com>
-
-	* ldap-16.png, imap-16.png, local-16.png: tree view icons for
-	  imap, ldap and local folders.
-
-2001-08-02  Jakub Steiner <jimmac@ximian.com>
-
-	* myevo-mail-summary.png, myevo-post-it.png, *
-	myevo-appointments.png: icons for My Evolution -- mail summary,
-	tasks, appointments. These are _NOT_TO_ replace the shortcut
-	icons, but solely for My Evolution.
-	
-2001-08-02  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* receive-24.png: Icon for the send/receive dialog at least.
-
-2001-07-31  Jakub Steiner <jimmac@ximian.com>
-
-	* splash.png: beta2 splash
-
-2001-07-31  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* send-24-receive.png: New version, looks more consistent with the
-	other icons.
-
-2001-07-30  Jakub Steiner <jimmac@ximian.com>
-
-	* search-16.png, search-and-replace-16.png: menu versions for
-	  shell and editor.  * properties-16.png: properties for shel
-	  (maybe other places too) * send-16.png, send-later-16.png:
-	  editor, shell menu.  * work_online-16.png: to accompany work
-	  online menu toggle.  * save-16.png, save-as-16.png:
-	  everywhere. (based on Tuomas new gnome stock panel icon)
-	
-2001-07-27    <tigert@ximian.com>
-
-	* new_appointment.[xpm,png]: New version, fixes bug #4704
-	hopefully.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (images_DATA): added print-preview-24.png.
-
-2001-07-25  Jakub Steiner <jimmac@ximian.com>
-
-	* print-preview-24.png: toolbar icon for calendar's appointment
-	  dialog (now using the menu version)
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* Pull in new splash screen
-
-2001-07-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install 2 new category icons
-	(16_category_suppliers.png and 16_category_time-and-expenses.png)
-
-2001-07-20    <tigert@ximian.com>
-
-	* 16_category_time-and-expenses.png: Icon for "Time & Expenses"
-	category..
-
-	* 16_category_suppliers.png: Icon for "Suppliers" category..
-
-	* evolution-calendar.png, evolution-contacts.png,
-	evolution-inbox.png, evolution-tasks.png, evolution-today.png:
-	Took out the colored background circles from the icons, apparently
-	people found them confusing rather than useful, especially on
-	small icons -mode of the shortcutbar.
-
-2001-07-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install the 2 new category icons
-
-2001-07-19    <tigert@ximian.com>
-
-	* 16_category_strategies.png, 16_category_status.png: New category
-	icons.
-
-2001-07-19  Jakub Steiner <jimmac@ximian.com>
-
-	* insert-link-24.png, insert-table-24.png, insert-image-24.png:
-	  toolbar icons for message editor.
-
-2001-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Makefile.am: install category icons
-
-2001-07-17  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_holiday-cards.png 16_category_hot-contacts.png
-	16_category_ideas.png: new category icons..
-
-2001-07-16  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_favorites.png 16_category_gifts.png
-	16_category_goals.png: New additions for the category stuff..
-	still more to do..
-
-2001-07-13  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* 16_category_*.png: Some category icons for calendar/tasks, to
-	match the different category types for events. Still many to do,
-	but I wanted to commit them so you people can start hacking on the
-	code already. More to follow shortly.
-
-	* 16_customize.png: Icon for "Customize toolbars" or whatever menu
-	item that deals with customizing stuff (the icon is a wrench)
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: extra dist another xpm
-
-2001-07-12    <tigert@ximian.com>
-
-	* delete_message.[png,xpm]: New versions for the trashcan icon.  I
-	am wondering if we should do some filename cleanup here, all menu
-	icons should really be 16_foo.png, whereas the toolbar ones should
-	be foo.png. Currently we are mixing PNG and XPM here with some
-	files having otherwise same names (like this one)..
-
-2001-07-11    <tigert@ximian.com>
-
-	* new_appointment.[png,xpm]: New versions
-
-2001-07-10  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* new_appointment.png: New appointment icon.  *
-	new_appointment.xpm: Small version.. (should we change this to
-	16_new_appointment.png btw?
-
-2001-07-09  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Install the myweather-* icons.
-
-2001-07-07    <tigert@ximian.com>
-
-	* 16_[cut,copy,paste].png: New icons for the
-	Edit->[Cut,Copy,Paste] entries, the current gnome-stock ones start
-	to look bad when scaled down, so these are already 16x16 pixels.
-
-2001-07-05  Jakub Steiner <jimmac@ximian.com>
-
-	* myweather-*: weather status icons for My Evolution
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* Makefile.am: install apply-filters-16.xpm
-
-2001-07-03  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit
-	the general style.
-
-2001-07-01  Jakub Steiner <jimmac@ximian.com>
-
-	* print.xpm, print-preview.xpm: nat didn't like the jaggy
-	  version. This one is based on tuomas 48x48 print icon.
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',
-	`previous-message.png'.
-
-2001-06-29  Jakub Steiner <jimmac@ximian.com>
-
-	* remove-nntp-folder-24.png, add-nntp-folder-24.png,
-	  refresh-nntp-folders-24.png: manage subscriptions toolbar icons
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* print.png: Icon for print message.
-
-	* next-message.png, previous-message.png: New icons to replace the
-	< > arrows in the mailer.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (images_DATA): add contact-is-a-list.png
-
-2001-06-29  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* contact-is-a-list.png: icon for toshok, for contact lists.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Install the add-attachment.png icon.
-
-2001-06-27  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* evolution-calendar-mini.png: New version of the folder tree's
-	calendar icon. Doesnt look too much like the contacts icon.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* world_map-960.png: world map picture used for selecting
-	timezones.  * Makefile.am (images_DATA): added world_map-960.png
-	for timezones.
-
-2001-06-14  Jakub Steiner <jimmac@ximian.com>
-
-	* apply-filters-16.xpm: for mailer menu.  * vfolder-16.xpm:
-	vfolder icon for menu items * hand-16.xpm: originally ment for
-	customize toolbars. might not work * edit-16.xpm: edit message
-	(message open)
-	
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* rdf.png, ico-rdf.png: ximianize those
-
-2001-06-13  Jakub Steiner <jimmac@ximian.com>
-
-	* splash-1-0.png: Initial mockup for the final splash.  Didn't
-	  wan't to overwrite the unstable splash.png.
-	
-2001-06-07  Iain Holmes  <iain@ximian.com>
-
-	* empty.gif: es-weather.png es-appointments.png ico-calendar.png
-	  ico-mail.png ico-rdf.png ico-weather.png bcg.png rdf.png
-	  pattern.png: Added all these for the new My Evolution
-
-2001-06-04  Jakub Steiner <jimmac@ximian.com>
-
-	* timezone-16.xpm: for events in a diffrent timezone
-
-2001-05-22  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-inbox-mini.png: fixed the shadow
-
-2001-05-17  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (images_DATA): Install Jakub's new icons
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* mail-config-druid-48.png, mail-config-druid-identity.png,
-	  mail-config-druid-account-name.png,
-	  mail-config-druid-receive.png, mail-config-druid-send.png,
-	  thankyou.png: config druid icons
-	  
-	      thankyou.png can be used for the last step in every evo
-	      druid (like the import one)
-
-2001-05-16  Jakub Steiner <jimmac@ximian.com>
-
-	* evolution-calendar.png, evolution-contacts.png,
-	  evolution-inbox.png, evolution-today.png, evolution-tasks.png:
-	  fixed bug #2862. Also changed the envelope icon Oh and we use
-	  #b39169 for calendar now
-	  
-2001-05-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (images_DATA): Added `online.png' and `offline.png'.
-
-	* online.png: New icon by Tuomas.  * offline.png: New icon by
-	Tuomas.
-
-2001-05-14  Duncan Mak  <duncan@ximian.com>
-
-	* Makefile.am (images_DATA): add in the new find_message.xpm
-
-2001-05-14  Jakub Steiner <jimmac@ximian.com>
-
-	* find_message.xpm: Duncan requested this
-
diff --git a/art/Makefile.am b/art/Makefile.am
deleted file mode 100644
index 7e23226ed1..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,272 +0,0 @@
-images_DATA = \
-	16_copy.png			\
-	16_customize.png		\
-	16_cut.png			\
-	16_paste.png			\
-	about-box.png			\
-	alarm.png			\
-	all_contacts.xpm		\
-	apply-filters-16.xpm		\
-	appointment-reminder.png	\
-	appointment-reminder-excl.png	\
-	bcg.png				\
-	briefcase.png       		\
-	butterfly.png			\
-	calendar-and-tasks-settings.png \
-	cellphone.png       		\
-	compose-message.png		\
-	composer-settings.png		\
-	configure_16_addressbook.xpm	\
-	configure_16_calendar.xpm	\
-	configure_16_folder.xpm		\
-	configure_16_mail.xpm		\
-	connect_to_url-16.xpm		\
-	contact-is-a-list.png		\
-	contact-list-16.png		\
-	copy_16_message.xpm		\
-	edit.xpm			\
-	empty.gif			\
-	encrypt.xpm			\
-	envelope.png        		\
-	es-appointments.png		\
-	es-weather.png			\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.png 	\
-	evolution-contacts-plain.png 	\
-	evolution-contacts.png 		\
-	evolution-inbox-mini.png 	\
-	evolution-inbox.png 		\
-	evolution-notes-mini.png 	\
-	evolution-notes.png 		\
-	evolution-tasks-mini.png 	\
-	evolution-tasks.png 		\
-	evolution-today-mini.png	\
-	evolution-today.png 		\
-	evolution-trash-mini.png 	\
-	evolution-trash.png 		\
-	evolution-junk.png		\
-	evolution-junk-mini.png		\
-	executive-summary-bg.png	\
-	executive-summary-curve.png	\
-	info-bulb.png			\
-	faq-16.png			\
-	fetch-mail.png			\
-	find_contact.xpm		\
-	find_message.xpm		\
-	flag-for-followup-16.png	\
-	folder-copy-16.png		\
-	folder-move-16.png		\
-	folder-settings.png		\
-	folder.png			\
-	folder-mini.png			\
-	folder.xpm			\
-	font.png			\
-	forward.xpm			\
-	globe.png           		\
-	goto-16.png			\
-	hide_deleted_messages.xpm	\
-	hide_read_messages.xpm		\
-	hide_selected_messages.xpm	\
-	house.png           		\
-	ico-calendar.png		\
-	ico-mail.png			\
-	ico-rdf.png			\
-	ico-weather.png			\
-	import.png			\
-	import.xpm			\
-	inbox.png			\
-	inbox-mini.png			\
-	ldap-mini.png			\
-	ldap-settings.png		\
-	ldap.png			\
-	mail.png			\
-	mail-accounts-settings.png	\
-	mail-config-druid-account-name.png \
-	mail-config-druid-identity.png	\
-	mail-config-druid-receive.png	\
-	mail-config-druid-send.png	\
-	mail-config-druid.png		\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	malehead.png			\
-	mark-as-important-16.png	\
-	meeting-request.png		\
-	meeting-request-16.png 		\
-	monkey-16.png			\
-	move_message.xpm		\
-	myevo-appointments.png		\
-	myevo-mail-summary.png		\
-	myevo-post-it.png		\
-	myweather-clouds.png		\
-	myweather-fog.png		\
-	myweather-rain.png		\
-	myweather-snow.png		\
-	myweather-storm.png		\
-	myweather-sun.png		\
-	myweather-suncloud.png		\
-	new-message.xpm			\
-	new_all_day_event.png		\
-	new_appointment.xpm		\
-	new_contact.xpm			\
-	new_task-16.png			\
-	offline.png			\
-	online.png			\
-	open-in-new-window-16.png 	\
-	outbox.png			\
-	outbox-mini.png			\
-	pattern.png			\
-	pgp-signature-bad.png 		\
-	pgp-signature-nokey.png 	\
-	pgp-signature-ok.png 		\
-	post-message-16.png		\
-	post-reply-24.png		\
-	print-preview.xpm		\
-	print.xpm			\
-	priority-high.xpm		\
-	public-folder.png		\
-	public-folder-mini.png		\
-	rdf.png				\
-	reply.xpm			\
-	reply_to_all.xpm		\
-	save-16.png			\
-	save-as-16.png			\
-	save.xpm			\
-	schedule-meeting-16.xpm		\
-	schedule-meeting-24.png		\
-	search-16.png			\
-	search-and-replace-16.png	\
-	send-16.png                     \
-	send-later-16.png		\
-	send-receive.xpm		\
-	service-close.png		\
-	service-configure.png		\
-	service-down-disabled.png	\
-	service-down.png		\
-	service-left-disabled.png	\
-	service-left.png		\
-	service-right-disabled.png	\
-	service-right.png		\
-	service-up-disabled.png		\
-	service-up.png			\
-	settings.png			\
-	settings-16.png			\
-	show_all_messages.xpm		\
-	splash.png			\
-	stock-edit-16.png		\
-	stock-edit-24.png		\
-	stock-junk-24.png		\
-	stock-notjunk-24.png		\
-	summary-settings.png		\
-	summary_preferences-16.png	\
-	talking-heads.png		\
-	task.png			\
-	task.xpm			\
-	thankyou.png			\
-	timezone-16.xpm			\
-	timezone-48.png 		\
-	undelete_message-16.png		\
-	wax-seal-broken.png		\
-	wax-seal.png			\
-	work_offline.xpm		\
-	work_online-16.png		\
-	working-16.png			\
-	world_map-960.png
-
-buttons_DATA = 				\
-	arrow-right-24.png		\
-	arrow-left-24.png		\
-	add-attachment.png		\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	copy.png			\
-	cut.png				\
-	dayview.xpm			\
-	delete-message.png		\
-	fetch-mail.png			\
-	forward.png			\
-	goto-24.png  			\
-	listview.xpm			\
-	monthview.xpm  			\
-	move-message.png		\
-	next-message.png		\
-	new_appointment.png		\
-	new_task.png			\
-	paste.png			\
-	previous-message.png		\
-	print.png			\
-	print-preview-24.png		\
-	reply.png			\
-	reply-to-all.png		\
-	receive-24.png		\
-	save-24.png			\
-	send-24-receive.png		\
-	send-24.png		\
-	weekview.xpm  			\
-	workweekview.xpm		\
-	yearview.xpm
-
-glade_DATA = 					\
-	evolution.png				\
-	import.png				\
-	flag-for-followup-48.png		\
-	mail-config-druid-account-name.png	\
-	mail-config-druid-identity.png		\
-	mail-config-druid.png			\
-	mail-config-druid-receive.png		\
-	mail-config-druid-send.png		\
-	thankyou.png				\
-	timezone-48.png
-
-conduitsdir = $(imagesdir)/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
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL_DATA) $(srcdir)/evolution.png  $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-if DEFAULT_BINARY
-	cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
-endif
-
-EXTRA_DIST = 				\
-	ChangeLog.pre-1-4		\
-	attachment.xpm			\
-	bell.xpm			\
-	check-filled.xpm		\
-	empty.xpm			\
-	evolution.png			\
-	jump.xpm			\
-	mail-need-reply.xpm		\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	mail-replied.xpm		\
-	flag-for-followup.xpm		\
-	flag-for-followup-done.xpm	\
-	mark.xpm			\
-	priority-high.xpm		\
-	priority-low.xpm		\
-	recur.xpm			\
-	score-higher.xpm		\
-	score-highest.xpm		\
-	score-high.xpm			\
-	score-lower.xpm			\
-	score-lowest.xpm		\
-	score-low.xpm			\
-	score-normal.xpm		\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	timezone-16.xpm			\
-	tree-expanded.xpm		\
-	tree-unexpanded.xpm		\
-	$(images_DATA)			\
-	$(buttons_DATA)			\
-	$(conduits_DATA)		\
-	$(glade_DATA)
diff --git a/art/about-box.png b/art/about-box.png
deleted file mode 100644
index c3613fb4bb..0000000000
--- a/art/about-box.png
+++ /dev/null
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index adbec9900b..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-nntp-folder-24.png b/art/add-nntp-folder-24.png
deleted file mode 100644
index 4941fe9250..0000000000
--- a/art/add-nntp-folder-24.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index eb20f4e068..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/alarm.png b/art/alarm.png
deleted file mode 100644
index 71a9be8a48..0000000000
--- a/art/alarm.png
+++ /dev/null
diff --git a/art/all_contacts.xpm b/art/all_contacts.xpm
deleted file mode 100644
index 817bff7649..0000000000
--- a/art/all_contacts.xpm
+++ /dev/null
@@ -1,158 +0,0 @@
-/* XPM */
-static char * all_contacts_xpm[] = {
-"24 24 131 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FDFDFD",
-"@ 	c #F5F5F5",
-"# 	c #F6F6F6",
-"$ 	c #D0D0D0",
-"% 	c #C1C1C1",
-"& 	c #C3C3C3",
-"* 	c #C6C6C6",
-"= 	c #C8C8C8",
-"- 	c #8D8D8D",
-"; 	c #CACACA",
-"> 	c #919191",
-", 	c #EFEFEF",
-"' 	c #878787",
-") 	c #8A8A8A",
-"! 	c #5C5C5C",
-"~ 	c #F8F8F8",
-"{ 	c #EAEAEA",
-"] 	c #CCCCCC",
-"^ 	c #CECECE",
-"/ 	c #979797",
-"( 	c #D2D2D2",
-"_ 	c #9A9A9A",
-": 	c #646464",
-"< 	c #939393",
-"[ 	c #9D9D9D",
-"} 	c #6B6B6B",
-"| 	c #BDBDBD",
-"1 	c #FFFFFF",
-"2 	c #A1A1A1",
-"3 	c #D9D9D9",
-"4 	c #E3E3E3",
-"5 	c #EDEDED",
-"6 	c #EEEEEE",
-"7 	c #C9B49B",
-"8 	c #8E7151",
-"9 	c #876E51",
-"0 	c #BAB1A5",
-"a 	c #FBFBFB",
-"b 	c #FEFEFE",
-"c 	c #DEDCD7",
-"d 	c #9E9E9E",
-"e 	c #BABABA",
-"f 	c #D1D1D1",
-"g 	c #A3A3A3",
-"h 	c #F3F3F3",
-"i 	c #A88D6E",
-"j 	c #DFD0BF",
-"k 	c #5E432B",
-"l 	c #7E6C5B",
-"m 	c #313131",
-"n 	c #575757",
-"o 	c #FCFCFC",
-"p 	c #555555",
-"q 	c #D5D3CF",
-"r 	c #868686",
-"s 	c #A6A6A6",
-"t 	c #CDCDCD",
-"u 	c #DBDBDB",
-"v 	c #EEDFCC",
-"w 	c #F4EEE6",
-"x 	c #765E45",
-"y 	c #736251",
-"z 	c #D9D7D2",
-"A 	c #606060",
-"B 	c #7D7D7D",
-"C 	c #9C9C9C",
-"D 	c #A5A5A5",
-"E 	c #7C7C7C",
-"F 	c #FAFAFA",
-"G 	c #7590AE",
-"H 	c #C1665A",
-"I 	c #445B71",
-"J 	c #D7D6D3",
-"K 	c #ADADAD",
-"L 	c #9B9B9B",
-"M 	c #B6B6B6",
-"N 	c #E6E6E6",
-"O 	c #F1F1F1",
-"P 	c #A8A8A8",
-"Q 	c #4B6983",
-"R 	c #9DB8D2",
-"S 	c #486481",
-"T 	c #314E6C",
-"U 	c #667A8D",
-"V 	c #D4D3CE",
-"W 	c #787878",
-"X 	c #D3D3D3",
-"Y 	c #E1E1E1",
-"Z 	c #ABABAB",
-"` 	c #5F7C96",
-" .	c #5D7A95",
-"..	c #4D6B87",
-"+.	c #3B556D",
-"@.	c #344A60",
-"#.	c #999999",
-"$.	c #C7C7C7",
-"%.	c #DDDBD6",
-"&.	c #DADADA",
-"*.	c #E2E2E2",
-"=.	c #898989",
-"-.	c #A9A9A9",
-";.	c #B0B0B0",
-">.	c #5D5D5D",
-",.	c #CBC9C2",
-"'.	c #BBBBBB",
-").	c #ECECEC",
-"!.	c #EAE8E3",
-"~.	c #DAD8D3",
-"{.	c #D3D2CD",
-"].	c #CECCC8",
-"^.	c #CCCAC6",
-"/.	c #D1CFCA",
-"(.	c #D2D0CB",
-"_.	c #C8C5BF",
-":.	c #737169",
-"<.	c #8F8F8F",
-"[.	c #B3B3B3",
-"}.	c #DCDCDC",
-"|.	c #E8E8E8",
-"1.	c #B5B5B5",
-"2.	c #565656",
-"3.	c #A0A0A0",
-"4.	c #C2C2C2",
-"5.	c #848484",
-"6.	c #838383",
-"7.	c #7B7B7B",
-"8.	c #8B8B8B",
-"9.	c #B2B2B2",
-"0.	c #B8B8B8",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . . . . . . . . ",
-"        . + @ @ @ @ @ @ @ # # # # # # # # # $ . ",
-"        . @ % % % & & & & * * * * * = = = = - . ",
-"        . # & & & * * * * = = = = = ; ; ; ; > . ",
-"        . , ' ' ' ) ) ) ) - - - - - > > > > ! . ",
-"        . ~ { { { { { { { { { { { { { { { { ; . ",
-"        . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / . ",
-"        . # ] ] ] ^ ^ ^ ^ ^ $ & ^ $ ( ( ( ( _ . ",
-"  . . . . . . . . . . . . . . : < / [ [ [ [ } . ",
-". | 1 1 1 1 1 1 1 1 1 1 1 1 2 . 3 4 5 6 6 6 * . ",
-". 1 ~ 7 8 9 0 1 + 1 a 1 1 b c . d e f 3 3 3 g . ",
-". 1 h i j k l 1 m n o p + 1 q . r s t u u u g . ",
-". 1 h v w x y 1 1 1 1 1 1 1 z . A B C D D D E . ",
-". 1 F G H I J 1 K 1 L K 1 1 q . ) M N O O , P . ",
-". 1 Q R S T U 1 1 1 1 1 1 1 V . W D X Y Y Y Z . ",
-". 1 `  ...+.@.1 #.L 5 $.1 1 %.. E K &.*.*.*.K . ",
-". 1 1 1 1 1 1 1 1 1 1 1 1 1 c . A =.-.;.;.;.[ . ",
-". 1 1 >.1 >.1 W 1 L 1 * o F ,.. =.'.).@ @ @ $ . ",
-". g !.!.!.~.~.~.{.].^./.(._.:.. <.[.}.N |.|.1.. ",
-"  . . . . . . . . . . . . . . 2.3.% Y N |.|.1.. ",
-"        . 4.< - =.' 5.) r 6.7.E 8.2 9.1.0.0.e . ",
-"        . . . . . . . . . . . . . . . . . . . . "};
diff --git a/art/apply-filters-16.xpm b/art/apply-filters-16.xpm
deleted file mode 100644
index 28410fe30b..0000000000
--- a/art/apply-filters-16.xpm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char * apply_filers_16_xpm[] = {
-"16 16 29 1",
-" 	c None",
-".	c #161616",
-"+	c #EDEAE8",
-"@	c #CDC1BA",
-"#	c #6A4E3D",
-"$	c #C6B8AF",
-"%	c #333333",
-"&	c #F3F1EE",
-"*	c #5E4537",
-"=	c #D6CCC5",
-"-	c #916C56",
-";	c #5A4235",
-">	c #BBA9A0",
-",	c #C3B3AC",
-"'	c #CEC1BB",
-")	c #BBAAA0",
-"!	c #A1897A",
-"~	c #664B3B",
-"{	c #383838",
-"]	c #856B60",
-"^	c #C2B3A9",
-"/	c #E9E3E0",
-"(	c #EEE9E7",
-"_	c #7B5A46",
-":	c #F5F4F2",
-"<	c #B8A69B",
-"[	c #AE998D",
-"}	c #553E32",
-"|	c #725442",
-"                ",
-"  .+.           ",
-"  .@.     .#    ",
-"  .$.     %&*   ",
-"  .$.......=-;  ",
-"  .$>$$$$$,'--. ",
-"  .$.......)-*  ",
-"  .$.     .!*   ",
-"  .$.     .~    ",
-"  .$.     {]    ",
-"  .^.     ./~   ",
-"  .(.......,-#  ",
-"  _$:,$$$$$<--. ",
-"   ~.......[-}  ",
-"          .!#   ",
-"          .|    "};
diff --git a/art/appointment-reminder-excl.png b/art/appointment-reminder-excl.png
deleted file mode 100644
index 2bd35ae067..0000000000
--- a/art/appointment-reminder-excl.png
+++ /dev/null
diff --git a/art/appointment-reminder.png b/art/appointment-reminder.png
deleted file mode 100644
index 7e7caa95ed..0000000000
--- a/art/appointment-reminder.png
+++ /dev/null
diff --git a/art/arrow-left-24.png b/art/arrow-left-24.png
deleted file mode 100644
index a977b3fb1a..0000000000
--- a/art/arrow-left-24.png
+++ /dev/null
diff --git a/art/arrow-right-24.png b/art/arrow-right-24.png
deleted file mode 100644
index 393b0dca3e..0000000000
--- a/art/arrow-right-24.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 21f2ecdb0e..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"                ",
-"     ...        ",
-"    .+++. .     ",
-"   .+...+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+..+..+.    ",
-"   .+.....+.    ",
-"    .+...+.     ",
-"     .+++.      ",
-"      ...       "};
diff --git a/art/bcg.png b/art/bcg.png
deleted file mode 100644
index ec03f8ab6e..0000000000
--- a/art/bcg.png
+++ /dev/null
diff --git a/art/bell.xpm b/art/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/art/bell.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * bell_xpm[] = {
-"16 16 64 1",
-" 	c None",
-".	c #000000",
-"+	c #E3BB43",
-"@	c #E6C049",
-"#	c #EED275",
-"$	c #F4E193",
-"%	c #F4DF8C",
-"&	c #EAC95C",
-"*	c #EFD57A",
-"=	c #FAEFBB",
-"-	c #FDF6D3",
-";	c #FDF5C6",
-">	c #F4E18F",
-",	c #E4BD43",
-"'	c #F6E295",
-")	c #FEF9D8",
-"!	c #FFFFFF",
-"~	c #FFFADA",
-"{	c #FCEEAA",
-"]	c #EBCA5A",
-"^	c #E9C550",
-"/	c #FAEA9C",
-"(	c #FEF7CB",
-"_	c #FFF8CC",
-":	c #FDF1A8",
-"<	c #EED060",
-"[	c #D39D12",
-"}	c #F2D55D",
-"|	c #FCEC91",
-"1	c #FFF4AE",
-"2	c #FFF5B6",
-"3	c #FEEF97",
-"4	c #F3D65E",
-"5	c #D5A216",
-"6	c #FAE05C",
-"7	c #FFED7C",
-"8	c #FFEF8C",
-"9	c #FFF092",
-"0	c #FDEB7A",
-"a	c #F4D750",
-"b	c #D8A717",
-"c	c #EAC01D",
-"d	c #F6D83E",
-"e	c #FAE255",
-"f	c #FAE362",
-"g	c #F9E161",
-"h	c #F6DE5B",
-"i	c #F1D145",
-"j	c #E6BE28",
-"k	c #D09B09",
-"l	c #B67E00",
-"m	c #CE9100",
-"n	c #D69F04",
-"o	c #E0B011",
-"p	c #E6BA1D",
-"q	c #E3B721",
-"r	c #E0B21E",
-"s	c #DCAB16",
-"t	c #D7A20D",
-"u	c #CC9303",
-"v	c #BE8400",
-"w	c #AC7500",
-"x	c #A06B00",
-"y	c #FFDD00",
-"                ",
-"       ..       ",
-"      .+@.      ",
-"     .#$%&.     ",
-"    .*=-;>,.    ",
-"    .')!~{].    ",
-"   .^/(~_:<[.   ",
-"   .}|121345.   ",
-"   .678980ab.   ",
-"  .cdefghijkl.  ",
-" .mnopqrstuvwx. ",
-" .............. ",
-"      .8y.      ",
-"       ..       ",
-"                ",
-"                "};
diff --git a/art/briefcase.png b/art/briefcase.png
deleted file mode 100644
index 424ad09632..0000000000
--- a/art/briefcase.png
+++ /dev/null
diff --git a/art/butterfly.png b/art/butterfly.png
deleted file mode 100644
index 00089774e0..0000000000
--- a/art/butterfly.png
+++ /dev/null
diff --git a/art/calendar-and-tasks-settings.png b/art/calendar-and-tasks-settings.png
deleted file mode 100644
index a457bb3cc8..0000000000
--- a/art/calendar-and-tasks-settings.png
+++ /dev/null
diff --git a/art/cellphone.png b/art/cellphone.png
deleted file mode 100644
index c8d70ae663..0000000000
--- a/art/cellphone.png
+++ /dev/null
diff --git a/art/check-filled.xpm b/art/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/art/check-filled.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_filled_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .        . .  ",
-"  .       .. .  ",
-"  .      ... .  ",
-"  . .   ...  .  ",
-"  . .. ...   .  ",
-"  . .....    .  ",
-"  .  ...     .  ",
-"  .   .      .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/art/compose-message.png b/art/compose-message.png
deleted file mode 100644
index 0be2101b6f..0000000000
--- a/art/compose-message.png
+++ /dev/null
diff --git a/art/composer-settings.png b/art/composer-settings.png
deleted file mode 100644
index f255c755e7..0000000000
--- a/art/composer-settings.png
+++ /dev/null
diff --git a/art/configure_16_addressbook.xpm b/art/configure_16_addressbook.xpm
deleted file mode 100644
index 4e037fe7b5..0000000000
--- a/art/configure_16_addressbook.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * 16_configure_addressbook_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #EAEAEA",
-"%	c #BDBDBD",
-"&	c #CFCFCF",
-"*	c #898989",
-"=	c #A8A8A8",
-"-	c #A3A3A3",
-";	c #F8F8F8",
-">	c #C9B49B",
-",	c #8E7151",
-"'	c #876E51",
-")	c #BAB1A5",
-"!	c #9D9D9D",
-"~	c #EAE8E3",
-"{	c #F3F3F3",
-"]	c #A88D6E",
-"^	c #DFD0BF",
-"/	c #5E432B",
-"(	c #7E6C5B",
-"_	c #A6A6A6",
-":	c #EEEEEE",
-"<	c #EEDFCC",
-"[	c #F4EEE6",
-"}	c #765E45",
-"|	c #736251",
-"1	c #C1C1C1",
-"2	c #B4B4B4",
-"3	c #FAFAFA",
-"4	c #7590AE",
-"5	c #C1665A",
-"6	c #445B71",
-"7	c #AEADAB",
-"8	c #E8E8E8",
-"9	c #4B6983",
-"0	c #9DB8D2",
-"a	c #486481",
-"b	c #314E6C",
-"c	c #BDBCB8",
-"d	c #5F7C96",
-"e	c #5D7A95",
-"f	c #4D6B87",
-"g	c #3B556D",
-"h	c #999794",
-"i	c #ADABA8",
-"j	c #5D5D5D",
-"k	c #9B9B9B",
-"l	c #DEDEDE",
-"m	c #C3C0BA",
-"n	c #DAD8D3",
-"o	c #B1AFAB",
-"p	c #CBC9C5",
-"q	c #A5A3A0",
-"r	c #96948F",
-"s	c #918E85",
-"       ..  ..   ",
-"      .+.  .@.  ",
-"      .+....@.  ",
-"      .+@@@@#.  ",
-" .......$@@#... ",
-".%+++++&.+#.*=-.",
-".+;>,')+.+@.!&~.",
-".+{]^/(+.+#._:~.",
-".+{<[}|1.+@.2&~.",
-".+34567.8@##.2~.",
-".+90ab.&@@@@#.c.",
-".+defg.+....@.h.",
-".+++++.+.!2.@.i.",
-".++j+j+..kl..!m.",
-".-~~~~~noc~pqrs.",
-" .............. "};
diff --git a/art/configure_16_calendar.xpm b/art/configure_16_calendar.xpm
deleted file mode 100644
index 3dd7392a1d..0000000000
--- a/art/configure_16_calendar.xpm
+++ /dev/null
@@ -1,76 +0,0 @@
-/* XPM */
-static char * configure_16_calendar_xpm[] = {
-"16 16 57 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #A8A8A8",
-"$	c #C3C3C3",
-"%	c #D4D4D4",
-"&	c #939393",
-"*	c #F5F5F5",
-"=	c #EAEAEA",
-"-	c #E05232",
-";	c #DF4623",
-">	c #E78B76",
-",	c #868686",
-"'	c #4A4A4A",
-")	c #DF502F",
-"!	c #E87F68",
-"~	c #FDF6F4",
-"{	c #A7A7A7",
-"]	c #747474",
-"^	c #CFCFCF",
-"/	c #DF4B29",
-"(	c #F1B2A3",
-"_	c #E05231",
-":	c #F3BFB4",
-"<	c #EEEEEE",
-"[	c #FAE8E4",
-"}	c #F9DDD6",
-"|	c #E87B62",
-"1	c #8D8D8D",
-"2	c #7B7B7B",
-"3	c #9C9C9C",
-"4	c #989898",
-"5	c #707070",
-"6	c #E2E2E2",
-"7	c #E8E8E8",
-"8	c #B4B4B4",
-"9	c #E1E1E1",
-"0	c #B0B0B0",
-"a	c #DEDEDE",
-"b	c #E0E0E0",
-"c	c #F4F4F4",
-"d	c #9D9D9D",
-"e	c #979797",
-"f	c #BDBDBD",
-"g	c #A0A0A0",
-"h	c #C1C1C1",
-"i	c #DADADA",
-"j	c #D9D9D9",
-"k	c #CECECE",
-"l	c #7C7C7C",
-"m	c #EDEDED",
-"n	c #9F9F9F",
-"o	c #ECECEC",
-"p	c #E6E6E6",
-"q	c #E7E7E7",
-"r	c #808080",
-" ..  ..         ",
-".+....@........ ",
-".+....@.++++++#.",
-".+@@@@$.++++%&*.",
-" .=@@$.++-+;>,*.",
-"  .+$.'#++)!~{*.",
-"  .+@.]^+/(_:+*.",
-"  .+$.#<+[+}|+<.",
-"  .+@.12$3$4$56.",
-" .7@$$.8++++++9.",
-".^@@@@$.^+++0ab.",
-".+....@.{+++c#b.",
-".+.de.@.f+++ghi.",
-" ..jk..da+++++b.",
-"  .lm^#n<op96qr.",
-"   ............ "};
diff --git a/art/configure_16_folder.xpm b/art/configure_16_folder.xpm
deleted file mode 100644
index 4d016ca91a..0000000000
--- a/art/configure_16_folder.xpm
+++ /dev/null
@@ -1,85 +0,0 @@
-/* XPM */
-static char * 16_configure_folder_xpm[] = {
-"16 16 66 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #E4E5DF",
-"%	c #D5D6CB",
-"&	c #D6D7CA",
-"*	c #F5F6F0",
-"=	c #ADB198",
-"-	c #C2C6A9",
-";	c #C0C3A7",
-">	c #B4B89D",
-",	c #EAECDB",
-"'	c #F6F6F4",
-")	c #EAECDA",
-"!	c #AAAB9E",
-"~	c #E5E8D4",
-"{	c #E4E7D2",
-"]	c #C7C9B6",
-"^	c #F7F7F7",
-"/	c #DADEBF",
-"(	c #DADEBE",
-"_	c #D8DCBC",
-":	c #D6DBB9",
-"<	c #797D66",
-"[	c #CDD2AD",
-"}	c #CBD1AA",
-"|	c #95997C",
-"1	c #F3F3EA",
-"2	c #70745E",
-"3	c #A3A889",
-"4	c #F3F4EA",
-"5	c #D5D9B7",
-"6	c #7F8369",
-"7	c #ABB08E",
-"8	c #929778",
-"9	c #F1F3E9",
-"0	c #D3D7B4",
-"a	c #7C7F65",
-"b	c #8F9474",
-"c	c #F0F1E7",
-"d	c #D1D6B2",
-"e	c #CFD4AF",
-"f	c #7A7D61",
-"g	c #8D9270",
-"h	c #EFF1E5",
-"i	c #86896D",
-"j	c #909273",
-"k	c #707459",
-"l	c #EBECDE",
-"m	c #CACFA8",
-"n	c #C8CDA5",
-"o	c #B8BD97",
-"p	c #848769",
-"q	c #BFC598",
-"r	c #60634C",
-"s	c #989E79",
-"t	c #C9CCB9",
-"u	c #919576",
-"v	c #848869",
-"w	c #686B52",
-"x	c #838768",
-"y	c #595C46",
-"z	c #797D60",
-"A	c #666951",
-"      ..  ..    ",
-"     .+.  .@.   ",
-"     .+....@.   ",
-"   ...+@@@@#.   ",
-"  .$%&.+@@#.    ",
-" .*=-;>.+#..... ",
-" .,',,).+@.!~{].",
-" .^/(_:.+#.<[}|.",
-" .1/(_:.+@.23}|.",
-" .4_:5.+@##.678.",
-" .950.+@@@@#.ab.",
-" .cde.+....@.fg.",
-" .h[}.+.ij.@.kg.",
-" .lmno..pq..rsg.",
-" .t8ubvwwgxyzgA.",
-"  ............. "};
diff --git a/art/configure_16_mail.xpm b/art/configure_16_mail.xpm
deleted file mode 100644
index b6416735ef..0000000000
--- a/art/configure_16_mail.xpm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* XPM */
-static char * 16_configure_mail_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #010101",
-"%	c #2F2F2F",
-"&	c #A7A4A0",
-"*	c #FCFCFC",
-"=	c #F5F5F5",
-"-	c #5D5B57",
-";	c #EBEBEB",
-">	c #1B1B1B",
-",	c #FBFBF8",
-"'	c #716E6B",
-")	c #ECECEC",
-"!	c #BEBEBE",
-"~	c #EDEDED",
-"{	c #DFDFDF",
-"]	c #FBFAF7",
-"^	c #A5A29D",
-"/	c #E9E9E8",
-"(	c #797873",
-"_	c #8E8C8A",
-":	c #C6C3BD",
-"<	c #C9C5C0",
-"[	c #7D7A77",
-"}	c #F7F5F1",
-"|	c #FAF9F6",
-"1	c #F8F6F2",
-"2	c #DAD8D6",
-"3	c #656360",
-"4	c #E2DFD8",
-"5	c #090808",
-"6	c #D7D4CE",
-"7	c #D8D5CF",
-"8	c #D6D3CD",
-"9	c #D9D6D0",
-"0	c #D3D1CD",
-"a	c #BEBCB6",
-"b	c #E0DCD5",
-"c	c #222221",
-"         ..  .. ",
-"        .+.  .@.",
-"        .+....@.",
-"        .+@@@@#.",
-"         .+@@#. ",
-"          .+#.  ",
-"  $%$$$$$$.+@.  ",
-" $&******=.+#.  ",
-" $+-+++++;>+@.  ",
-" $+,'+++).!@##. ",
-" $+,,'+~.{@@@@#.",
-" $+,]^'/.+....@.",
-" $+](,,_.+.:<.@.",
-" $+[,}|12..34.. ",
-" $56777890abc$  ",
-"  $$$$$$$$$$$   "};
diff --git a/art/connect_to_url-16.xpm b/art/connect_to_url-16.xpm
deleted file mode 100644
index 5053d252f7..0000000000
--- a/art/connect_to_url-16.xpm
+++ /dev/null
@@ -1,123 +0,0 @@
-/* XPM */
-static char * connect_to_url_16_xpm[] = {
-"16 16 104 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #070808",
-"@ 	c #677B68",
-"# 	c #BECFC5",
-"$ 	c #B4C3C6",
-"% 	c #8AA0B6",
-"& 	c #95A1AC",
-"* 	c #AFB8B8",
-"= 	c #989D98",
-"- 	c #373737",
-"; 	c #AFC1B1",
-"> 	c #E0E7DE",
-", 	c #BACFC6",
-"' 	c #96AFC0",
-") 	c #728BA4",
-"! 	c #889BA4",
-"~ 	c #829176",
-"{ 	c #879A81",
-"] 	c #AAA89A",
-"^ 	c #585A5B",
-"/ 	c #1D1D1D",
-"( 	c #748E79",
-"_ 	c #DEEADF",
-": 	c #B1D9B3",
-"< 	c #AAD8B5",
-"[ 	c #79B7A5",
-"} 	c #7A9AB5",
-"| 	c #839DA3",
-"1 	c #74876C",
-"2 	c #7E8471",
-"3 	c #82755A",
-"4 	c #8F7F66",
-"5 	c #2D2E2D",
-"6 	c #CAD7CB",
-"7 	c #BCD9C2",
-"8 	c #96C69D",
-"9 	c #4D8550",
-"0 	c #597FA7",
-"a 	c #418093",
-"b 	c #637E61",
-"c 	c #73755B",
-"d 	c #86765A",
-"e 	c #949290",
-"f 	c #CDDACD",
-"g 	c #518355",
-"h 	c #989389",
-"i 	c #807D74",
-"j 	c #3B7480",
-"k 	c #449268",
-"l 	c #819395",
-"m 	c #797E67",
-"n 	c #9D907D",
-"o 	c #73816F",
-"p 	c #43423C",
-"q 	c #B7B3AA",
-"r 	c #C4C2BD",
-"s 	c #EAE8E3",
-"t 	c #4D5C5E",
-"u 	c #887664",
-"v 	c #000001",
-"w 	c #010101",
-"x 	c #E2E1DD",
-"y 	c #F0EFEC",
-"z 	c #AAA7A0",
-"A 	c #C5D2C8",
-"B 	c #E9EEEA",
-"C 	c #8B8572",
-"D 	c #476346",
-"E 	c #889079",
-"F 	c #F2F0ED",
-"G 	c #EBEAE6",
-"H 	c #8A857B",
-"I 	c #ECEBE8",
-"J 	c #4D6C8B",
-"K 	c #4B6963",
-"L 	c #53885E",
-"M 	c #6E7653",
-"N 	c #747F6C",
-"O 	c #0C0B0A",
-"P 	c #78756B",
-"Q 	c #BEBBB5",
-"R 	c #B3B1AA",
-"S 	c #7D786E",
-"T 	c #E1DFDB",
-"U 	c #46698F",
-"V 	c #598860",
-"W 	c #617853",
-"X 	c #818667",
-"Y 	c #030506",
-"Z 	c #8C8981",
-"` 	c #A6A29B",
-" .	c #726D63",
-"..	c #CECAC3",
-"+.	c #3D5143",
-"@.	c #020203",
-"#.	c #0F0F0D",
-"$.	c #F0F3F1",
-"%.	c #272622",
-"&.	c #8B877E",
-"*.	c #706C62",
-"=.	c #B1ADA4",
-"-.	c #6C685E",
-";.	c #646056",
-"          . . . + . . . .       ",
-"        . @ # $ % & * = - .     ",
-"      . ; > , ' ) ! ~ { ] ^ /   ",
-"    . ( _ : < [ } | 1 2 3 4 5 . ",
-"    . 6 7 8 9 . . 0 a b c d e . ",
-"    . f g . . h i . j k l m n . ",
-"    . o p q r s i . . . . t u v ",
-"    w . x y z s i . A A B . C v ",
-". . . i x y z s i . . . . D E v ",
-"s s s s F G H I i . J K L M N O ",
-"i i P P Q R S T P . U V W X Y   ",
-". . w P Z `  ...P . . . . +.@.  ",
-"      #.Z `  ...P . A A $..     ",
-"        %.&.*.=.-.. . . .       ",
-"          #.#.h ;..             ",
-"              #.#.              "};
diff --git a/art/contact-is-a-list.png b/art/contact-is-a-list.png
deleted file mode 100644
index 3a7bc1c143..0000000000
--- a/art/contact-is-a-list.png
+++ /dev/null
diff --git a/art/contact-list-16.png b/art/contact-list-16.png
deleted file mode 100644
index 5ebfe92745..0000000000
--- a/art/contact-list-16.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index 907ec1a85d..0000000000
--- a/art/copy-message.png
+++ /dev/null
diff --git a/art/copy.png b/art/copy.png
deleted file mode 100644
index 23a6db32e3..0000000000
--- a/art/copy.png
+++ /dev/null
diff --git a/art/copy_16_message.xpm b/art/copy_16_message.xpm
deleted file mode 100644
index a4f56cfd6e..0000000000
--- a/art/copy_16_message.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * 16_copy_message_xpm[] = {
-"16 16 39 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #F7F6F4",
-"{	c #B0ADA7",
-"]	c #83817E",
-"^	c #E1DFDA",
-"/	c #928F8B",
-"(	c #FBFBFA",
-"_	c #F7F5F2",
-":	c #F5F3F0",
-"<	c #B5B2AC",
-"[	c #A09C97",
-"}	c #F0EFEB",
-"|	c #E4E2DD",
-"1	c #AEABA6",
-"2	c #92908B",
-"3	c #E8E6E1",
-"4	c #F7F6F2",
-"5	c #F5F4F0",
-"6	c #6B6A68",
-"7	c #E2DFD9",
-"8	c #E2E0DB",
-"9	c #E3E1DC",
-"0	c #E6E4DF",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".#%&*#*=*-;>.   ",
-".#*,=*=*')'!.   ",
-".#**.+......... ",
-".#*.@#########$.",
-".#~.#%&*#*=*-;>.",
-".#{.#*,=*=*')'!.",
-".]^.#**/(*_)*:!.",
-" ...#*~<)#)[-}|.",
-"   .#~1**)__23|.",
-"   .#{*:45_:>63.",
-"   .]^777^8890$.",
-"    ........... ",
-"                "};
diff --git a/art/cut.png b/art/cut.png
deleted file mode 100644
index 7ffb512043..0000000000
--- a/art/cut.png
+++ /dev/null
diff --git a/art/dayview.xpm b/art/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/art/dayview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * dayview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #D8D8D4",
-"@	c #919191",
-"#	c #666666",
-"$	c #FFFFFF",
-"%	c #F2F1ED",
-"....................... ",
-".++++++++++++++++++++@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".@####################. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".+@@#@@@@@@@@@@@@@@@@#. ",
-"....................... ",
-"                        "};
diff --git a/art/delete-message.png b/art/delete-message.png
deleted file mode 100644
index 1bec6baac7..0000000000
--- a/art/delete-message.png
+++ /dev/null
diff --git a/art/drafts-16.png b/art/drafts-16.png
deleted file mode 100644
index 285646f60b..0000000000
--- a/art/drafts-16.png
+++ /dev/null
diff --git a/art/edit.xpm b/art/edit.xpm
deleted file mode 100644
index 28b8f090c4..0000000000
--- a/art/edit.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * 16_edit_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #BAA88F",
-"$	c #836B4E",
-"%	c #FEFEFE",
-"&	c #FCFCFC",
-"*	c #FBFBFB",
-"=	c #E5E5E5",
-"-	c #C5A985",
-";	c #DC9E55",
-">	c #9E6233",
-",	c #FFFFFF",
-"'	c #F2F2F2",
-")	c #D9D9D9",
-"!	c #E4E4E4",
-"~	c #C3A783",
-"{	c #DD9D53",
-"]	c #A76631",
-"^	c #EEEEEE",
-"/	c #D4D4D4",
-"(	c #FAFAFA",
-"_	c #7B7B7B",
-":	c #C5AA88",
-"<	c #A86631",
-"[	c #DCDCDC",
-"}	c #F0F0F0",
-"|	c #5E5E5E",
-"1	c #C3A47A",
-"2	c #DD9D52",
-"3	c #A66430",
-"4	c #D5D5D5",
-"5	c #6A6A6A",
-"6	c #C2A174",
-"7	c #DC9B4E",
-"8	c #A96630",
-"9	c #6E6E6E",
-"0	c #D8D8D8",
-"a	c #D6D6D6",
-"b	c #9F9F9F",
-"c	c #BEA686",
-"d	c #DD9D51",
-"e	c #AA682F",
-"f	c #F5F5F5",
-"g	c #DDDDDD",
-"h	c #F9F9F9",
-"i	c #7A7A7A",
-"j	c #BCAC9B",
-"k	c #A86E3F",
-"l	c #797979",
-"m	c #F4F4F4",
-"n	c #F3F3F3",
-"o	c #DFDFDF",
-"p	c #7C7C7C",
-"q	c #4F4F4F",
-"r	c #6C6C6C",
-"s	c #EAEAEA",
-"t	c #F8F8F8",
-"u	c #F6F6F6",
-"v	c #F7F7F7",
-"w	c #EBEBEB",
-"x	c #ECECEC",
-"y	c #E0E0E0",
-"z	c #E8E8E8",
-"       ..    .. ",
-"     ..+@.  .#$.",
-"   ..%+&*=..-;>.",
-" ..,%+')*!.~{]. ",
-".,%%^/)*(_:{<.  ",
-".%%)[**}|123.   ",
-" .+'*}456789.   ",
-" .&*0abcde.fg.  ",
-"  .((hijklfmno. ",
-"  .(hpq.rfmnsg. ",
-"   .tilufm^oo.  ",
-"   .vuufwoo..   ",
-"    .uxyo..     ",
-"    .zg..       ",
-"     ..         ",
-"                "};
diff --git a/art/empty.gif b/art/empty.gif
deleted file mode 100644
index 0be4006193..0000000000
--- a/art/empty.gif
+++ /dev/null
diff --git a/art/empty.xpm b/art/empty.xpm
deleted file mode 100644
index aca06618b1..0000000000
--- a/art/empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/encrypt.xpm b/art/encrypt.xpm
deleted file mode 100644
index 636345ad9d..0000000000
--- a/art/encrypt.xpm
+++ /dev/null
@@ -1,80 +0,0 @@
-/* XPM */
-static char * 16_encrypt_xpm[] = {
-"16 16 61 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #808080",
-"#	c #FEFEFE",
-"$	c #8F8F8F",
-"%	c #313131",
-"&	c #CDB86D",
-"*	c #EED680",
-"=	c #FFFFFF",
-"-	c #F2F2F2",
-";	c #343434",
-">	c #EEEEEE",
-",	c #D4D4D4",
-"'	c #D9D9D9",
-")	c #3D3D3D",
-"!	c #8D8D8D",
-"~	c #DCDCDC",
-"{	c #FBFBFB",
-"]	c #B2B2B2",
-"^	c #3A3A3A",
-"/	c #A9A9A9",
-"(	c #F0F0F0",
-"_	c #444444",
-":	c #E4E9F1",
-"<	c #B3C5D7",
-"[	c #AABDCE",
-"}	c #A2B4C5",
-"|	c #99ABBD",
-"1	c #8FA3B4",
-"2	c #3C5469",
-"3	c #FCFCFC",
-"4	c #D8D8D8",
-"5	c #D6D6D6",
-"6	c #6A6A6A",
-"7	c #BDCEE0",
-"8	c #8FAAC4",
-"9	c #819DB7",
-"0	c #7490AA",
-"a	c #66839D",
-"b	c #587690",
-"c	c #314456",
-"d	c #FAFAFA",
-"e	c #F9F9F9",
-"f	c #676767",
-"g	c #DFDFDF",
-"h	c #5F5F5F",
-"i	c #F8F8F8",
-"j	c #F7F7F7",
-"k	c #696969",
-"l	c #92A1B0",
-"m	c #5E7081",
-"n	c #556879",
-"o	c #4C5F70",
-"p	c #435668",
-"q	c #394E5F",
-"r	c #23313E",
-"s	c #F6F6F6",
-"t	c #7E7E7E",
-"u	c #E8E8E8",
-"v	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@...   ",
-"    ..#+$%&*&.  ",
-"  ..=#+-;&@. &. ",
-" .=##>,')*!. *. ",
-" .##'~{]^&!/.&..",
-"  .+-{(_:<[}|12.",
-"  .3{4567890abc.",
-"   .ddef7890abc.",
-"   .degh7890abc.",
-"    .ijklmnopqr.",
-"    .jsghkkt....",
-"     .sssg..    ",
-"     .uv..      ",
-"      ..        "};
diff --git a/art/envelope.png b/art/envelope.png
deleted file mode 100644
index 3e801181aa..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/es-appointments.png b/art/es-appointments.png
deleted file mode 100644
index e194232051..0000000000
--- a/art/es-appointments.png
+++ /dev/null
diff --git a/art/es-weather.png b/art/es-weather.png
deleted file mode 100644
index 3d31469e78..0000000000
--- a/art/es-weather.png
+++ /dev/null
diff --git a/art/evo-16-address-conduit.png b/art/evo-16-address-conduit.png
deleted file mode 100644
index 18a2e5809e..0000000000
--- a/art/evo-16-address-conduit.png
+++ /dev/null
diff --git a/art/evo-16-calendar-conduit.png b/art/evo-16-calendar-conduit.png
deleted file mode 100644
index dd8e8ab85e..0000000000
--- a/art/evo-16-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-16-todo-conduit.png b/art/evo-16-todo-conduit.png
deleted file mode 100644
index d36d2c61fd..0000000000
--- a/art/evo-16-todo-conduit.png
+++ /dev/null
diff --git a/art/evo-48-address-conduit.png b/art/evo-48-address-conduit.png
deleted file mode 100644
index 342a061088..0000000000
--- a/art/evo-48-address-conduit.png
+++ /dev/null
diff --git a/art/evo-48-calendar-conduit.png b/art/evo-48-calendar-conduit.png
deleted file mode 100644
index bb0a49791e..0000000000
--- a/art/evo-48-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-48-todo-conduit.png b/art/evo-48-todo-conduit.png
deleted file mode 100644
index dd4899e984..0000000000
--- a/art/evo-48-todo-conduit.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index cddb0396dc..0000000000
--- a/art/evolution-calendar-mini.png
+++ /dev/null
diff --git a/art/evolution-calendar.png b/art/evolution-calendar.png
deleted file mode 100644
index 76afca6b6f..0000000000
--- a/art/evolution-calendar.png
+++ /dev/null
diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png
deleted file mode 100644
index 5ddb92c1ce..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution-contacts-plain.png b/art/evolution-contacts-plain.png
deleted file mode 100644
index 4043413589..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 4043413589..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-junk-mini.png b/art/evolution-junk-mini.png
deleted file mode 100644
index 64d488ca1c..0000000000
--- a/art/evolution-junk-mini.png
+++ /dev/null
diff --git a/art/evolution-junk.png b/art/evolution-junk.png
deleted file mode 100644
index 5fefbefc56..0000000000
--- a/art/evolution-junk.png
+++ /dev/null
diff --git a/art/evolution-notes-mini.png b/art/evolution-notes-mini.png
deleted file mode 100644
index f5b5d776d0..0000000000
--- a/art/evolution-notes-mini.png
+++ /dev/null
diff --git a/art/evolution-notes.png b/art/evolution-notes.png
deleted file mode 100644
index f82006b894..0000000000
--- a/art/evolution-notes.png
+++ /dev/null
diff --git a/art/evolution-tasks-mini.png b/art/evolution-tasks-mini.png
deleted file mode 100644
index d23b5a0be7..0000000000
--- a/art/evolution-tasks-mini.png
+++ /dev/null
diff --git a/art/evolution-tasks.png b/art/evolution-tasks.png
deleted file mode 100644
index a3771c23eb..0000000000
--- a/art/evolution-tasks.png
+++ /dev/null
diff --git a/art/evolution-today-mini.png b/art/evolution-today-mini.png
deleted file mode 100644
index 6039b15e82..0000000000
--- a/art/evolution-today-mini.png
+++ /dev/null
diff --git a/art/evolution-today.png b/art/evolution-today.png
deleted file mode 100644
index 010bcb8cc7..0000000000
--- a/art/evolution-today.png
+++ /dev/null
diff --git a/art/evolution-trash-mini.png b/art/evolution-trash-mini.png
deleted file mode 100644
index 56a8daa51f..0000000000
--- a/art/evolution-trash-mini.png
+++ /dev/null
diff --git a/art/evolution-trash.png b/art/evolution-trash.png
deleted file mode 100644
index c2ac8da173..0000000000
--- a/art/evolution-trash.png
+++ /dev/null
diff --git a/art/evolution.png b/art/evolution.png
deleted file mode 100644
index 412dcfbbc0..0000000000
--- a/art/evolution.png
+++ /dev/null
diff --git a/art/executive-summary-bg.png b/art/executive-summary-bg.png
deleted file mode 100644
index fdcde6613d..0000000000
--- a/art/executive-summary-bg.png
+++ /dev/null
diff --git a/art/executive-summary-curve.png b/art/executive-summary-curve.png
deleted file mode 100644
index 3ba42dd02b..0000000000
--- a/art/executive-summary-curve.png
+++ /dev/null
diff --git a/art/faq-16.png b/art/faq-16.png
deleted file mode 100644
index fcf71658da..0000000000
--- a/art/faq-16.png
+++ /dev/null
diff --git a/art/fetch-mail.png b/art/fetch-mail.png
deleted file mode 100644
index 30cda0564d..0000000000
--- a/art/fetch-mail.png
+++ /dev/null
diff --git a/art/find_contact.xpm b/art/find_contact.xpm
deleted file mode 100644
index 37d957b13b..0000000000
--- a/art/find_contact.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char * 24_find_contact_xpm[] = {
-"24 24 100 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #BDBDBD",
-"@ 	c #FFFFFF",
-"# 	c #A3A3A3",
-"$ 	c #F8F8F8",
-"% 	c #C9B49B",
-"& 	c #8E7151",
-"* 	c #876E51",
-"= 	c #BAB1A5",
-"- 	c #FDFDFD",
-"; 	c #FBFBFB",
-"> 	c #EAE8E3",
-", 	c #F3F3F3",
-"' 	c #A88D6E",
-") 	c #DFD0BF",
-"! 	c #5E432B",
-"~ 	c #7E6C5B",
-"{ 	c #313131",
-"] 	c #575757",
-"^ 	c #FCFCFC",
-"/ 	c #555555",
-"( 	c #EEDFCC",
-"_ 	c #F4EEE6",
-": 	c #765E45",
-"< 	c #736251",
-"[ 	c #FAFAFA",
-"} 	c #7590AE",
-"| 	c #C1665A",
-"1 	c #445B71",
-"2 	c #D7D6D3",
-"3 	c #ADADAD",
-"4 	c #9B9B9B",
-"5 	c #4B6983",
-"6 	c #9DB8D2",
-"7 	c #486481",
-"8 	c #314E6C",
-"9 	c #667A8D",
-"0 	c #E0E0E0",
-"a 	c #BCBCBC",
-"b 	c #C5C5C5",
-"c 	c #5F7C96",
-"d 	c #5D7A95",
-"e 	c #4D6B87",
-"f 	c #3B556D",
-"g 	c #344A60",
-"h 	c #47473F",
-"i 	c #0A0A09",
-"j 	c #4B4B43",
-"k 	c #999999",
-"l 	c #34342E",
-"m 	c #9D9D8D",
-"n 	c #CFCFB9",
-"o 	c #C4C4AF",
-"p 	c #8D8D7F",
-"q 	c #353530",
-"r 	c #A2A2A2",
-"s 	c #D2D2D2",
-"t 	c #5D5D5D",
-"u 	c #46463F",
-"v 	c #9C9C8C",
-"w 	c #E2E2D0",
-"x 	c #EDEDE7",
-"y 	c #C0C0AC",
-"z 	c #B2B29F",
-"A 	c #828274",
-"B 	c #4C4C44",
-"C 	c #B9B9B9",
-"D 	c #D1CFC8",
-"E 	c #090908",
-"F 	c #D5D5BF",
-"G 	c #FBFBFA",
-"H 	c #C3C3AE",
-"I 	c #B5B5A2",
-"J 	c #A6A695",
-"K 	c #959586",
-"L 	c #080807",
-"M 	c #72706D",
-"N 	c #918E85",
-"O 	c #090909",
-"P 	c #CACAB5",
-"Q 	c #DDDDD0",
-"R 	c #B7B7A4",
-"S 	c #AAAA98",
-"T 	c #9B9B8B",
-"U 	c #8C8C7D",
-"V 	c #474740",
-"W 	c #929283",
-"X 	c #BABAA7",
-"Y 	c #ADAD9B",
-"Z 	c #9F9F8E",
-"` 	c #909081",
-" .	c #727266",
-"..	c #4C4C45",
-"+.	c #34342F",
-"@.	c #878779",
-"#.	c #A0A090",
-"$.	c #737367",
-"%.	c #010101",
-"&.	c #414141",
-"                                                ",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . .             ",
-"      . + @ @ @ @ @ @ @ @ @ @ @ @ # .           ",
-"      . @ $ % & * = @ - @ ; @ @ @ > .           ",
-"      . @ , ' ) ! ~ @ { ] ^ / - @ > .           ",
-"      . @ , ( _ : < @ @ @ @ @ @ @ > .           ",
-"      . @ [ } | 1 2 @ 3 @ 4 3 @ @ > .           ",
-"      . @ 5 6 7 8 9 0 3 a b 0 @ @ > .           ",
-"      . @ c d e f g h i i j k b @ > .           ",
-"      . @ @ @ @ @ l m n o p q r s > .           ",
-"      . @ @ t @ u v w x y z A B C D .           ",
-"      . # > > > E F G H I J K L M N .           ",
-"        . . . . O P Q R S T U i . .             ",
-"                V W X Y Z `  ...                ",
-"                  +.@.#.W $.%.%.                ",
-"                    j i i &.  %.%.              ",
-"                              %.%.%.            ",
-"                                %.%.%.          ",
-"                                  %.%.%.        ",
-"                                    %.%.        ",
-"                                                ",
-"                                                "};
diff --git a/art/find_message.xpm b/art/find_message.xpm
deleted file mode 100644
index 04465b4ff8..0000000000
--- a/art/find_message.xpm
+++ /dev/null
@@ -1,130 +0,0 @@
-/* XPM */
-static char * find_message_xpm[] = {
-"24 24 103 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #E9E9E9",
-"@ 	c #E2E2E2",
-"# 	c #D7D7D7",
-"$ 	c #FDFDFD",
-"% 	c #FCFCFC",
-"& 	c #FBFBFB",
-"* 	c #D8D8D8",
-"= 	c #FEFEFE",
-"- 	c #E4E4E4",
-"; 	c #BABABA",
-"> 	c #E0E0E0",
-", 	c #FAFAFA",
-"' 	c #F9F9F9",
-") 	c #EAEAEA",
-"! 	c #F8F8F8",
-"~ 	c #CECECE",
-"{ 	c #BDBDBD",
-"] 	c #E6E6E6",
-"^ 	c #E7E7E7",
-"/ 	c #FFFFFF",
-"( 	c #C2C2C2",
-"_ 	c #E5E5E5",
-": 	c #47473F",
-"< 	c #0A0A09",
-"[ 	c #4B4B43",
-"} 	c #8E8E8E",
-"| 	c #AFAFAF",
-"1 	c #34342E",
-"2 	c #9D9D8D",
-"3 	c #CFCFB9",
-"4 	c #C4C4AF",
-"5 	c #8D8D7F",
-"6 	c #353530",
-"7 	c #848484",
-"8 	c #BFBFBF",
-"9 	c #F7F7F7",
-"0 	c #F5F5F5",
-"a 	c #46463F",
-"b 	c #9C9C8C",
-"c 	c #E2E2D0",
-"d 	c #EDEDE7",
-"e 	c #C0C0AC",
-"f 	c #B2B29F",
-"g 	c #828274",
-"h 	c #45453D",
-"i 	c #A7A7A7",
-"j 	c #D2D2D2",
-"k 	c #D5D5D5",
-"l 	c #090908",
-"m 	c #D5D5BF",
-"n 	c #FBFBFA",
-"o 	c #C3C3AE",
-"p 	c #B5B5A2",
-"q 	c #A6A695",
-"r 	c #959586",
-"s 	c #080807",
-"t 	c #979797",
-"u 	c #F4F4F4",
-"v 	c #090909",
-"w 	c #CACAB5",
-"x 	c #DDDDD0",
-"y 	c #B7B7A4",
-"z 	c #AAAA98",
-"A 	c #9B9B8B",
-"B 	c #8C8C7D",
-"C 	c #929292",
-"D 	c #CBCBCB",
-"E 	c #D3D3D3",
-"F 	c #474740",
-"G 	c #929283",
-"H 	c #BABAA7",
-"I 	c #ADAD9B",
-"J 	c #9F9F8E",
-"K 	c #909081",
-"L 	c #727266",
-"M 	c #4C4C45",
-"N 	c #A6A6A6",
-"O 	c #DFDFDF",
-"P 	c #34342F",
-"Q 	c #878779",
-"R 	c #A0A090",
-"S 	c #737367",
-"T 	c #010101",
-"U 	c #919191",
-"V 	c #C1C1C1",
-"W 	c #D1D1D1",
-"X 	c #414141",
-"Y 	c #4B4B4B",
-"Z 	c #131313",
-"` 	c #646464",
-" .	c #8B8B8B",
-"..	c #AEAEAE",
-"+.	c #5E5E5E",
-"@.	c #6E6E6E",
-"#.	c #575757",
-"$.	c #595959",
-"%.	c #585858",
-"&.	c #C4C4C4",
-"*.	c #DDDDDD",
-"=.	c #797979",
-"-.	c #2F2F2F",
-"                                                ",
-"                                                ",
-"                      . .                       ",
-"                  . . + @ .                     ",
-"              . . # $ % & .                     ",
-"          . . * = = = = & - .                   ",
-"        . ; = = = = > > , ' .   . .             ",
-"        . ) = = > > = = = ! . . + @ .           ",
-"          . $ = = = = ~ . . # $ % & .           ",
-"          . % & = { . . * = = = = & - .         ",
-"        . . . , ] . * ^ ^ ^ = > > , ' .         ",
-"      . / = . ( _ : < < [ } | ^ = = ! - .       ",
-"      . # = = . 1 2 3 4 5 6 7 8 > > 9 0 .       ",
-"        . $ = a b c d e f g h i j = = 0 - .     ",
-"        . k & l m n o p q r s t j > > 0 u .     ",
-"          . , v w x y z A B < C D = = = = - .   ",
-"          . E F G H I J K L M N j = = = O O .   ",
-"            . ! P Q R G S T T U V ^ O O . .     ",
-"            . W = [ < < X Y Z `  .... .         ",
-"              . = = > O +.@.#.T $.%.            ",
-"              . &.*.. .     =.. T -.            ",
-"                . .             T T T           ",
-"                                  T T           ",
-"                                                "};
diff --git a/art/flag-for-followup-16.png b/art/flag-for-followup-16.png
deleted file mode 100644
index 08e5e6dcd4..0000000000
--- a/art/flag-for-followup-16.png
+++ /dev/null
diff --git a/art/flag-for-followup-48.png b/art/flag-for-followup-48.png
deleted file mode 100644
index a387bd9521..0000000000
--- a/art/flag-for-followup-48.png
+++ /dev/null
diff --git a/art/flag-for-followup-done-16.png b/art/flag-for-followup-done-16.png
deleted file mode 100644
index c21a388135..0000000000
--- a/art/flag-for-followup-done-16.png
+++ /dev/null
diff --git a/art/flag-for-followup-done-48.png b/art/flag-for-followup-done-48.png
deleted file mode 100644
index 76f5c0b04e..0000000000
--- a/art/flag-for-followup-done-48.png
+++ /dev/null
diff --git a/art/flag-for-followup-done.xpm b/art/flag-for-followup-done.xpm
deleted file mode 100644
index 6d93b23457..0000000000
--- a/art/flag-for-followup-done.xpm
+++ /dev/null
@@ -1,78 +0,0 @@
-/* XPM */
-static char * flag_for_followup_done_xpm[] = {
-"16 16 59 1",
-" 	c None",
-".	c #000000",
-"+	c #282E33",
-"@	c #C1D1E0",
-"#	c #929EA9",
-"$	c #69737C",
-"%	c #32404B",
-"&	c #363F47",
-"*	c #AEC0D1",
-"=	c #DAE3EB",
-"-	c #C4D4E4",
-";	c #6F8498",
-">	c #4D5D6C",
-",	c #3F4D5B",
-"'	c #3F4952",
-")	c #AABBCB",
-"!	c #C6D3DE",
-"~	c #E4EAF0",
-"{	c #C0D0E0",
-"]	c #73889C",
-"^	c #526271",
-"/	c #41505E",
-"(	c #56636F",
-"_	c #41484E",
-":	c #97A9B8",
-"<	c #5D7B95",
-"[	c #6A87A1",
-"}	c #B5C4D2",
-"|	c #D8E1E9",
-"1	c #CFDBE6",
-"2	c #9DB8D2",
-"3	c #455461",
-"4	c #465665",
-"5	c #45515B",
-"6	c #30363A",
-"7	c #C0B094",
-"8	c #4B6983",
-"9	c #57758F",
-"0	c #64819B",
-"a	c #B3C2D0",
-"b	c #D2DBE4",
-"c	c #DCE4EC",
-"d	c #A4BBD1",
-"e	c #97A1AB",
-"f	c #74797F",
-"g	c #727A81",
-"h	c #606A74",
-"i	c #B39169",
-"j	c #516F89",
-"k	c #AEBECC",
-"l	c #AFBFCE",
-"m	c #DCE4EB",
-"n	c #7D94A8",
-"o	c #BBC8D3",
-"p	c #0E0E0E",
-"q	c #D7DEE4",
-"r	c #040404",
-"s	c #9EA4AA",
-"t	c #0B0F13",
-"       .        ",
-"    ...+.       ",
-"   .@#$%&.      ",
-"  .*=-;>,'..    ",
-"  .)!~{]^/(_..  ",
-" .:<[}|12;3456. ",
-".7.890abcdefgh. ",
-" .i.8j<klm....  ",
-"  .i.88nop      ",
-"   .i.88qr      ",
-"    .i.8s.      ",
-"     .i.t       ",
-"      .i.       ",
-"       .i.      ",
-"        .i.     ",
-"         ..     "};
diff --git a/art/flag-for-followup.xpm b/art/flag-for-followup.xpm
deleted file mode 100644
index aa646673ad..0000000000
--- a/art/flag-for-followup.xpm
+++ /dev/null
@@ -1,78 +0,0 @@
-/* XPM */
-static char * flag_for_followup_xpm[] = {
-"16 16 59 1",
-" 	c None",
-".	c #000000",
-"+	c #33282B",
-"@	c #DFC0CA",
-"#	c #A89199",
-"$	c #7B686E",
-"%	c #4B323A",
-"&	c #47363B",
-"*	c #D0ADB8",
-"=	c #EAD9DF",
-"-	c #E4C4CD",
-";	c #976E7B",
-">	c #6B4C56",
-",	c #5B3F47",
-"'	c #523F44",
-")	c #CAA9B4",
-"!	c #DEC6CD",
-"~	c #EFE3E7",
-"{	c #DFBFC9",
-"]	c #9C737F",
-"^	c #70515B",
-"/	c #5E4149",
-"(	c #6F565D",
-"_	c #4E4145",
-":	c #B796A1",
-"<	c #955D6E",
-"[	c #A0697B",
-"}	c #D1B4BD",
-"|	c #E8D7DD",
-"1	c #E6CFD6",
-"2	c #D19CAD",
-"3	c #60444D",
-"4	c #64454F",
-"5	c #5B454C",
-"6	c #392F33",
-"7	c #BFB093",
-"8	c #824A5C",
-"9	c #8F5768",
-"0	c #9A6375",
-"a	c #CFB2BB",
-"b	c #E4D2D7",
-"c	c #ECDCE0",
-"d	c #D0A3B1",
-"e	c #AA969C",
-"f	c #7F7476",
-"g	c #807176",
-"h	c #735F65",
-"i	c #B29168",
-"j	c #885062",
-"k	c #CCAEB7",
-"l	c #CEAFB8",
-"m	c #EADBE0",
-"n	c #A77D8A",
-"o	c #D2BAC2",
-"p	c #0D0D0D",
-"q	c #E4D7DB",
-"r	c #030303",
-"s	c #A99DA1",
-"t	c #120B0D",
-"       .        ",
-"    ...+.       ",
-"   .@#$%&.      ",
-"  .*=-;>,'..    ",
-"  .)!~{]^/(_..  ",
-" .:<[}|12;3456. ",
-".7.890abcdefgh. ",
-" .i.8j<klm....  ",
-"  .i.88nop      ",
-"   .i.88qr      ",
-"    .i.8s.      ",
-"     .i.t       ",
-"      .i.       ",
-"       .i.      ",
-"        .i.     ",
-"         ..     "};
diff --git a/art/folder-copy-16.png b/art/folder-copy-16.png
deleted file mode 100644
index 5c0a3c9dbd..0000000000
--- a/art/folder-copy-16.png
+++ /dev/null
diff --git a/art/folder-mini.png b/art/folder-mini.png
deleted file mode 100644
index 1fc929bbf7..0000000000
--- a/art/folder-mini.png
+++ /dev/null
diff --git a/art/folder-move-16.png b/art/folder-move-16.png
deleted file mode 100644
index 4a94499f1c..0000000000
--- a/art/folder-move-16.png
+++ /dev/null
diff --git a/art/folder-settings.png b/art/folder-settings.png
deleted file mode 100644
index 64305acf23..0000000000
--- a/art/folder-settings.png
+++ /dev/null
diff --git a/art/folder.png b/art/folder.png
deleted file mode 100644
index 30f073ea6b..0000000000
--- a/art/folder.png
+++ /dev/null
diff --git a/art/folder.xpm b/art/folder.xpm
deleted file mode 100644
index 4ef29bcad7..0000000000
--- a/art/folder.xpm
+++ /dev/null
@@ -1,73 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-"16 16 54 1",
-" 	c None",
-".	c #000000",
-"+	c #E4E5DF",
-"@	c #D5D6CB",
-"#	c #D6D7CA",
-"$	c #A3A39D",
-"%	c #F5F6F0",
-"&	c #ADB198",
-"*	c #C2C6A9",
-"=	c #C0C3A7",
-"-	c #B4B89D",
-";	c #6D705F",
-">	c #EAECDB",
-",	c #F6F6F4",
-"'	c #EAECDA",
-")	c #E8EAD8",
-"!	c #E9EBDB",
-"~	c #E7E9D6",
-"{	c #E6E8D5",
-"]	c #E5E8D4",
-"^	c #E4E7D2",
-"/	c #C7C9B6",
-"(	c #F7F7F7",
-"_	c #DADEBF",
-":	c #DADEBE",
-"<	c #D8DCBC",
-"[	c #D6DBB9",
-"}	c #D5D9B7",
-"|	c #D3D7B4",
-"1	c #D1D6B2",
-"2	c #CFD4AF",
-"3	c #CDD2AD",
-"4	c #CBD1AA",
-"5	c #95997C",
-"6	c #F3F3EA",
-"7	c #F3F4EA",
-"8	c #CACFA8",
-"9	c #C8CDA5",
-"0	c #929778",
-"a	c #F1F3E9",
-"b	c #C6CCA3",
-"c	c #C4CAA0",
-"d	c #8F9474",
-"e	c #F0F1E7",
-"f	c #C2C89D",
-"g	c #C1C79B",
-"h	c #8D9270",
-"i	c #EFF1E5",
-"j	c #BFC598",
-"k	c #EBECDE",
-"l	c #C9CCB9",
-"m	c #919576",
-"n	c #8F9372",
-"o	c #666951",
-"                ",
-"                ",
-"   ....         ",
-"  .+@#$.        ",
-" .%&*=-;....... ",
-" .>,>>')!~~{]^/.",
-" .(_:<[}|112345.",
-" .6_:<[}|112345.",
-" .7<[}|12334890.",
-" .a}|1234889bcd.",
-" .e123489bbcfgh.",
-" .i3489bcffgjjh.",
-" .k89bcfgjjjjjh.",
-" .l0mdnhhhhhhho.",
-"  ............. ",
-"                "};
diff --git a/art/font.png b/art/font.png
deleted file mode 100644
index bd927d3344..0000000000
--- a/art/font.png
+++ /dev/null
diff --git a/art/forget_passwords.xpm b/art/forget_passwords.xpm
deleted file mode 100644
index a121300716..0000000000
--- a/art/forget_passwords.xpm
+++ /dev/null
@@ -1,125 +0,0 @@
-/* XPM */
-static char * forget_passwords_xpm[] = {
-"16 16 106 2",
-"  	c None",
-". 	c #010101",
-"+ 	c #C0B09D",
-"@ 	c #FEC6BC",
-"# 	c #FFCDB4",
-"$ 	c #C2A887",
-"% 	c #DCB9A8",
-"& 	c #AF843A",
-"* 	c #755C5C",
-"= 	c #655E37",
-"- 	c #DBBCAE",
-"; 	c #FFC4B8",
-"> 	c #FFCDBC",
-", 	c #DDBCA3",
-"' 	c #DBBEB5",
-") 	c #B9933A",
-"! 	c #D3AF84",
-"~ 	c #BE933A",
-"{ 	c #CDA86F",
-"] 	c #A3753F",
-"^ 	c #554F2E",
-"/ 	c #FFC5A3",
-"( 	c #FFFFE3",
-"_ 	c #D4B584",
-": 	c #DCBEB5",
-"< 	c #CDAE95",
-"[ 	c #E6BAA8",
-"} 	c #BDA897",
-"| 	c #CCA871",
-"1 	c #B9841D",
-"2 	c #CCAF95",
-"3 	c #A8753F",
-"4 	c #C4B29C",
-"5 	c #E3B89E",
-"6 	c #E6BEA8",
-"7 	c #C89E58",
-"8 	c #DCB5A0",
-"9 	c #B5841D",
-"0 	c #E6B593",
-"a 	c #BA9E58",
-"b 	c #B4841D",
-"c 	c #C79E58",
-"d 	c #3B250B",
-"e 	c #FFE5BE",
-"f 	c #F2C7B2",
-"g 	c #F3BE9E",
-"h 	c #C7B5A9",
-"i 	c #F3C8B9",
-"j 	c #C29E58",
-"k 	c #E6C2AE",
-"l 	c #BBAAB1",
-"m 	c #C7A887",
-"n 	c #BE9E58",
-"o 	c #6D572C",
-"p 	c #CDB6AC",
-"q 	c #E6BE9E",
-"r 	c #C7AE95",
-"s 	c #E6C3B5",
-"t 	c #DCB593",
-"u 	c #B9A073",
-"v 	c #CAA49D",
-"w 	c #AE841D",
-"x 	c #A6781B",
-"y 	c #BA8E51",
-"z 	c #B1813F",
-"A 	c #C6A871",
-"B 	c #DCBEAF",
-"C 	c #E6BEB5",
-"D 	c #D4B0AE",
-"E 	c #BDA058",
-"F 	c #AC761B",
-"G 	c #A77D3F",
-"H 	c #A06422",
-"I 	c #B59358",
-"J 	c #BDA187",
-"K 	c #D3B5A0",
-"L 	c #BD933A",
-"M 	c #B09960",
-"N 	c #BD9D60",
-"O 	c #AC8131",
-"P 	c #935511",
-"Q 	c #753F20",
-"R 	c #753D1D",
-"S 	c #D4AE84",
-"T 	c #B09264",
-"U 	c #BDA475",
-"V 	c #B48431",
-"W 	c #B08431",
-"X 	c #A86813",
-"Y 	c #975C16",
-"Z 	c #A06413",
-"` 	c #5C3D1D",
-" .	c #A46A36",
-"..	c #903801",
-"+.	c #953D1D",
-"@.	c #751801",
-"#.	c #681601",
-"$.	c #844116",
-"%.	c #1D0101",
-"&.	c #A0581D",
-"*.	c #933A01",
-"=.	c #A67531",
-"-.	c #87581D",
-";.	c #A86F1D",
-">.	c #A1713A",
-",.	c #B09358",
-"                                ",
-"          . . . . . .           ",
-"      . . + @ # $ % & * .       ",
-"    = - ; > , ' ) ! ~ { ] .     ",
-"  ^ / ( _ : < [ } | 1 2 ) 3 .   ",
-". 4 5 6 7 : 8 9 0 a 2 b c ~ d   ",
-". e f g h i j k l m $ < n 1 o . ",
-". p q r s t b u v 2 c w c x y . ",
-"  . z A B 1 ) C D $ E j F G H . ",
-"    . I ~ J K L M 2 ~ N O P Q . ",
-"      . . R S T U V W X Y Z .   ",
-"            `  ...+.@.#.$..     ",
-"              . %.&.*.=.        ",
-"                . -.;.>.        ",
-"                  . ` ,..       ",
-"                    . . .       "};
diff --git a/art/forward.png b/art/forward.png
deleted file mode 100644
index bbce8ad3c7..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/forward.xpm b/art/forward.xpm
deleted file mode 100644
index fcb25802a1..0000000000
--- a/art/forward.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char * forward_xpm[] = {
-"16 16 32 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #000000",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #797873",
-"]	c #BBC2CC",
-"^	c #576E87",
-"/	c #EFEFEF",
-"(	c #CCCCCC",
-"_	c #7D7A77",
-":	c #F7F5F1",
-"<	c #FAF9F6",
-"[	c #314E6C",
-"}	c #090808",
-"|	c #D7D4CE",
-"1	c #D8D5CF",
-"2	c #181818",
-"3	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%%%%%>,'.  ",
-" .%--;%)))))))))",
-" .%-!~;)%%%%%%%)",
-" .%!{--)%]^///()",
-" .%_-:<)%^[[/[()",
-" .}|111)%/[[[[()",
-"  .....)%//[[[()",
-"       )%/[[[[()",
-"       )%((((((2",
-"       ))3))))))"};
diff --git a/art/globe.png b/art/globe.png
deleted file mode 100644
index 88f22d3020..0000000000
--- a/art/globe.png
+++ /dev/null
diff --git a/art/goto-16.png b/art/goto-16.png
deleted file mode 100644
index 800db10e41..0000000000
--- a/art/goto-16.png
+++ /dev/null
diff --git a/art/goto-24.png b/art/goto-24.png
deleted file mode 100644
index b6fc82fd73..0000000000
--- a/art/goto-24.png
+++ /dev/null
diff --git a/art/hand-16.xpm b/art/hand-16.xpm
deleted file mode 100644
index d925e2d968..0000000000
--- a/art/hand-16.xpm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* XPM */
-static char * hand_16_xpm[] = {
-"16 16 96 2",
-"  	c None",
-". 	c #010100",
-"+ 	c #010000",
-"@ 	c #090600",
-"# 	c #030000",
-"$ 	c #E8E6E1",
-"% 	c #A3A09C",
-"& 	c #080000",
-"* 	c #D6D2CD",
-"= 	c #8F8A84",
-"- 	c #FFFAF7",
-"; 	c #98938D",
-"> 	c #F1EDE9",
-", 	c #88827E",
-"' 	c #181510",
-") 	c #F8EEE4",
-"! 	c #F8ECE0",
-"~ 	c #F8ECDE",
-"{ 	c #0D0600",
-"] 	c #F8EBDE",
-"^ 	c #F6E7D7",
-"/ 	c #D5C5B6",
-"( 	c #070000",
-"_ 	c #F6E5D3",
-": 	c #F7E9D9",
-"< 	c #050200",
-"[ 	c #080300",
-"} 	c #312722",
-"| 	c #EFE7E0",
-"1 	c #F6F2EF",
-"2 	c #F6F1EE",
-"3 	c #EDE4DB",
-"4 	c #F1E4D6",
-"5 	c #9D9790",
-"6 	c #12110D",
-"7 	c #958E88",
-"8 	c #DDCFC2",
-"9 	c #F6E8D9",
-"0 	c #F6F1EC",
-"a 	c #F5F1EE",
-"b 	c #E5D7CB",
-"c 	c #F7E8D8",
-"d 	c #EEDFD3",
-"e 	c #CAC0B6",
-"f 	c #645951",
-"g 	c #E7D9CA",
-"h 	c #F6E6D5",
-"i 	c #F7EBDE",
-"j 	c #E9DCD2",
-"k 	c #040000",
-"l 	c #F7EFE7",
-"m 	c #EDDECF",
-"n 	c #D6C8BA",
-"o 	c #CBB9AC",
-"p 	c #D2C8BC",
-"q 	c #F8EEE3",
-"r 	c #F5EEE8",
-"s 	c #EFE3D7",
-"t 	c #B8A99D",
-"u 	c #060100",
-"v 	c #D7CFC7",
-"w 	c #F9F2E9",
-"x 	c #F3E3D4",
-"y 	c #F1DFCF",
-"z 	c #E6D7C7",
-"A 	c #F8F2ED",
-"B 	c #EDE1D4",
-"C 	c #0A0300",
-"D 	c #D7CFC9",
-"E 	c #FAF2EC",
-"F 	c #F1E0D1",
-"G 	c #F6EEE8",
-"H 	c #000000",
-"I 	c #171111",
-"J 	c #A79D9D",
-"K 	c #C8BDBC",
-"L 	c #A59D9A",
-"M 	c #ABA8A3",
-"N 	c #BFB7B5",
-"O 	c #060000",
-"P 	c #0E0403",
-"Q 	c #0A0000",
-"R 	c #0A0200",
-"S 	c #080401",
-"T 	c #FCF4F2",
-"U 	c #F9F1EF",
-"V 	c #F8F0EE",
-"W 	c #F2EDEA",
-"X 	c #DDD9D6",
-"Y 	c #E5E4E0",
-"Z 	c #030400",
-"` 	c #0B0505",
-" .	c #050000",
-"..	c #14100F",
-"+.	c #090806",
-"@.	c #000100",
-"              . +               ",
-"          @ # $ % + +           ",
-"        & * = - ; > , '         ",
-"        & ) ; ! ; ~ ; {         ",
-"        & ] ; ^ ; ] ; / (       ",
-"        & _ ; _ ; : ; / (       ",
-"    < [ } | 1 2 3 4 5 / (       ",
-"  6 _ 7 & 8 _ 9 0 a b / (       ",
-"  + c d e f g h _ i j / (       ",
-"    k l m n o p q r s t (       ",
-"    u v w x y z A B _ t (       ",
-"      C D E _ F G _ / H         ",
-"        I J K _ _ L M &         ",
-"        N O P Q R k S           ",
-"        k T U V W X Y Z         ",
-"        k `  ...# +.H @.        "};
diff --git a/art/hide_deleted_messages.xpm b/art/hide_deleted_messages.xpm
deleted file mode 100644
index 189d8d350e..0000000000
--- a/art/hide_deleted_messages.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * hide_deleted_messages_xpm[] = {
-"16 16 20 1",
-" 	c None",
-".	c #828282",
-"+	c #A0A0A0",
-"@	c #AAAAAA",
-"#	c #898989",
-"$	c #9A9A9A",
-"%	c #8F8F8F",
-"&	c #A9A9A9",
-"*	c #A5A5A5",
-"=	c #959595",
-"-	c #A8A8A8",
-";	c #AEAEAE",
-">	c #B1B1B1",
-",	c #B3B3B3",
-"'	c #9B9B9B",
-")	c #DF421E",
-"!	c #000000",
-"~	c #B7B7B7",
-"{	c #ADADAD",
-"]	c #AFAFAF",
-"                ",
-"                ",
-"                ",
-" .. .+.@#$..    ",
-" .. ..%&$*=$    ",
-" .. .@.-;$#>    ",
-"                ",
-" .%.; .%, '.  ) ",
-"!!!!!!!!!!!!! ))",
-" .~$. ... ..  ) ",
-"                ",
-" .+ .+.'% .+    ",
-" .{ .#%.] '&    ",
-" .' .$;.% ..    ",
-"                ",
-"                "};
diff --git a/art/hide_read_messages.xpm b/art/hide_read_messages.xpm
deleted file mode 100644
index 8df1313651..0000000000
--- a/art/hide_read_messages.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * hide_read_messages_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #DF421E",
-"@	c #828282",
-"                ",
-"                ",
-"                ",
-"  .. .......    ",
-"              + ",
-"  @ @@@ @@ @  ++",
-"              + ",
-"  ... .. ...    ",
-"                ",
-"  ... . ....    ",
-"              + ",
-"  @@ @@@ @@@  ++",
-"              + ",
-"  . ... ....    ",
-"                ",
-"                "};
diff --git a/art/hide_selected_messages.xpm b/art/hide_selected_messages.xpm
deleted file mode 100644
index cb1989b84c..0000000000
--- a/art/hide_selected_messages.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_selected_messages_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #4B6983",
-"+	c #DF421E",
-"@	c #FFFFFF",
-"#	c #798FA2",
-"$	c #BEC8D0",
-"%	c #F1F3F5",
-"&	c #CDD5DC",
-"*	c #A9B6C2",
-"=	c #000000",
-"-	c #647E94",
-";	c #A2B1BE",
-">	c #E4E8EC",
-",	c #D8DEE4",
-"                ",
-"                ",
-"                ",
-" ............ + ",
-" .@#$%%#@&*%. ++",
-" ............ + ",
-"                ",
-"  === == ===    ",
-"                ",
-"  === = ====    ",
-"                ",
-" ............ + ",
-" .@%-@&@;>,%. ++",
-" ............ + ",
-"                ",
-"                "};
diff --git a/art/house.png b/art/house.png
deleted file mode 100644
index df43ec6181..0000000000
--- a/art/house.png
+++ /dev/null
diff --git a/art/ico-calendar.png b/art/ico-calendar.png
deleted file mode 100644
index 3010528d7f..0000000000
--- a/art/ico-calendar.png
+++ /dev/null
diff --git a/art/ico-mail.png b/art/ico-mail.png
deleted file mode 100644
index 66a4ba89cd..0000000000
--- a/art/ico-mail.png
+++ /dev/null
diff --git a/art/ico-rdf.png b/art/ico-rdf.png
deleted file mode 100644
index 0e39037b95..0000000000
--- a/art/ico-rdf.png
+++ /dev/null
diff --git a/art/ico-weather.png b/art/ico-weather.png
deleted file mode 100644
index 25eb161f8c..0000000000
--- a/art/ico-weather.png
+++ /dev/null
diff --git a/art/imap-16.png b/art/imap-16.png
deleted file mode 100644
index 1e2932a728..0000000000
--- a/art/imap-16.png
+++ /dev/null
diff --git a/art/import.png b/art/import.png
deleted file mode 100644
index 151b60a270..0000000000
--- a/art/import.png
+++ /dev/null
diff --git a/art/import.xpm b/art/import.xpm
deleted file mode 100644
index a996072772..0000000000
--- a/art/import.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_import_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #A50B05",
-"@	c #A1A1A1",
-"#	c #FFFFFF",
-"$	c #A7A7A7",
-"%	c #980000",
-"&	c #DBDBDB",
-"*	c #9B9B9B",
-"=	c #9C9C9C",
-"-	c #E4E4E4",
-";	c #9F0502",
-">	c #A90F07",
-",	c #D23618",
-"'	c #AEAEAE",
-")	c #A3A3A3",
-"!	c #D83C1B",
-"~	c #E46243",
-"{	c #E87E64",
-"]	c #2C2C2C",
-"^	c #9E8754",
-"/	c #6B5B39",
-"(	c #826E46",
-"_	c #9E8655",
-":	c #BFA367",
-"<	c #DCCBA3",
-"[	c #99804F",
-"}	c #D8C7A2",
-"|	c #F0DBAC",
-"1	c #E4D3AF",
-"2	c #76520D",
-"3	c #865F10",
-"4	c #E1BB65",
-"5	c #D1940C",
-"6	c #906612",
-"7	c #7D5C14",
-"8	c #CF920B",
-"9	c #714F0C",
-"0	c #E2BE6C",
-"a	c #7B560E",
-".......  +      ",
-".@###$. %+      ",
-".&*#=-.%;>,,    ",
-".'-$-). ++ !    ",
-".......  + ~    ",
-"           {    ",
-"                ",
-"       ......]. ",
-"      .^/(_:<[. ",
-"     .}||||123. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45585569. ",
-"     .055555a.  ",
-"     ........   "};
diff --git a/art/inbox-16.png b/art/inbox-16.png
deleted file mode 100644
index 88071fa91e..0000000000
--- a/art/inbox-16.png
+++ /dev/null
diff --git a/art/inbox-full-16.png b/art/inbox-full-16.png
deleted file mode 100644
index 289335eaa2..0000000000
--- a/art/inbox-full-16.png
+++ /dev/null
diff --git a/art/inbox-mini.png b/art/inbox-mini.png
deleted file mode 100644
index 88071fa91e..0000000000
--- a/art/inbox-mini.png
+++ /dev/null
diff --git a/art/inbox.png b/art/inbox.png
deleted file mode 100644
index dda0fecbb3..0000000000
--- a/art/inbox.png
+++ /dev/null
diff --git a/art/info-bulb.png b/art/info-bulb.png
deleted file mode 100644
index 2d2e6be8b1..0000000000
--- a/art/info-bulb.png
+++ /dev/null
diff --git a/art/insert-image-24.png b/art/insert-image-24.png
deleted file mode 100644
index 4b2fd4ffae..0000000000
--- a/art/insert-image-24.png
+++ /dev/null
diff --git a/art/insert-link-24.png b/art/insert-link-24.png
deleted file mode 100644
index 9824bc8ae6..0000000000
--- a/art/insert-link-24.png
+++ /dev/null
diff --git a/art/insert-table-24.png b/art/insert-table-24.png
deleted file mode 100644
index 21344caea6..0000000000
--- a/art/insert-table-24.png
+++ /dev/null
diff --git a/art/jump.xpm b/art/jump.xpm
deleted file mode 100644
index 7c289e738f..0000000000
--- a/art/jump.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * jump_xpm[] = {
-"16 8 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"................",
-".++++++++++++++.",
-".++++++++++++++.",
-".++..++..++..++.",
-".++..++..++..++.",
-".++++++++++++++.",
-".++++++++++++++.",
-"................"};
-
-static char * jump_xpm_focused[] = {
-"16 8 3 1",
-"       c None",
-".      c #0000FF",
-"+      c #FFFF00",
-"................",
-"................",
-"..++++++++++++..",
-"..+..++..++..+..",
-"..+..++..++..+..",
-"..++++++++++++..",
-"................",
-"................"};
-                                                                                                                
-
diff --git a/art/ldap-mini.png b/art/ldap-mini.png
deleted file mode 100644
index 85c4dc0cf7..0000000000
--- a/art/ldap-mini.png
+++ /dev/null
diff --git a/art/ldap-settings.png b/art/ldap-settings.png
deleted file mode 100644
index dd10f98412..0000000000
--- a/art/ldap-settings.png
+++ /dev/null
diff --git a/art/ldap.png b/art/ldap.png
deleted file mode 100644
index 5ff8180b35..0000000000
--- a/art/ldap.png
+++ /dev/null
diff --git a/art/listview.xpm b/art/listview.xpm
deleted file mode 100644
index 56d4a7fd64..0000000000
--- a/art/listview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * listview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #D8D8D4",
-"@	c #919191",
-"#	c #666666",
-"$	c #FFFFFF",
-"%	c #F2F1ED",
-"....................... ",
-".++++++++++++++++++++@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".@####################. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".$%%%%%%%%%%%%%%%%%%%@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-"....................... ",
-"                        "};
diff --git a/art/mail-accounts-settings.png b/art/mail-accounts-settings.png
deleted file mode 100644
index 565b1b300a..0000000000
--- a/art/mail-accounts-settings.png
+++ /dev/null
diff --git a/art/mail-config-druid-48.png b/art/mail-config-druid-48.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid-48.png
+++ /dev/null
diff --git a/art/mail-config-druid-account-name.png b/art/mail-config-druid-account-name.png
deleted file mode 100644
index 2cad5eb941..0000000000
--- a/art/mail-config-druid-account-name.png
+++ /dev/null
diff --git a/art/mail-config-druid-identity.png b/art/mail-config-druid-identity.png
deleted file mode 100644
index f895a1e168..0000000000
--- a/art/mail-config-druid-identity.png
+++ /dev/null
diff --git a/art/mail-config-druid-receive.png b/art/mail-config-druid-receive.png
deleted file mode 100644
index df75812db3..0000000000
--- a/art/mail-config-druid-receive.png
+++ /dev/null
diff --git a/art/mail-config-druid-send.png b/art/mail-config-druid-send.png
deleted file mode 100644
index 1bf501ddb2..0000000000
--- a/art/mail-config-druid-send.png
+++ /dev/null
diff --git a/art/mail-config-druid.png b/art/mail-config-druid.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid.png
+++ /dev/null
diff --git a/art/mail-need-reply.xpm b/art/mail-need-reply.xpm
deleted file mode 100644
index 283ef3d83f..0000000000
--- a/art/mail-need-reply.xpm
+++ /dev/null
@@ -1,101 +0,0 @@
-/* XPM */
-static char * mail_need_reply_xpm[] = {
-"16 16 82 1",
-" 	c None",
-".	c #2A2A2A",
-"+	c #AAAAAA",
-"@	c #A2A2A2",
-"#	c #949494",
-"$	c #E4E4E4",
-"%	c #F6F6F6",
-"&	c #F7F7F7",
-"*	c #F8F8F8",
-"=	c #E5E5E5",
-"-	c #898989",
-";	c #7A7A7A",
-">	c #DADADA",
-",	c #F5F5F5",
-"'	c #818181",
-")	c #B1B1B1",
-"!	c #858585",
-"~	c #EDEDED",
-"{	c #8E8E8E",
-"]	c #E1E1E1",
-"^	c #E2E2E2",
-"/	c #7F7F7F",
-"(	c #B7B7B7",
-"_	c #E0E0E0",
-":	c #BEBEBE",
-"<	c #737373",
-"[	c #848484",
-"}	c #E8E8E8",
-"|	c #DBDBDB",
-"1	c #363636",
-"2	c #9C9C9C",
-"3	c #C9C9C9",
-"4	c #919191",
-"5	c #B4B4B4",
-"6	c #AFAFAF",
-"7	c #C3C3C3",
-"8	c #6F635C",
-"9	c #372B24",
-"0	c #EBEBEB",
-"a	c #F1F1F1",
-"b	c #D7D7D7",
-"c	c #C7C7C7",
-"d	c #E9E9E9",
-"e	c #F3F3F3",
-"f	c #BDBDBD",
-"g	c #CDCDCD",
-"h	c #372E28",
-"i	c #F6B893",
-"j	c #88634D",
-"k	c #534339",
-"l	c #2C211A",
-"m	c #8F8F8F",
-"n	c #A8A8A8",
-"o	c #6F6F6F",
-"p	c #473B34",
-"q	c #DBA585",
-"r	c #F4A677",
-"s	c #F5AD82",
-"t	c #F5B189",
-"u	c #72503C",
-"v	c #3F3F3F",
-"w	c #1C1C1C",
-"x	c #2B1E15",
-"y	c #DC976F",
-"z	c #DA8A5B",
-"A	c #583725",
-"B	c #984816",
-"C	c #A75223",
-"D	c #43210E",
-"E	c #261102",
-"F	c #853F12",
-"G	c #A55123",
-"H	c #9C4C20",
-"I	c #984B20",
-"J	c #42200E",
-"K	c #853E12",
-"L	c #4A240E",
-"M	c #291408",
-"N	c #160A04",
-"O	c #200E01",
-"P	c #180B01",
-"Q	c #000000",
-"                ",
-"   .++++++++++. ",
-"   @#$%&**%&=-; ",
-"   +>#,,,,,,')! ",
-"   +*~{],,^/(_! ",
-"   +*,:<,,;[]}! ",
-"   +|1234-567}! ",
-"   +890abcdefg! ",
-"   hijkklmbbbno ",
-"  pqrsttu.vvvvw ",
-" xyzzzzzA       ",
-" xBCCCCCD       ",
-"  EFGHIIJ       ",
-"   EKLMMN       ",
-"    OP          ",
-"     Q          "};
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index 767ec6366f..0000000000
--- a/art/mail-new.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * mail_new_xpm[] = {
-"16 16 48 1",
-" 	c None",
-".	c #000000",
-"+	c #202020",
-"@	c #817968",
-"#	c #F5F5F5",
-"$	c #4D493C",
-"%	c #736C5C",
-"&	c #F5EEEE",
-"*	c #FFEDC7",
-"=	c #FAF3EC",
-"-	c #FCE6B5",
-";	c #60594D",
-">	c #D3C29E",
-",	c #746D5D",
-"'	c #F5F1F1",
-")	c #FDEECD",
-"!	c #F8F4ED",
-"~	c #FAE3B3",
-"{	c #645F4F",
-"]	c #C9BA98",
-"^	c #71685A",
-"/	c #FCF5EA",
-"(	c #FFE8B7",
-"_	c #F5DEB2",
-":	c #FFEABD",
-"<	c #90856F",
-"[	c #7C7361",
-"}	c #E4D1A9",
-"|	c #C9B996",
-"1	c #FFEBC2",
-"2	c #887F6B",
-"3	c #726B59",
-"4	c #D1BF9C",
-"5	c #8B816C",
-"6	c #FFE9BA",
-"7	c #F9E2B2",
-"8	c #FFE8B8",
-"9	c #F6DFB3",
-"0	c #D4C19D",
-"a	c #534D42",
-"b	c #CFBF9C",
-"c	c #645F51",
-"d	c #C2B293",
-"e	c #C4B393",
-"f	c #C4B495",
-"g	c #C5B596",
-"h	c #CCBC99",
-"i	c #4C483D",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,')!*~{~].  ",
-" .#**^/*({*_].  ",
-" .#*:<{#{[-}|.  ",
-" .#12**{((34|.  ",
-" .#5*_67890ab.  ",
-" .cdeeedffghi.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-read.xpm b/art/mail-read.xpm
deleted file mode 100644
index b4e3160ab4..0000000000
--- a/art/mail-read.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * mail_read_xpm[] = {
-"16 16 51 1",
-" 	c None",
-".	c #010101",
-"+	c #D9D6D0",
-"@	c #C3C0B9",
-"#	c #EFEDE8",
-"$	c #F7F7F6",
-"%	c #FAFAFA",
-"&	c #B6B4AE",
-"*	c #737373",
-"=	c #C2BFB8",
-"-	c #F5F4F2",
-";	c #FAFAF9",
-">	c #FFFFFF",
-",	c #D2CFC9",
-"'	c #707070",
-")	c #5D5B57",
-"!	c #868580",
-"~	c #E5E2DB",
-"{	c #FBFBF8",
-"]	c #716E6B",
-"^	c #62605C",
-"/	c #F8F7F2",
-"(	c #DDDAD4",
-"_	c #929191",
-":	c #969390",
-"<	c #92908A",
-"[	c #A1A0A0",
-"}	c #F7F5F1",
-"|	c #FBFAF7",
-"1	c #A5A29D",
-"2	c #908D87",
-"3	c #F9F7F3",
-"4	c #F0EEE8",
-"5	c #DDD9D2",
-"6	c #797873",
-"7	c #F9F8F4",
-"8	c #74726E",
-"9	c #E3E0D9",
-"0	c #7D7A77",
-"a	c #FAF9F6",
-"b	c #F8F6F2",
-"c	c #FAF8F5",
-"d	c #F7F5F2",
-"e	c #E2DFD8",
-"f	c #090808",
-"g	c #D7D4CE",
-"h	c #D8D5CF",
-"i	c #D6D3CD",
-"j	c #DAD7D1",
-"k	c #E0DCD5",
-"l	c #222221",
-"     .....      ",
-"    .+++++.     ",
-"   .++++++@.    ",
-"  .+++++#$%&.   ",
-" .*==-;>>>>,'.  ",
-" .>)>>>>>>>!~.  ",
-" .>{]>>>>>^/(.  ",
-" .>{{_::<[{}(.  ",
-" .>{|1{{{2345.  ",
-" .>|6{{{77895.  ",
-" .>0{}abcd~8e.  ",
-" .fghhhi++jkl.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm
deleted file mode 100644
index 06f4a7420a..0000000000
--- a/art/mail-replied.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * mail_replied_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #000000",
-")	c #928F8B",
-"!	c #FFFFFF",
-"~	c #F7F6F4",
-"{	c #B5B2AC",
-"]	c #003366",
-"^	c #EFEFEF",
-"/	c #CCCCCC",
-"(	c #AEABA6",
-"_	c #B0ADA7",
-":	c #F5F3F0",
-"<	c #83817E",
-"[	c #E1DFDA",
-"}	c #E2DFD9",
-"|	c #002C59",
-"1	c #002850",
-"2	c #00254A",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,=''''''''' ",
-" .#**)'!!!!!!!' ",
-" .#*~{'!]]]]^/' ",
-" .#~(*'!]]]^^/' ",
-" .#_*:'!]]]]^/' ",
-" .<[}}'!]^]]|/' ",
-"  ....'!^^^12/' ",
-"      '!//////3 ",
-"      ''4'''''' ",
-"                "};
diff --git a/art/mail.png b/art/mail.png
deleted file mode 100644
index bfe4bad56c..0000000000
--- a/art/mail.png
+++ /dev/null
diff --git a/art/malehead.png b/art/malehead.png
deleted file mode 100644
index 2b1328b4e2..0000000000
--- a/art/malehead.png
+++ /dev/null
diff --git a/art/mark-as-important-16.png b/art/mark-as-important-16.png
deleted file mode 100644
index 393d86e77c..0000000000
--- a/art/mark-as-important-16.png
+++ /dev/null
diff --git a/art/mark.xpm b/art/mark.xpm
deleted file mode 100644
index 710cd0e872..0000000000
--- a/art/mark.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mark_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #36592A",
-"                ",
-"                ",
-"                ",
-"                ",
-"           .    ",
-"          ..    ",
-"         ..     ",
-"    .   ..      ",
-"    .. ...      ",
-"     ....       ",
-"     ...        ",
-"      ..        ",
-"      .         ",
-"                ",
-"                ",
-"                "};
diff --git a/art/meeting-request-16.png b/art/meeting-request-16.png
deleted file mode 100644
index 9874eca084..0000000000
--- a/art/meeting-request-16.png
+++ /dev/null
diff --git a/art/meeting-request.png b/art/meeting-request.png
deleted file mode 100644
index 0fba577bfe..0000000000
--- a/art/meeting-request.png
+++ /dev/null
diff --git a/art/monkey-16.png b/art/monkey-16.png
deleted file mode 100644
index 02fb7b6eb5..0000000000
--- a/art/monkey-16.png
+++ /dev/null
diff --git a/art/monthview.xpm b/art/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/art/monthview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * monthview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #666666",
-"#	c #919191",
-"$	c #F2F1ED",
-"%	c #D8D8D4",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".%###################@. ",
-"....................... ",
-"                        "};
diff --git a/art/move-message.png b/art/move-message.png
deleted file mode 100644
index 143cea1a93..0000000000
--- a/art/move-message.png
+++ /dev/null
diff --git a/art/move_message.xpm b/art/move_message.xpm
deleted file mode 100644
index 846febbe49..0000000000
--- a/art/move_message.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_move_message_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #000000",
-"{	c #928F8B",
-"]	c #FBFBFA",
-"^	c #F7F5F2",
-"/	c #F5F3F0",
-"(	c #F7F6F4",
-"_	c #B5B2AC",
-":	c #A09C97",
-"<	c #F0EFEB",
-"[	c #E4E2DD",
-"}	c #AEABA6",
-"|	c #92908B",
-"1	c #E8E6E1",
-"2	c #B0ADA7",
-"3	c #F7F6F2",
-"4	c #F5F4F0",
-"5	c #6B6A68",
-"6	c #83817E",
-"7	c #E1DFDA",
-"8	c #E2DFD9",
-"9	c #E2E0DB",
-"0	c #E3E1DC",
-"a	c #E6E4DF",
-"                ",
-" . . . . . .    ",
-".           .   ",
-"                ",
-".           .   ",
-"    .+......... ",
-".  .@#########$.",
-"   .#%&*#*=*-;>.",
-".  .#*,=*=*')'!.",
-" ~ .#**{]*^)*/!.",
-"   .#*(_)#):-<[.",
-"   .#(}**)^^|1[.",
-"   .#2*/34^/>51.",
-"   .678887990a$.",
-"    ........... ",
-"                "};
diff --git a/art/myevo-appointments.png b/art/myevo-appointments.png
deleted file mode 100644
index 873528a964..0000000000
--- a/art/myevo-appointments.png
+++ /dev/null
diff --git a/art/myevo-mail-summary.png b/art/myevo-mail-summary.png
deleted file mode 100644
index 453f9938ac..0000000000
--- a/art/myevo-mail-summary.png
+++ /dev/null
diff --git a/art/myevo-post-it.png b/art/myevo-post-it.png
deleted file mode 100644
index f0ef421549..0000000000
--- a/art/myevo-post-it.png
+++ /dev/null
diff --git a/art/myweather-clouds.png b/art/myweather-clouds.png
deleted file mode 100644
index fa1fa4b80f..0000000000
--- a/art/myweather-clouds.png
+++ /dev/null
diff --git a/art/myweather-fog.png b/art/myweather-fog.png
deleted file mode 100644
index 60db197df7..0000000000
--- a/art/myweather-fog.png
+++ /dev/null
diff --git a/art/myweather-rain.png b/art/myweather-rain.png
deleted file mode 100644
index 3ce291f788..0000000000
--- a/art/myweather-rain.png
+++ /dev/null
diff --git a/art/myweather-snow.png b/art/myweather-snow.png
deleted file mode 100644
index 8a45248692..0000000000
--- a/art/myweather-snow.png
+++ /dev/null
diff --git a/art/myweather-storm.png b/art/myweather-storm.png
deleted file mode 100644
index cef334a43c..0000000000
--- a/art/myweather-storm.png
+++ /dev/null
diff --git a/art/myweather-sun.png b/art/myweather-sun.png
deleted file mode 100644
index 26349305bf..0000000000
--- a/art/myweather-sun.png
+++ /dev/null
diff --git a/art/myweather-suncloud.png b/art/myweather-suncloud.png
deleted file mode 100644
index a2058e77b0..0000000000
--- a/art/myweather-suncloud.png
+++ /dev/null
diff --git a/art/new-message.xpm b/art/new-message.xpm
deleted file mode 100644
index add4263a4d..0000000000
--- a/art/new-message.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * new_message_xpm[] = {
-"16 16 19 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #FEFEFE",
-"$	c #FCFCFC",
-"%	c #FBFBFB",
-"&	c #FFFFFF",
-"*	c #E4E4E4",
-"=	c #E0E0E0",
-"-	c #FAFAFA",
-";	c #F9F9F9",
-">	c #F8F8F8",
-",	c #F7F7F7",
-"'	c #F5F5F5",
-")	c #F4F4F4",
-"!	c #DFDFDF",
-"~	c #E8E8E8",
-"{	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@.     ",
-"    ..#+$%.     ",
-"  ..&####%*.    ",
-" .&####==-;.    ",
-" .###==###>*.   ",
-"  .+####==,'.   ",
-"  .$%#==###'*.  ",
-"   .--###==').  ",
-"   .-;#==####*. ",
-"    .>######!!. ",
-"    .,####!!..  ",
-"     .##=!..    ",
-"     .~{..      ",
-"      ..        "};
diff --git a/art/new_all_day_event.png b/art/new_all_day_event.png
deleted file mode 100644
index ee15651725..0000000000
--- a/art/new_all_day_event.png
+++ /dev/null
diff --git a/art/new_appointment.png b/art/new_appointment.png
deleted file mode 100644
index 5dc61801da..0000000000
--- a/art/new_appointment.png
+++ /dev/null
diff --git a/art/new_appointment.xpm b/art/new_appointment.xpm
deleted file mode 100644
index d55eb396e8..0000000000
--- a/art/new_appointment.xpm
+++ /dev/null
@@ -1,126 +0,0 @@
-/* XPM */
-static char * new_appointment_xpm[] = {
-"16 16 107 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FEFEFE",
-"@ 	c #FDFDFD",
-"# 	c #E0E0E0",
-"$ 	c #C1C1C1",
-"% 	c #F1F1F1",
-"& 	c #C3C3C3",
-"* 	c #FBFBFB",
-"= 	c #A8A8A8",
-"- 	c #525252",
-"; 	c #141414",
-"> 	c #111111",
-", 	c #383838",
-"' 	c #6E6E6E",
-") 	c #ADADAD",
-"! 	c #717171",
-"~ 	c #5D5D5D",
-"{ 	c #404040",
-"] 	c #BA8D31",
-"^ 	c #EAB23D",
-"/ 	c #403011",
-"( 	c #E5E5E5",
-"_ 	c #B4B4B4",
-": 	c #606060",
-"< 	c #DADADA",
-"[ 	c #777777",
-"} 	c #4B4B49",
-"| 	c #161616",
-"1 	c #EFB63E",
-"2 	c #F6D591",
-"3 	c #F3B840",
-"4 	c #916D26",
-"5 	c #F8F8F8",
-"6 	c #F3F3F3",
-"7 	c #E7E7E7",
-"8 	c #B5B5B5",
-"9 	c #A1A1A1",
-"0 	c #919191",
-"a 	c #EEB53E",
-"b 	c #FAE7BC",
-"c 	c #FCD584",
-"d 	c #FEC142",
-"e 	c #FFC243",
-"f 	c #FFFFFF",
-"g 	c #CECECE",
-"h 	c #0B0B0B",
-"i 	c #B9B9B9",
-"j 	c #E4E4E4",
-"k 	c #B88B30",
-"l 	c #F9E2B2",
-"m 	c #FDD789",
-"n 	c #D0D0D0",
-"o 	c #373737",
-"p 	c #898989",
-"q 	c #ABABAB",
-"r 	c #33332D",
-"s 	c #CFCFB9",
-"t 	c #E7AF3C",
-"u 	c #F9DDA4",
-"v 	c #FECA5E",
-"w 	c #D09E36",
-"x 	c #8B8B8B",
-"y 	c #F6F6F6",
-"z 	c #131313",
-"A 	c #3A2B0F",
-"B 	c #8F6C25",
-"C 	c #FDC042",
-"D 	c #2D220C",
-"E 	c #6F6F6F",
-"F 	c #8F8F8F",
-"G 	c #353535",
-"H 	c #C3C3AE",
-"I 	c #DFDFDF",
-"J 	c #F0F0F0",
-"K 	c #FCFCFC",
-"L 	c #363636",
-"M 	c #AAAAAA",
-"N 	c #C8C8C8",
-"O 	c #A9A9A9",
-"P 	c #E1E1E1",
-"Q 	c #4A4A4A",
-"R 	c #FAFAFA",
-"S 	c #C4C4C4",
-"T 	c #3C3C36",
-"U 	c #ADAD9B",
-"V 	c #CCCCCC",
-"W 	c #D6D6D6",
-"X 	c #F4F4F4",
-"Y 	c #F7F7F7",
-"Z 	c #BABABA",
-"` 	c #BFBFBF",
-" .	c #C9C9C9",
-"..	c #767676",
-"+.	c #CBCBCB",
-"@.	c #ACACAC",
-"#.	c #B3B3B3",
-"$.	c #5C5C5C",
-"%.	c #C5C5C5",
-"&.	c #A0A0A0",
-"*.	c #444444",
-"=.	c #A7A7A7",
-"-.	c #989898",
-";.	c #4B4B4B",
-">.	c #9C9C9C",
-",.	c #A2A2A2",
-"'.	c #BBBBBB",
-"        . . . . . . . . .       ",
-"      . + + + + + + @ # $ .     ",
-"      . + % % % % % % & * = .   ",
-"      . - ; . > , ' % ) ! ~ { . ",
-"    . . ] ^ / ( _ . : < [ } | . ",
-"  . . 1 2 3 4 5 6 7 . : 8 9 0 . ",
-"  . a b c d e f g h i . 9 j 0 . ",
-". k l m e e e n o p % q r s 0 . ",
-". t u v e e w o x + y < z j 0 . ",
-". A B C e e D E f + F G . H 0 . ",
-". I J K f f n L M @ J N z j 0 . ",
-". O P y + + f n Q R S 9 T U 0 . ",
-"  . V W X R K * Y V Z . 9 j 0 . ",
-"  . . ` Z  ...+.@.#.. $.%.j 0 . ",
-"    . . &.@.*.=.-.. ;.>.,.'.&.. ",
-"      . . . . . . . . . . . .   "};
diff --git a/art/new_contact.xpm b/art/new_contact.xpm
deleted file mode 100644
index 9b7e778102..0000000000
--- a/art/new_contact.xpm
+++ /dev/null
@@ -1,98 +0,0 @@
-/* XPM */
-static char * new_contact_xpm[] = {
-"24 24 71 1",
-" 	c None",
-".	c #000000",
-"+	c #BABABA",
-"@	c #FDFDFD",
-"#	c #FCFCFC",
-"$	c #959595",
-"%	c #FBFBFB",
-"&	c #FAFAFA",
-"*	c #F9F9F9",
-"=	c #F8F8F8",
-"-	c #F7F7F7",
-";	c #E3E3E3",
-">	c #BDBDBD",
-",	c #9D9C9A",
-"'	c #999896",
-")	c #A4A4A3",
-"!	c #391414",
-"~	c #B1B1B1",
-"{	c #D4D4D4",
-"]	c #E2E2E2",
-"^	c #DCD4C7",
-"/	c #C1B8A6",
-"(	c #878682",
-"_	c #BFBFBF",
-":	c #7C7C7C",
-"<	c #909090",
-"[	c #747474",
-"}	c #818181",
-"|	c #A8A8A8",
-"1	c #B6B6B6",
-"2	c #F6F6F6",
-"3	c #7F742E",
-"4	c #E1E1E1",
-"5	c #959FA4",
-"6	c #678690",
-"7	c #9A9891",
-"8	c #959490",
-"9	c #F5F5F5",
-"0	c #2B6776",
-"a	c #294E70",
-"b	c #294770",
-"c	c #284D6F",
-"d	c #232362",
-"e	c #B1B3B4",
-"f	c #979797",
-"g	c #B0B0B0",
-"h	c #AFAFAF",
-"i	c #D3D3D3",
-"j	c #E0E0E0",
-"k	c #27276C",
-"l	c #28286D",
-"m	c #282A6F",
-"n	c #2A5A73",
-"o	c #DFDFDF",
-"p	c #A2A2A2",
-"q	c #B5B5B5",
-"r	c #727272",
-"s	c #BCBCBC",
-"t	c #F4F4F4",
-"u	c #DEDEDE",
-"v	c #D5D5D5",
-"w	c #DDDDDD",
-"x	c #BEBEBE",
-"y	c #D1D1D1",
-"z	c #F3F3F3",
-"A	c #DCDCDC",
-"B	c #E7E7E7",
-"C	c #E6E6E6",
-"D	c #E5E5E5",
-"E	c #E4E4E4",
-"F	c #686868",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"  ..................... ",
-" .+@@@@@@@@@@@@@@@@@@#$.",
-" .@%%%%%&&&&*****===--;.",
-" .@%>>,')>&*****==----;.",
-" .@%>>!..,***~={=>----].",
-" .@%>>^/.(**_:<[<}|1-2].",
-" .@%>>^3.'**={=----2224.",
-" .@&>567.8*===----22294.",
-" .@&0abcde==1<f{ghi>99j.",
-" .@&akklmn==----222999o.",
-" .@*****===-pg|qiprs9tu.",
-" .@*vvv=1>----222999ttw.",
-" .@*vxf=p---gi2h$syytzw.",
-" .@*===-----22999tttzzA.",
-" .hBBCDDE;]]]44joouwwAF.",
-"  ..................... ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/art/new_task-16.png b/art/new_task-16.png
deleted file mode 100644
index 7937d8d53b..0000000000
--- a/art/new_task-16.png
+++ /dev/null
diff --git a/art/new_task.png b/art/new_task.png
deleted file mode 100644
index 16a1c94b6b..0000000000
--- a/art/new_task.png
+++ /dev/null
diff --git a/art/next-message.png b/art/next-message.png
deleted file mode 100644
index b040c1f2f2..0000000000
--- a/art/next-message.png
+++ /dev/null
diff --git a/art/offline.png b/art/offline.png
deleted file mode 100644
index 57bdd27be2..0000000000
--- a/art/offline.png
+++ /dev/null
diff --git a/art/online.png b/art/online.png
deleted file mode 100644
index 9a6a3980c2..0000000000
--- a/art/online.png
+++ /dev/null
diff --git a/art/open-in-new-window-16.png b/art/open-in-new-window-16.png
deleted file mode 100644
index 07496e8b81..0000000000
--- a/art/open-in-new-window-16.png
+++ /dev/null
diff --git a/art/outbox-16.png b/art/outbox-16.png
deleted file mode 100644
index e52e00a7f3..0000000000
--- a/art/outbox-16.png
+++ /dev/null
diff --git a/art/outbox-full-16.png b/art/outbox-full-16.png
deleted file mode 100644
index cb138fa2b3..0000000000
--- a/art/outbox-full-16.png
+++ /dev/null
diff --git a/art/outbox-mini.png b/art/outbox-mini.png
deleted file mode 100644
index e52e00a7f3..0000000000
--- a/art/outbox-mini.png
+++ /dev/null
diff --git a/art/outbox.png b/art/outbox.png
deleted file mode 100644
index 3567691c1f..0000000000
--- a/art/outbox.png
+++ /dev/null
diff --git a/art/paste.png b/art/paste.png
deleted file mode 100644
index 736900531a..0000000000
--- a/art/paste.png
+++ /dev/null
diff --git a/art/pattern.png b/art/pattern.png
deleted file mode 100644
index 33abc187ef..0000000000
--- a/art/pattern.png
+++ /dev/null
diff --git a/art/pgp-signature-bad.png b/art/pgp-signature-bad.png
deleted file mode 100644
index 82318fbb4d..0000000000
--- a/art/pgp-signature-bad.png
+++ /dev/null
diff --git a/art/pgp-signature-nokey.png b/art/pgp-signature-nokey.png
deleted file mode 100644
index 00250e090c..0000000000
--- a/art/pgp-signature-nokey.png
+++ /dev/null
diff --git a/art/pgp-signature-ok.png b/art/pgp-signature-ok.png
deleted file mode 100644
index 51782b0e40..0000000000
--- a/art/pgp-signature-ok.png
+++ /dev/null
diff --git a/art/pin.png b/art/pin.png
deleted file mode 100644
index fff34d7d96..0000000000
--- a/art/pin.png
+++ /dev/null
diff --git a/art/post-message-16.png b/art/post-message-16.png
deleted file mode 100644
index fbdaa4b2e5..0000000000
--- a/art/post-message-16.png
+++ /dev/null
diff --git a/art/post-reply-24.png b/art/post-reply-24.png
deleted file mode 100644
index 43b0a229ba..0000000000
--- a/art/post-reply-24.png
+++ /dev/null
diff --git a/art/previous-message.png b/art/previous-message.png
deleted file mode 100644
index 2163fcbe2a..0000000000
--- a/art/previous-message.png
+++ /dev/null
diff --git a/art/print-preview-24.png b/art/print-preview-24.png
deleted file mode 100644
index cd6b90e6bd..0000000000
--- a/art/print-preview-24.png
+++ /dev/null
diff --git a/art/print-preview.xpm b/art/print-preview.xpm
deleted file mode 100644
index a4b36d639d..0000000000
--- a/art/print-preview.xpm
+++ /dev/null
@@ -1,153 +0,0 @@
-/* XPM */
-static char * print_preview_xpm[] = {
-"16 16 134 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #9D9D8D",
-"@ 	c #CFCFB9",
-"# 	c #C4C4AF",
-"$ 	c #8D8D7F",
-"% 	c #353530",
-"& 	c #828282",
-"* 	c #9C9C8C",
-"= 	c #E2E2D0",
-"- 	c #EDEDE7",
-"; 	c #C0C0AC",
-"> 	c #B2B29F",
-", 	c #828274",
-"' 	c #4C4C44",
-") 	c #FFFFFF",
-"! 	c #EFEFEF",
-"~ 	c #ECECEC",
-"{ 	c #090908",
-"] 	c #D5D5BF",
-"^ 	c #FBFBFA",
-"/ 	c #C3C3AE",
-"( 	c #B5B5A2",
-"_ 	c #A6A695",
-": 	c #959586",
-"< 	c #080807",
-"[ 	c #E3E3E3",
-"} 	c #CDCDCD",
-"| 	c #D7D7D7",
-"1 	c #090909",
-"2 	c #CACAB5",
-"3 	c #DDDDD0",
-"4 	c #B7B7A4",
-"5 	c #AAAA98",
-"6 	c #9B9B8B",
-"7 	c #8C8C7D",
-"8 	c #0A0A09",
-"9 	c #E9E9E9",
-"0 	c #EBEBEB",
-"a 	c #DBDBDB",
-"b 	c #929283",
-"c 	c #BABAA7",
-"d 	c #ADAD9B",
-"e 	c #9F9F8E",
-"f 	c #909081",
-"g 	c #727266",
-"h 	c #52524C",
-"i 	c #A4A4A4",
-"j 	c #34342F",
-"k 	c #878779",
-"l 	c #A0A090",
-"m 	c #737367",
-"n 	c #010101",
-"o 	c #575757",
-"p 	c #A6A6A6",
-"q 	c #4B4B43",
-"r 	c #414141",
-"s 	c #777777",
-"t 	c #979797",
-"u 	c #BCBBBB",
-"v 	c #D4D4D3",
-"w 	c #878787",
-"x 	c #323232",
-"y 	c #A5A5A5",
-"z 	c #D0D0CF",
-"A 	c #B5B5B5",
-"B 	c #C2C2C2",
-"C 	c #FBFBFB",
-"D 	c #FAFAFA",
-"E 	c #999999",
-"F 	c #363636",
-"G 	c #9E9E9E",
-"H 	c #ECECEB",
-"I 	c #AEADAB",
-"J 	c #F7F7F7",
-"K 	c #E5E5E4",
-"L 	c #8D8D8D",
-"M 	c #F1F1F1",
-"N 	c #A0A0A0",
-"O 	c #E2E2E2",
-"P 	c #D9D9D8",
-"Q 	c #898988",
-"R 	c #0C0C0C",
-"S 	c #302F2F",
-"T 	c #A4A3A1",
-"U 	c #CCCAC6",
-"V 	c #1B1B1B",
-"W 	c #969594",
-"X 	c #D6D4D2",
-"Y 	c #DDDBDA",
-"Z 	c #DCDCDB",
-"` 	c #DEDDDD",
-" .	c #DFDEDD",
-"..	c #DDDCDB",
-"+.	c #DBDBD9",
-"@.	c #7E7E7D",
-"#.	c #383838",
-"$.	c #555453",
-"%.	c #9F9E9A",
-"&.	c #A8A7A6",
-"*.	c #9E9D9C",
-"=.	c #615E59",
-"-.	c #54514E",
-";.	c #54524E",
-">.	c #514F4B",
-",.	c #52504C",
-"'.	c #504D49",
-").	c #4D4B47",
-"!.	c #4F4D49",
-"~.	c #514F4C",
-"{.	c #535251",
-"].	c #8E8D8A",
-"^.	c #B4B3B1",
-"/.	c #C0BFBC",
-"(.	c #B9B8B5",
-"_.	c #B3B1AF",
-":.	c #B1B1AE",
-"<.	c #AFAEAC",
-"[.	c #B0AEAC",
-"}.	c #ACACA9",
-"|.	c #A6A6A4",
-"1.	c #ABAAA7",
-"2.	c #AEADAA",
-"3.	c #AAA9A6",
-"4.	c #201F1E",
-"5.	c #403F3D",
-"6.	c #444341",
-"7.	c #454542",
-"8.	c #42423F",
-"9.	c #3F3E3C",
-"0.	c #3A3936",
-"a.	c #393835",
-"b.	c #31302D",
-"c.	c #1E1D1B",
-"      . . . .                   ",
-"    . + @ # $ % & . . . .       ",
-"  . * = - ; > , ' ) ! ~ .       ",
-"  { ] ^ / ( _ : < [ } | .       ",
-"  1 2 3 4 5 6 7 8 9 0 a .       ",
-"  . b c d e f g h . i a .       ",
-"    j k l b m n o p 0 a .       ",
-"      q 8 8 r s n . t a . .     ",
-"    . u v ) 9 9 w n x y z A .   ",
-"  . B C ) D ) D C E n F G H I . ",
-"  . D J K L M N O P Q R S T U V ",
-"  . W X Y Z `  ...P +.@.#.$.%.. ",
-"  . &.*.=.-.;.>.,.'.).!.~.{.].. ",
-"  . ^./.(._.:.<.[.}.|.1.2.<.3.. ",
-"  . 4.5.6.7.7.7.8.5.9.0.a.b.c.. ",
-"    . . . . . . . . . . . . .   "};
diff --git a/art/print.png b/art/print.png
deleted file mode 100644
index f223a1146d..0000000000
--- a/art/print.png
+++ /dev/null
diff --git a/art/print.xpm b/art/print.xpm
deleted file mode 100644
index da46eb0157..0000000000
--- a/art/print.xpm
+++ /dev/null
@@ -1,107 +0,0 @@
-/* XPM */
-static char * print_xpm[] = {
-"16 16 88 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #ECECEC",
-"#	c #353535",
-"$	c #D3D3D3",
-"%	c #131313",
-"&	c #C7C7C7",
-"*	c #D7D7D7",
-"=	c #EBEBEB",
-"-	c #E9E9E9",
-";	c #DBDBDB",
-">	c #4D4D4D",
-",	c #A4A4A4",
-"'	c #414141",
-")	c #8C8C8C",
-"!	c #979797",
-"~	c #BCBBBB",
-"{	c #D4D4D3",
-"]	c #D0D0CF",
-"^	c #B5B5B5",
-"/	c #C2C2C2",
-"(	c #FBFBFB",
-"_	c #FAFAFA",
-":	c #F8F8F8",
-"<	c #F4F4F3",
-"[	c #ECECEB",
-"}	c #AEADAB",
-"|	c #F7F7F7",
-"1	c #E5E5E4",
-"2	c #8D8D8D",
-"3	c #F1F1F1",
-"4	c #A0A0A0",
-"5	c #E2E2E2",
-"6	c #D9D9D8",
-"7	c #DEDDDC",
-"8	c #DCDCDA",
-"9	c #D8D7D4",
-"0	c #B3B2B0",
-"a	c #CCCAC6",
-"b	c #1B1B1B",
-"c	c #969594",
-"d	c #D6D4D2",
-"e	c #DDDBDA",
-"f	c #DCDCDB",
-"g	c #DEDDDD",
-"h	c #DFDEDD",
-"i	c #DDDCDB",
-"j	c #DBDBD9",
-"k	c #DAD9D7",
-"l	c #D9D8D6",
-"m	c #81807E",
-"n	c #9F9E9A",
-"o	c #A8A7A6",
-"p	c #9E9D9C",
-"q	c #615E59",
-"r	c #54514E",
-"s	c #54524E",
-"t	c #514F4B",
-"u	c #52504C",
-"v	c #504D49",
-"w	c #4D4B47",
-"x	c #4F4D49",
-"y	c #514F4C",
-"z	c #939291",
-"A	c #9B9A97",
-"B	c #B4B3B1",
-"C	c #C0BFBC",
-"D	c #B9B8B5",
-"E	c #B3B1AF",
-"F	c #B1B1AE",
-"G	c #AFAEAC",
-"H	c #B0AEAC",
-"I	c #ACACA9",
-"J	c #A6A6A4",
-"K	c #ABAAA7",
-"L	c #AEADAA",
-"M	c #AAA9A6",
-"N	c #201F1E",
-"O	c #403F3D",
-"P	c #444341",
-"Q	c #454542",
-"R	c #42423F",
-"S	c #3F3E3C",
-"T	c #3A3936",
-"U	c #393835",
-"V	c #31302D",
-"W	c #1E1D1B",
-"                ",
-"    .........   ",
-"    .++++++@.   ",
-"    .+#$.%&*.   ",
-"    .+=---=;.   ",
-"    .+>.=.,;.   ",
-"    .+=====;.   ",
-"   ..+'=).!;..  ",
-"  .~{+------]^. ",
-" ./(+_+_((_:<[}.",
-" ._|1234567890ab",
-" .cdefghi6jklmn.",
-" .opqrstuvwxyzA.",
-" .BCDEFGHIJKLGM.",
-" .NOPQQQROSTUVW.",
-"  ............. "};
diff --git a/art/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 884c8b8236..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"X	c #A7453E",
-"                ",
-"                ",
-"        .       ",
-"       .X.      ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XX.      ",
-"      .XX.      ",
-"      .X.       ",
-"      ..        ",
-"     .XX.       ",
-"     .XX.       ",
-"      ..        ",
-"                ",
-"                "};
diff --git a/art/priority-low.xpm b/art/priority-low.xpm
deleted file mode 100644
index ad53e9e0cc..0000000000
--- a/art/priority-low.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_low_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #21405A",
-"                ",
-"                ",
-"                ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"     ......     ",
-"      ....      ",
-"      ....      ",
-"       ..       ",
-"       ..       ",
-"                ",
-"                ",
-"                "};
diff --git a/art/properties-16.png b/art/properties-16.png
deleted file mode 100644
index 7586e3ab27..0000000000
--- a/art/properties-16.png
+++ /dev/null
diff --git a/art/public-folder-mini.png b/art/public-folder-mini.png
deleted file mode 100644
index 087eca4a85..0000000000
--- a/art/public-folder-mini.png
+++ /dev/null
diff --git a/art/public-folder.png b/art/public-folder.png
deleted file mode 100644
index b23d9f805f..0000000000
--- a/art/public-folder.png
+++ /dev/null
diff --git a/art/rdf.png b/art/rdf.png
deleted file mode 100644
index b4bdbafa99..0000000000
--- a/art/rdf.png
+++ /dev/null
diff --git a/art/receive-24.png b/art/receive-24.png
deleted file mode 100644
index a09bf6a596..0000000000
--- a/art/receive-24.png
+++ /dev/null
diff --git a/art/recur.xpm b/art/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/art/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/art/refresh-nntp-folders-24.png b/art/refresh-nntp-folders-24.png
deleted file mode 100644
index b1c339a973..0000000000
--- a/art/refresh-nntp-folders-24.png
+++ /dev/null
diff --git a/art/remove-nntp-folder-24.png b/art/remove-nntp-folder-24.png
deleted file mode 100644
index 5500bdec23..0000000000
--- a/art/remove-nntp-folder-24.png
+++ /dev/null
diff --git a/art/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index 1a3ccc1740..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index 137beb9e90..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/reply.xpm b/art/reply.xpm
deleted file mode 100644
index 681801c7d7..0000000000
--- a/art/reply.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * reply_xpm[] = {
-"16 16 27 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #000000",
-",	c #FBFAF7",
-"'	c #A5A29D",
-")	c #990000",
-"!	c #EFEFEF",
-"~	c #CCCCCC",
-"{	c #797873",
-"]	c #7D7A77",
-"^	c #F7F5F1",
-"/	c #090808",
-"(	c #D7D4CE",
-"_	c #D8D5CF",
-":	c #7F0000",
-"<	c #181818",
-"[	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%>>>>>>>>> ",
-" .%--;>%%%%%%%> ",
-" .%-,'>%))))!~> ",
-" .%,{->%)))!!~> ",
-" .%]-^>%))))!~> ",
-" ./(__>%)!)):~> ",
-"  ....>%!!!::~> ",
-"      >%~~~~~~< ",
-"      >>[>>>>>> ",
-"                "};
diff --git a/art/reply_to_all.xpm b/art/reply_to_all.xpm
deleted file mode 100644
index be5c633f2a..0000000000
--- a/art/reply_to_all.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * reply_to_all_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #F7F5F1",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #000000",
-"]	c #797873",
-"^	c #7D7A77",
-"/	c #FAF9F6",
-"(	c #F8F6F2",
-"_	c #990000",
-":	c #EFEFEF",
-"<	c #CCCCCC",
-"[	c #090808",
-"}	c #D7D4CE",
-"|	c #D8D5CF",
-"1	c #D6D3CD",
-"2	c #7F0000",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".%&%%%%%%%*=..  ",
-".%-;%%%%%>,'.$. ",
-".%--;%%%;-)'.=. ",
-".%-!~;-{{{{{{{{{",
-".%!]--;{%%%%%%%{",
-".%^-)/({%____:<{",
-".[}|||1{%___::<{",
-" ......{%____:<{",
-"  .[}||{%_:__2<{",
-"   ....{%:::22<{",
-"       {%<<<<<<3",
-"       {{4{{{{{{"};
diff --git a/art/save-16.png b/art/save-16.png
deleted file mode 100644
index 20a27ca2a1..0000000000
--- a/art/save-16.png
+++ /dev/null
diff --git a/art/save-24.png b/art/save-24.png
deleted file mode 100644
index 51375a3f40..0000000000
--- a/art/save-24.png
+++ /dev/null
diff --git a/art/save-as-16.png b/art/save-as-16.png
deleted file mode 100644
index 3b9612efdf..0000000000
--- a/art/save-as-16.png
+++ /dev/null
diff --git a/art/save.xpm b/art/save.xpm
deleted file mode 100644
index 7b1812943e..0000000000
--- a/art/save.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * 16_save_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #B8CADB",
-"@	c #C5D4E3",
-"#	c #687B8D",
-"$	c #D8D8D8",
-"%	c #CFDBE6",
-"&	c #9DB8D2",
-"*	c #728699",
-"=	c #BCCEDF",
-"-	c #FFFFFF",
-";	c #D2DEEA",
-">	c #C0D1E2",
-",	c #CFDBE7",
-"'	c #798EA3",
-")	c #D0DDE9",
-"!	c #B7CBDE",
-"~	c #B6CADD",
-"{	c #B7CADD",
-"]	c #BACCDF",
-"^	c #9FB9D3",
-"/	c #7E94A9",
-"(	c #A4BDD5",
-"_	c #BABABA",
-":	c #556474",
-"<	c #2A303A",
-"                ",
-"                ",
-"  ............  ",
-" .+@#$$$$$$%&*. ",
-" .=&#------;&*. ",
-" .>&#$$$$$$,&*. ",
-" .>&'------)&*. ",
-" .>&&!~~{{]^&*. ",
-" .>&&&&&&&&&&*. ",
-" .>&&//////&&*. ",
-" .>(/$$_$-$/&*. ",
-" .>&/$_$-/$/&*. ",
-" .>&/$_-$/$/&*. ",
-" .=&/_$-$$$/**. ",
-"  .:........<.  ",
-"                "};
diff --git a/art/schedule-meeting-16.png b/art/schedule-meeting-16.png
deleted file mode 100644
index 7081e2fead..0000000000
--- a/art/schedule-meeting-16.png
+++ /dev/null
diff --git a/art/schedule-meeting-16.xpm b/art/schedule-meeting-16.xpm
deleted file mode 100644
index 7cc7911439..0000000000
--- a/art/schedule-meeting-16.xpm
+++ /dev/null
@@ -1,178 +0,0 @@
-/* XPM */
-static char * schedule_meeting_16_xpm[] = {
-"16 16 159 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #8A8575",
-"@ 	c #EEDEA6",
-"# 	c #F0DD96",
-"$ 	c #EFDB95",
-"% 	c #AFA06B",
-"& 	c #655C38",
-"* 	c #0B0B0B",
-"= 	c #A49D83",
-"- 	c #F1DD97",
-"; 	c #F2E5B3",
-"> 	c #F3E9C1",
-", 	c #EBDEB0",
-"' 	c #B4A981",
-") 	c #C6C6C6",
-"! 	c #535353",
-"~ 	c #131313",
-"{ 	c #EFDE9F",
-"] 	c #F1E1AA",
-"^ 	c #F8F3D9",
-"/ 	c #FBF3D5",
-"( 	c #EAE1BE",
-"_ 	c #948D73",
-": 	c #161615",
-"< 	c #4D4D4D",
-"[ 	c #B7B7B7",
-"} 	c #655D53",
-"| 	c #56493A",
-"1 	c #564838",
-"2 	c #514433",
-"3 	c #D9C993",
-"4 	c #F8F1CF",
-"5 	c #FDF7DB",
-"6 	c #FAF3D3",
-"7 	c #E6DCB9",
-"8 	c #867F66",
-"9 	c #2D2C2A",
-"0 	c #978774",
-"a 	c #D5B792",
-"b 	c #D2B38D",
-"c 	c #C7A882",
-"d 	c #B39672",
-"e 	c #2B2824",
-"f 	c #EEE7CF",
-"g 	c #F4EBC9",
-"h 	c #FEF6D5",
-"i 	c #FBF2CD",
-"j 	c #E7DCB5",
-"k 	c #857D63",
-"l 	c #5A544D",
-"m 	c #B89F80",
-"n 	c #D8BA94",
-"o 	c #CAAB84",
-"p 	c #C2A27B",
-"q 	c #54493C",
-"r 	c #C5B887",
-"s 	c #E9E0BF",
-"t 	c #FAEFC8",
-"u 	c #FAEDC0",
-"v 	c #E5D8A9",
-"w 	c #887F5F",
-"x 	c #686158",
-"y 	c #BFA482",
-"z 	c #D2B38E",
-"A 	c #CEAF89",
-"B 	c #C7A781",
-"C 	c #C2A17A",
-"D 	c #726555",
-"E 	c #B6A977",
-"F 	c #CAC4AD",
-"G 	c #B0A47F",
-"H 	c #AEA277",
-"I 	c #4B473C",
-"J 	c #8F8A82",
-"K 	c #BDA382",
-"L 	c #CCAD87",
-"M 	c #C9A983",
-"N 	c #C4A47D",
-"O 	c #BE9E77",
-"P 	c #6E6A64",
-"Q 	c #495946",
-"R 	c #3D5146",
-"S 	c #32483E",
-"T 	c #0F0F05",
-"U 	c #77736D",
-"V 	c #988A79",
-"W 	c #C9AA86",
-"X 	c #B29573",
-"Y 	c #856F55",
-"Z 	c #69726C",
-"` 	c #A4D3C5",
-" .	c #8DCDBA",
-"..	c #7BBDA9",
-"+.	c #376052",
-"@.	c #15241E",
-"#.	c #443C31",
-"$.	c #403528",
-"%.	c #3C3329",
-"&.	c #5A6A63",
-"*.	c #85C9B7",
-"=.	c #75C1AB",
-"-.	c #6AB89F",
-";.	c #5FAE93",
-">.	c #468A73",
-",.	c #173128",
-"'.	c #303030",
-").	c #9A9A9A",
-"!.	c #C5D2DE",
-"~.	c #B7C9DA",
-"{.	c #667685",
-"].	c #23292F",
-"^.	c #7A998C",
-"/.	c #72B7A2",
-"(.	c #7EBBA7",
-"_.	c #5DB093",
-":.	c #53A688",
-"<.	c #3A7D65",
-"[.	c #2E2E2E",
-"}.	c #959799",
-"|.	c #B7C9DB",
-"1.	c #90ABC5",
-"2.	c #89A5BF",
-"3.	c #809DB7",
-"4.	c #758FA7",
-"5.	c #171E24",
-"6.	c #749786",
-"7.	c #549F85",
-"8.	c #85B5A4",
-"9.	c #4DA584",
-"0.	c #449B7A",
-"a.	c #2F745A",
-"b.	c #BFCFDD",
-"c.	c #7F96AB",
-"d.	c #85A0BA",
-"e.	c #7B97B1",
-"f.	c #728FA9",
-"g.	c #69849D",
-"h.	c #404E5C",
-"i.	c #6B927E",
-"j.	c #49967A",
-"k.	c #7EB09D",
-"l.	c #409A78",
-"m.	c #38916F",
-"n.	c #277153",
-"o.	c #ACBFD0",
-"p.	c #687F95",
-"q.	c #92A9BD",
-"r.	c #6F8BA5",
-"s.	c #66839D",
-"t.	c #577188",
-"u.	c #596774",
-"v.	c #A1B5C6",
-"w.	c #4F6376",
-"x.	c #8FA4B7",
-"y.	c #607D97",
-"z.	c #57758F",
-"A.	c #49657D",
-"B.	c #5A6773",
-"    . . . . . .                 ",
-"  . + @ # $ % & . * . . . .     ",
-". = - ; > , ' . ) ! ~ . . . .   ",
-". { ] ^ / ( _ : < [ } | 1 2 . . ",
-". 3 4 5 6 7 8 . 9 0 a b c d e . ",
-". f g h i j k . l m n b o p q . ",
-". r s t u v w . x y z A B C D . ",
-"  . E F G H I . J K L M N O P . ",
-"    . Q R S T . U V W p X Y . . ",
-"  . Z `  ...+.@.. . #.$.%..     ",
-". &.*.=.-.;.>.,.'.).!.~.{.]..   ",
-". ^./.(._.:.<.[.}.|.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.. ",
-"              . . . . . . . . . "};
diff --git a/art/schedule-meeting-24.png b/art/schedule-meeting-24.png
deleted file mode 100644
index 237bac1f96..0000000000
--- a/art/schedule-meeting-24.png
+++ /dev/null
diff --git a/art/score-high.xpm b/art/score-high.xpm
deleted file mode 100644
index bb7bd47562..0000000000
--- a/art/score-high.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_high_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-higher.xpm b/art/score-higher.xpm
deleted file mode 100644
index 696e74bed5..0000000000
--- a/art/score-higher.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_higher_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-highest.xpm b/art/score-highest.xpm
deleted file mode 100644
index d8dab65079..0000000000
--- a/art/score-highest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_highest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-low.xpm b/art/score-low.xpm
deleted file mode 100644
index e071741adc..0000000000
--- a/art/score-low.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_low_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lower.xpm b/art/score-lower.xpm
deleted file mode 100644
index 74da90d670..0000000000
--- a/art/score-lower.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lower_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm
deleted file mode 100644
index 9beee1849f..0000000000
--- a/art/score-lowest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lowest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-normal.xpm b/art/score-normal.xpm
deleted file mode 100644
index 82b618cb8d..0000000000
--- a/art/score-normal.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * score_normal_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #17D1EA",
-"@	c #FFFFFF",
-"#	c #EF9815",
-"                ",
-"                ",
-"    ...         ",
-"   .+.+.        ",
-"   .@#@.        ",
-"   .@@@.        ",
-"   ..@..        ",
-"  ..@@@..       ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-"  .@@@@@.       ",
-"   ##@##        ",
-"   ## ##        ",
-"                "};
diff --git a/art/search-16.png b/art/search-16.png
deleted file mode 100644
index 6e9837d8ee..0000000000
--- a/art/search-16.png
+++ /dev/null
diff --git a/art/search-and-replace-16.png b/art/search-and-replace-16.png
deleted file mode 100644
index 5daa4c39a0..0000000000
--- a/art/search-and-replace-16.png
+++ /dev/null
diff --git a/art/send-16.png b/art/send-16.png
deleted file mode 100644
index 1ade9e9b98..0000000000
--- a/art/send-16.png
+++ /dev/null
diff --git a/art/send-24-receive.png b/art/send-24-receive.png
deleted file mode 100644
index a6e4354ddf..0000000000
--- a/art/send-24-receive.png
+++ /dev/null
diff --git a/art/send-24.png b/art/send-24.png
deleted file mode 100644
index bc5800ca62..0000000000
--- a/art/send-24.png
+++ /dev/null
diff --git a/art/send-48-receive.png b/art/send-48-receive.png
deleted file mode 100644
index 53f8b15d9a..0000000000
--- a/art/send-48-receive.png
+++ /dev/null
diff --git a/art/send-later-16.png b/art/send-later-16.png
deleted file mode 100644
index 3b2bb791d4..0000000000
--- a/art/send-later-16.png
+++ /dev/null
diff --git a/art/send-receive.xpm b/art/send-receive.xpm
deleted file mode 100644
index 27ad312dee..0000000000
--- a/art/send-receive.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char * send_receive_xpm[] = {
-"16 16 37 1",
-" 	c None",
-".	c #000000",
-"+	c #F8D4CD",
-"@	c #F8D6CF",
-"#	c #ED9280",
-"$	c #B33118",
-"%	c #F7CEC6",
-"&	c #C1351A",
-"*	c #A92F16",
-"=	c #DD3D1E",
-"-	c #E86F57",
-";	c #EC8A77",
-">	c #A12D16",
-",	c #852512",
-"'	c #F3B3A6",
-")	c #F3B8AC",
-"!	c #F5C4BA",
-"~	c #D2DCE5",
-"{	c #ABBECE",
-"]	c #547693",
-"^	c #E66349",
-"/	c #CFDAE4",
-"(	c #A2B7C9",
-"_	c #425D73",
-":	c #CCD7E1",
-"<	c #C9D5E0",
-"[	c #D5DEE6",
-"}	c #A9BDCE",
-"|	c #B1C3D2",
-"1	c #9BB2C6",
-"2	c #4D6C86",
-"3	c #577A98",
-"4	c #4F6F8A",
-"5	c #456178",
-"6	c #DBE3EA",
-"7	c #496780",
-"8	c #DAE2E9",
-"    .           ",
-"   .+.          ",
-"  .@#$.         ",
-" .%##&*.        ",
-".%=-;>,,.       ",
-"...'#>...       ",
-"  .)#>.  .....  ",
-"  .!#>.  .~{].  ",
-"  .#^>.  ./(_.  ",
-"  .....  .:(_.  ",
-"       ...<(_...",
-"       .[}|1232.",
-"        .[((45. ",
-"         .6(7.  ",
-"          .8.   ",
-"           .    "};
diff --git a/art/send.png b/art/send.png
deleted file mode 100644
index bc5800ca62..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/settings-16.png b/art/settings-16.png
deleted file mode 100644
index b391a0e839..0000000000
--- a/art/settings-16.png
+++ /dev/null
diff --git a/art/settings.png b/art/settings.png
deleted file mode 100644
index f3e8bfd4fc..0000000000
--- a/art/settings.png
+++ /dev/null
diff --git a/art/show_all_messages.xpm b/art/show_all_messages.xpm
deleted file mode 100644
index f38a42aebf..0000000000
--- a/art/show_all_messages.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * show_all_messages_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #9DB8D2",
-"@	c #FFFFFF",
-"#	c #89A1B9",
-"$	c #859DB4",
-"%	c #CACACA",
-"&	c #8199AF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .         . ",
-"   . .       . .",
-"  .         .  .",
-" ...........    ",
-" .+@+. .+@+.    ",
-" .#+$. .%+&.    ",
-"  ...   ...     ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/splash-1-0.png b/art/splash-1-0.png
deleted file mode 100644
index 13dabfd980..0000000000
--- a/art/splash-1-0.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index 440f86d8c1..0000000000
--- a/art/splash.png
+++ /dev/null
diff --git a/art/stock-edit-16.png b/art/stock-edit-16.png
deleted file mode 100644
index 7c7d597da5..0000000000
--- a/art/stock-edit-16.png
+++ /dev/null
diff --git a/art/stock-edit-24.png b/art/stock-edit-24.png
deleted file mode 100644
index f6b49be992..0000000000
--- a/art/stock-edit-24.png
+++ /dev/null
diff --git a/art/stock-junk-24.png b/art/stock-junk-24.png
deleted file mode 100644
index 52364ab279..0000000000
--- a/art/stock-junk-24.png
+++ /dev/null
diff --git a/art/stock-notjunk-24.png b/art/stock-notjunk-24.png
deleted file mode 100644
index a74fecbd66..0000000000
--- a/art/stock-notjunk-24.png
+++ /dev/null
diff --git a/art/summary-settings.png b/art/summary-settings.png
deleted file mode 100644
index 011d94ac0a..0000000000
--- a/art/summary-settings.png
+++ /dev/null
diff --git a/art/summary_preferences-16.png b/art/summary_preferences-16.png
deleted file mode 100644
index 4a318c2fd1..0000000000
--- a/art/summary_preferences-16.png
+++ /dev/null
diff --git a/art/talking-heads.png b/art/talking-heads.png
deleted file mode 100644
index 1c2ba5b040..0000000000
--- a/art/talking-heads.png
+++ /dev/null
diff --git a/art/task-assigned-to.xpm b/art/task-assigned-to.xpm
deleted file mode 100644
index d60eeafa2d..0000000000
--- a/art/task-assigned-to.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_to_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #ABCCAB",
-"*	c #768E76",
-"=	c #5E705E",
-"-	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#######..$.  ",
-" .+%%%%%%%.&..  ",
-" .+##......&&.  ",
-" .+%%.&&&&&&&&. ",
-" .+##.&*&*&*&*&.",
-" .+%%.========. ",
-" .+##......==.  ",
-" .+%%%%%%%.=..  ",
-" .-$$$$$$$..$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/task-assigned.xpm b/art/task-assigned.xpm
deleted file mode 100644
index 9b245c0c49..0000000000
--- a/art/task-assigned.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #FFCC66",
-"*	c #CC9933",
-"=	c #996600",
-"-	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+##..#####$.  ",
-" .+%%.&.%%%%$.  ",
-"......&&.###$.  ",
-".&&&&&&&&.%%$.  ",
-".&*&*&*&*&.#$.  ",
-".========.%%$.  ",
-"......==.###$.  ",
-" .+%%.=.%%%%$.  ",
-" .-$$..$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/task-recurring.xpm b/art/task-recurring.xpm
deleted file mode 100644
index 634cd87a84..0000000000
--- a/art/task-recurring.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * task_recurring_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #BFBFC3",
-"*	c #A2A2B0",
-"=	c #454572",
-"-	c #9898A9",
-";	c #85859C",
-">	c #333366",
-",	c #4F4F79",
-"'	c #B3B3C3",
-")	c #A3A3B7",
-"!	c #9696AD",
-"~	c #464672",
-"{	c #7F7F99",
-"]	c #C9C9CA",
-"^	c #3D3D6D",
-"/	c #3B3B6B",
-"(	c #A4A4B8",
-"_	c #B5B5C4",
-":	c #D1D1D8",
-"<	c #9191A4",
-"[	c #B5B5BD",
-"}	c #9F9FAE",
-"|	c #4A4A76",
-"1	c #40406F",
-"2	c #E9E9E9",
-"3	c #8F8FA9",
-"4	c #9D9DAC",
-"5	c #9090A4",
-"6	c #55557F",
-"7	c #ADADBE",
-"8	c #484875",
-"9	c #B9B9C7",
-"0	c #DCDCE0",
-"a	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+&*=-#;>>,$.  ",
-" .+'>)%%!>>'$.  ",
-" .+~{]##;^/~$.  ",
-" .+>(%%%_:(>$.  ",
-" .+><[}###<>$.  ",
-" .+|^1!%%23|$.  ",
-" .+4>>;##5>4$.  ",
-" .+6>>!%7890$.  ",
-" .a$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/task.png b/art/task.png
deleted file mode 100644
index 5b3c7b7534..0000000000
--- a/art/task.png
+++ /dev/null
diff --git a/art/task.xpm b/art/task.xpm
deleted file mode 100644
index 4a53c3e9ab..0000000000
--- a/art/task.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * task_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .&$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/art/thankyou.png b/art/thankyou.png
deleted file mode 100644
index f08f553cc3..0000000000
--- a/art/thankyou.png
+++ /dev/null
diff --git a/art/timezone-16.xpm b/art/timezone-16.xpm
deleted file mode 100644
index 6f3094a395..0000000000
--- a/art/timezone-16.xpm
+++ /dev/null
@@ -1,162 +0,0 @@
-/* XPM */
-static char * timezone_16_xpm[] = {
-"16 16 143 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #2A2B2B",
-"@ 	c #020203",
-"# 	c #050709",
-"$ 	c #020202",
-"% 	c #7490B2",
-"& 	c #A6BDD4",
-"* 	c #C0D3E5",
-"= 	c #E6E7E6",
-"- 	c #C7CCC5",
-"; 	c #9BAC9F",
-"> 	c #030304",
-", 	c #010101",
-"' 	c #82848E",
-") 	c #80846B",
-"! 	c #7FA59B",
-"~ 	c #AECFE0",
-"{ 	c #C0D8EF",
-"] 	c #B4C4C2",
-"^ 	c #6A8B6C",
-"/ 	c #699678",
-"( 	c #51826F",
-"_ 	c #2D535E",
-": 	c #1C492A",
-"< 	c #5EA66A",
-"[ 	c #7BC280",
-"} 	c #67BA7A",
-"| 	c #7AC7A7",
-"1 	c #B1D1EC",
-"2 	c #94ADAF",
-"3 	c #719177",
-"4 	c #609996",
-"5 	c #5B9583",
-"6 	c #537762",
-"7 	c #6E9874",
-"8 	c #64A970",
-"9 	c #6DBD77",
-"0 	c #5FB565",
-"a 	c #5DAD6B",
-"b 	c #89BFF1",
-"c 	c #89BFF5",
-"d 	c #4C9DAB",
-"e 	c #459D82",
-"f 	c #55A395",
-"g 	c #557A5C",
-"h 	c #1A304E",
-"i 	c #74B678",
-"j 	c #5EB666",
-"k 	c #49A54F",
-"l 	c #4CA34F",
-"m 	c #90C4E4",
-"n 	c #7BB8F8",
-"o 	c #7FBCF8",
-"p 	c #49A09A",
-"q 	c #389B6F",
-"r 	c #81ACBF",
-"s 	c #617B65",
-"t 	c #5B735E",
-"u 	c #010202",
-"v 	c #7AAD6E",
-"w 	c #438C3D",
-"x 	c #6AA8A1",
-"y 	c #92C5F1",
-"z 	c #77B8F6",
-"A 	c #77B7F7",
-"B 	c #7BB7F2",
-"C 	c #5DA9BA",
-"D 	c #56A4A1",
-"E 	c #85B1D9",
-"F 	c #637679",
-"G 	c #586D86",
-"H 	c #040506",
-"I 	c #6B975F",
-"J 	c #749486",
-"K 	c #85BDD9",
-"L 	c #8FBFEF",
-"M 	c #82BBF4",
-"N 	c #82BAF2",
-"O 	c #84B9EE",
-"P 	c #71AFEE",
-"Q 	c #96ABBF",
-"R 	c #8AB7D4",
-"S 	c #668B77",
-"T 	c #557E74",
-"U 	c #040406",
-"V 	c #649D69",
-"W 	c #508B52",
-"X 	c #508074",
-"Y 	c #7EAEDD",
-"Z 	c #81BBF4",
-"` 	c #81B9F2",
-" .	c #83B8EE",
-"..	c #80ACD5",
-"+.	c #908466",
-"@.	c #64825C",
-"#.	c #5C7F5A",
-"$.	c #627F5C",
-"%.	c #5C7677",
-"&.	c #5C9D67",
-"*.	c #5D9071",
-"=.	c #617576",
-"-.	c #7DB2E8",
-";.	c #7EB4EA",
-">.	c #7BB0E6",
-",.	c #7698B8",
-"'.	c #66855E",
-").	c #53885E",
-"!.	c #51845C",
-"~.	c #61825D",
-"{.	c #3D362D",
-"].	c #0A1C14",
-"^.	c #609D73",
-"/.	c #68A879",
-"(.	c #628E77",
-"_.	c #7AAEE4",
-":.	c #70A4DB",
-"<.	c #72A7DD",
-"[.	c #6997C6",
-"}.	c #598860",
-"|.	c #51835C",
-"1.	c #638860",
-"2.	c #07090A",
-"3.	c #50716C",
-"4.	c #6FA779",
-"5.	c #5D8976",
-"6.	c #7AA7D4",
-"7.	c #73A5D7",
-"8.	c #6495C7",
-"9.	c #557FAB",
-"0.	c #65855F",
-"a.	c #5A875F",
-"b.	c #558462",
-"c.	c #778383",
-"d.	c #7B98B4",
-"e.	c #7CA0C3",
-"f.	c #7397BD",
-"g.	c #7D8FA0",
-"h.	c #809980",
-"i.	c #143325",
-"j.	c #597658",
-"k.	c #030505",
-"l.	c #030404",
-"                                ",
-"          . . + @ @ #           ",
-"      . $ % & * = - ; > ,       ",
-"    . ' ) ! ~ { ] ^ / ( _ ,     ",
-"    : < [ } | 1 2 3 4 5 6 $     ",
-"  , 7 8 9 0 a b c d e f g h ,   ",
-"  , i j k l m n o p q r s t u   ",
-"  , v w x y z A B C D E F G H   ",
-"  , I J K L M N O P Q R S T U   ",
-"  , V W X Y Z `  ...+.@.#.$.H   ",
-"  u %.&.*.=.-.;.>.,.'.).!.~.{.  ",
-"    ].^./.(._.:.<.[.}.|.1.2.    ",
-"    @ 3.4.5.6.7.8.9.0.a.b.>     ",
-"      @ H c.d.e.f.g.h.i.j.      ",
-"          u u k.> l.>           ",
-"                                "};
diff --git a/art/timezone-48.png b/art/timezone-48.png
deleted file mode 100644
index 2222e6f903..0000000000
--- a/art/timezone-48.png
+++ /dev/null
diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm
deleted file mode 100644
index fc748953eb..0000000000
--- a/art/tree-expanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+.....+.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm
deleted file mode 100644
index 0dfb12a0a5..0000000000
--- a/art/tree-unexpanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+.....+.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/undelete_message-16.png b/art/undelete_message-16.png
deleted file mode 100644
index 066cbfc99c..0000000000
--- a/art/undelete_message-16.png
+++ /dev/null
diff --git a/art/wax-seal-broken.png b/art/wax-seal-broken.png
deleted file mode 100644
index 951f062dcc..0000000000
--- a/art/wax-seal-broken.png
+++ /dev/null
diff --git a/art/wax-seal.png b/art/wax-seal.png
deleted file mode 100644
index 5b0ba63bff..0000000000
--- a/art/wax-seal.png
+++ /dev/null
diff --git a/art/weekview.xpm b/art/weekview.xpm
deleted file mode 100644
index 869b9e722a..0000000000
--- a/art/weekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * weekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #F2F1ED",
-"$	c #919191",
-"%	c #666666",
-"....................... ",
-".++++++++++@++++++++++. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$$$$$$$$$$$. ",
-".+#########$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".@$$$$$$$$$%$$$$$$$$$%. ",
-"....................... ",
-"                        "};
diff --git a/art/work_offline.xpm b/art/work_offline.xpm
deleted file mode 100644
index b4c2cdc17f..0000000000
--- a/art/work_offline.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * 16_work_offline_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #424242",
-"+	c #212121",
-"@	c #737373",
-"#	c #EFEFEF",
-"$	c #DEDEDE",
-"%	c #CECECE",
-"&	c #101010",
-"*	c #8C8C8C",
-"=	c #636363",
-"-	c #ADADAD",
-";	c #9C9C9C",
-">	c #000000",
-",	c #BDBDBD",
-"                ",
-"                ",
-"                ",
-"     .+++..@    ",
-"    . ###$$%&   ",
-"   @#*=*-*=*%@  ",
-"   .#;> %->;%+  ",
-"   .$-> %->,%+  ",
-"   .$;$#,;$ %+  ",
-"   .$$ %+% #%&  ",
-"   @%-$@>@%-%.  ",
-"    .,;;;;-,.   ",
-"     @++++&.    ",
-"                ",
-"                ",
-"                "};
diff --git a/art/work_online-16.png b/art/work_online-16.png
deleted file mode 100644
index b11d36d277..0000000000
--- a/art/work_online-16.png
+++ /dev/null
diff --git a/art/working-16.png b/art/working-16.png
deleted file mode 100644
index 5f12053a84..0000000000
--- a/art/working-16.png
+++ /dev/null
diff --git a/art/workweekview.xpm b/art/workweekview.xpm
deleted file mode 100644
index 35cceedbdc..0000000000
--- a/art/workweekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * workweekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #B5B4AF",
-"$	c #666666",
-"%	c #F2F1ED",
-"....................... ",
-".++++@+++@+++@+++@++++. ",
-".+###$###$###$###$###$. ",
-".+###$###$###$###$###$. ",
-".@$$$$$$$$$$$$$$$$$$$$. ",
-".++++#+++#+++#+++#+++#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".@###$###$###$###$####. ",
-"....................... ",
-"                        "};
diff --git a/art/world_map-960.png b/art/world_map-960.png
deleted file mode 100644
index 0512d20115..0000000000
--- a/art/world_map-960.png
+++ /dev/null
diff --git a/art/yearview.xpm b/art/yearview.xpm
deleted file mode 100644
index 0d4fa4135b..0000000000
--- a/art/yearview.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * yearview_xpm[] = {
-"24 24 17 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F2F1ED",
-"#	c #AAA9A6",
-"$	c #D7D6D2",
-"%	c #92918E",
-"&	c #B7B6B3",
-"*	c #CBCAC6",
-"=	c #919191",
-"-	c #888785",
-";	c #B6B6B2",
-">	c #888884",
-",	c #C1C1BD",
-"'	c #A7A6A3",
-")	c #D8D8D4",
-"!	c #666666",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@#$%&*@@@@@@@=. ",
-".+@@@@@@@-;>,'@@@@@@@=. ",
-".+====================. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".)===================!. ",
-"....................... ",
-"                        "};
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8d96b80beb..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="Evolution"
-
-(test -f $srcdir/configure.in \
-  && test -f $srcdir/ChangeLog \
-  && test -d $srcdir/shell) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/calendar/.cvsignore b/calendar/.cvsignore
deleted file mode 100644
index b7f7dea650..0000000000
--- a/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-*.lo
diff --git a/calendar/AUTHORS b/calendar/AUTHORS
deleted file mode 100644
index e4fda3d3bc..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Miguel de Icaza <miguel@kernel.org>
-Federico Mena <federico@helixcode.com>
-Arturo Esponosa <arturo@nuclecu.unam.mx>
-Russell Steinthal <rms39@columbia.edu>
-Rodrigo Moya <rodrigo@ximian.com>
-JP Rosevear <jpr@ximian.com>
-Damon Chaplin <damon@ximian.com>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index 8ad6de67ba..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,4785 +0,0 @@
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_started): remove setting property of "handle_popup".
-	* gui/e-week-view.c (e_week_view_on_editing_started): remove setting property of "handle_popup".
-
-2003-12-08 Carl Sun <carl.sun@sun.com>
-
-        Fixes #46351
-
-	* gui/e-timezone-entry.c  (e_timezone_entry_mnemonic_activate):
-	new function. override the  member function of GtkWidget to handle
-	nemonic_activate signal of custom class ETimezoneEntry.
-
-
-2003-12-08  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/gnome-cal.c (gnome_calendar_class_init): correct argument mismatch in "goto_date" signal definition.
-
-2003-12-05  Yong Sun <Yong.Sun@Sun.com>
-
-	Fix for #51337
-
-	* gui/dialogs/alarm-page.c
-	Change raw string "Action/Trigger" to _("Action/Trigger")
-	* gui/dialogs/recurrence-page.c
-	Change raw string "Date/Time" to _("Date/Time")
-
-2003-12-04  Harry Lu  <harry.lu@sun.com>
-
-	Fix for bugzilla bug #51627.
-
-	* gui/goto.c: (create_ecal): set calitem's move_selection_when_moving 
-	to FALSE so that changing month and year won't send out 
-	a "selection_changed" signal.
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Do not call
-	control_util_set_folder_bar_label().
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	Use e_activity_handler_operation_progressing(), not
-	evolution_activity_client_update().
-
-	* gui/e-cal-view.c: Remove settings menu.
-	(on_settings): Remove.
-
-	* gui/calendar-commands.c (get_shell_view_interface): Remove.
-	(control_util_set_folder_bar_label): Remove.
-	(calendar_set_folder_bar_label): Remove.
-	(control_util_show_settings): Remove.
-	(gcal_calendar_dates_change_cb): Remove.
-	(calendar_control_activate): Do not connect, do not call
-	calendar_set_folder_bar_label().
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): free the notification
-	list
-	
-	* gui/tasks-component.c (impl_dispose): ditto
-
-	* gui/calendar-component.c (impl_dispose): ditto
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (impl_dispose): free up the notifications
-	and the ecal
-	(config_create_ecal_changed_cb): clear the create_ecal if the
-	primary selection changes
-	(setup_create_ecal): find a default ecal to do creation with
-	(impl_requestCreateItem): use above
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (rename_task_list_cb): cast the parent
-	(impl_createControls): add notification for primary tasks
-	(config_primary_selection_changed_cb): handle primary selection
-	changing in gconf
-
-	* gui/calendar-config-keys.h: fix config key for primary tasks
-
-2003-12-03  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (rename_calendar_cb): cast the parent
-	(config_primary_selection_changed_cb): handle the primary
-	selection changing elsewhere
-	(impl_dispose): remove the list of notifications
-	(impl_createControls): add primary calendar notification
-	(config_create_ecal_changed_cb): clear create_ecal if the primary
-	key changes
-	(setup_create_ecal): find an ecal to use for creation
-	(impl_requestCreateItem): use above
-
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c: Do not #include shell stuff.
-
-	* gui/main.c: Do not #include <evolution-shell-client.h>.
-
-	* gui/e-itip-control.c: Do not #include
-	<e-folder-selector-button.h> nor <evolution-shell-client.h>.
-	(start_default_server): Return FALSE.
-	(default_server_started_cb): Do not connect the "selected" signal
-	on the button since it's now NULL.
-	(button_selected_cb): #if 0 out.
-
-	* gui/e-cal-list-view.h: Do not #include
-	"evolution-activity-client.h".
-
-	* gui/tasks-component.c (impl_createControls): Give an empty label
-	for the status bar.
-
-	* gui/e-day-view.h: Remove all deps on evolution-activity-client.
-
-2003-12-02  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Version the schemas
-	* gui/apps_evolution_calendar.schemas: Removed
-	* gui/apps_evolution_calendar.schemas.in.in: Added
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): added
-	a label to the dialog to make it look less ugly.
-
-2003-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c: converted to use an
-	ESourceOptionMenu instead of the ESourceSelector.
-	(primary_selection_changed_cb): removed.
-	(copy_source_dialog): create the ESourceOptionMenu here.
-	(source_selected_cb): callback for the "source_selected"
-	signal on the ESourceOptionMenu widget.
-
-2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): Replace member
-	"activity" with an "activity_id".
-
-	* gui/e-cal-view.c (struct _ECalendarViewPrivate): Replace member
-	"activity" with "activity_id".
-	(e_calendar_view_destroy): Don't unref activity here anymore.
-	(e_calendar_view_set_status_message): Report progress using the
-	EActivityHandler off the CalendarComponent.
-
-	* gui/calendar-component.c
-	(struct _CalendarComponentPrivate): New member activity_handler.
-	(calendar_component_init): Init.
-	(calendar_component_peek_activity_handler): New.
-	(impl_dispose): Unref.
-	(impl_createControls): Return an ETaskBar for the statusbar
-	control.
-
-2003-12-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-	* gui/tasks-component.c (impl_createControls): Pass a label for
-	the status bar control for now.
-
-2003-12-01  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in:
-	* gui/calendar-commands.c:
-	* gui/e-meeting-list-view.c:
-	* gui/e-meeting-model.c:
-	* gui/e-select-names-editable.c:
-	* gui/itip-bonobo-control.c:
-	* gui/itip-utils.c:
-	* gui/main.c:
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	* gui/alarm-notify/alarm-queue.c:
-	* gui/alarm-notify/notify-main.c:
-	* gui/dialogs/alarm-options.c:
-	* gui/dialogs/e-delegate-dialog.c:
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	* importers/main.c: Use BASE_VERSION for repo_ids and OAFIIDs
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: put the conduits in their own dir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-2003-12-01  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: install to privlibdir
-
-	* conduits/calendar/Makefile.am: ditto
-	
-	* conduits/todo/e-todo.conduit.in: subst in correct thing
-
-	* conduits/calendar/e-calendar.conduit.in: subst in correct thing
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load, remove_uri_to_load):
-	removed unneeded functions.
-	(alarm_notify_add_calendar, alarm_notify_remove_calendar): no need
-	anymore to add/remove URIs to load on startup to the configuration.
-
-2003-12-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): removed this
-	function, since we now use the ESourceList to know what calendars
-	to load.
-	(get_calendars_to_load): moved to config-data.c.
-	(save_notification_time, get_saved_notification_time,
-	save_blessed_program, is_blessed_program): use the
-	shared GConfClient.
-
-	* gui/alarm-notify/config-data.[ch]: use a GConfClient instead of a
-	EConfigListener.
-	(config_data_get_conf_client): renamed from _get_listener.
-	(config_data_get_timezone, config_data_get_24_hour_format): changed
-	to use the GConfClient.
-	(config_data_get_calendars_to_load): new function.
-	(ensure_inited): create the source lists for calendar and tasks here.
-	(do_cleanup): cleanup the source lists here.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): use
-	config_data_get_calendars_to_load().
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): we want to skip if it
-	*is* read only
-
-2003-11-28  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-meeting-store.c (e_meeting_store_get_type): allocate the
-	type information correctly
-
-2003-11-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline): e_cal_new () ->
-	e_cal_new_from_uri ().
-	(backend_go_online): Ditto.
-	(calendar_offline_handler_init): Ditto.
-
-	* gui/comp-editor-factory.c (open_client): Ditto.
-
-	* gui/e-itip-control.c (start_calendar_server): Ditto.
-	(object_requested_cb): Ditto.
-
-	* gui/e-tasks.c (e_tasks_add_todo_uri): Ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Ditto.
-	(gnome_calendar_add_event_uri): Ditto.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): Ditto.
-
-	* importers/icalendar-importer.c (load_file_fn): Ditto.
-	(vcal_load_file_fn): Ditto.
-	(gnome_calendar_import_data_fn): Ditto.
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): Pass sources to
-	e_cal_new ().
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source): use the correct
-	icalcomponent when calling e_cal_create_object.
-
-	* gui/tasks-control.c (sensitize_commands): no need to have a
-	selection for Paste to work.
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): disable
-	editing items if the selected task list is read only, not if it's not.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-task-list.glade:
-	* gui/dialogs/new-task-list.[ch]: new files containing the
-	implementation of the 'New Task List' dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): use G_STRLOC
-	for g_warning messages.
-
-	* gui/tasks-component.c (new_task_list_cb): implemented.
-
-2003-11-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/copy-source-dialog.c (copy_source_dialog): actually
-	add the source selector to the dialog's box.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c:
-	* gui/dialogs/copy-source-dialog.[ch]: fixed compilation errors.
-
-	* gui/dialogs/Makefile.am: added missing header directories.
-
-2003-11-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: fixed copyright notices.
-
-	* gui/dialogs/copy-source-dialog.[ch]: implementation of the
-	Copy command for sources.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-component.c (fill_popup_menu_cb, copy_calendar_cb):
-	added Copy command.
-
-	* gui/tasks-component.c (fill_popup_menu_cb, copy_task_list_cb):
-	added Copy command.
-
-2003-11-23  Ross Burton  <ross@burtonini.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Append "_2" to the OAFIID to avoid conflicting with Evo 1.4.
-	
-	* gui/main.c:
-	* gui/alarm-notify/notify-main.c:
-	Updated with new OAFIID.
-
-2003-11-20  JP Rosevear <jpr@ximian.com>
-
-	* Remove a bunch of gal includes that are no longer needed
-
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43556
-
-	* gui/e-cal-view.c (selection_get, selection_clear_event,
-	selection_received): removed this unneeded functions.
-	(e_calendar_view_init): don't create a GtkInvisible anymore.
-	(e_calendar_view_destroy): no need to destroy the GtkInvisible.
-	(e_cal_view_copy_clipboard, e_cal_view_paste_clipboard):
-	use GtkClipboard.
-
-2003-11-19  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due): make sure timezone value is
-	sane
-	(get_completed): ditto
-
-	* gui/e-cal-model.c (get_dtstart): add more guards
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #51052
-
-	* importers/icalendar-importer.c (prepare_events, prepare_tasks):
-	call icalcompiter_next to move the pointer to the next before
-	removing a component avoid breaking the link.
-
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (get_dtstart): make sure the timezone value is
-	sane
-
-	* gui/e-cal-model-calendar.c (get_dtend): ditto
-	
-2003-11-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_primary_calendar):
-	get the primary calendar
-	(calendar_config_set_primary_calendar): set it
-	(calendar_config_add_notification_primary_calendar): set
-	notifications for it
-	(calendar_config_get_primary_tasks): get the primary task list
-	(calendar_config_set_primary_tasks): set it
-	(calendar_config_add_notification_primary_tasks): set
-	notifications for it
-
-	* gui/calendar-config-keys.h: add primary keys
-
-	* gui/calendar-component.c (find_first_source): find any source
-	(update_uri_for_primary_selection): set the default uri and save
-	the source uid
-	(update_primary_selection): set the primary selection
-	(primary_source_selection_changed_cb): use above
-	(impl_createControls): set the primary selection
-
-	* gui/tasks-component.c: as above
-	
-2003-11-18  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove db3 include
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c
-	(calendar_control_sensitize_calendar_commands,
-	sensitize_taskpad_commands): removed the 'New...' menu items
-	from the UI, it's now implemented in the shell.
-	(file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): removed.
-
-2003-11-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): added 'sensitive'
-	argument.
-	(fill_popup_menu_cb): disable/enable menu items depending on whether
-	there is a selection or not.
-
-	* gui/tasks-component.c (add_popup_menu_item, fill_popup_menu_cb):
-	ditto.
-
-2003-11-17  JP Rosevear <jpr@ximian.com>
-
-	* Cleanup some ref/unref calls
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (delete_calendar_cb, rename_calendar_cb):
-	* gui/tasks-component.c (delete_task_list_cb, rename_task_list_cb):
-	peek the primary selection.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (fill_popup_menu_cb): added 'Delete' and
-	'Rename' menu items.
-	(delete_task_list_cb, rename_task_list_cb): callbacks for new
-	menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): try first to
-	create the icon from the stock, and then from a file.
-	(fill_popup_menu_cb): set callback for 'Rename' menu item.
-	(rename_calendar_cb): callback for 'Rename' menu item.
-	(new_calendar_cb): fixed arguments.
-
-	* gui/tasks-component.c (impl_createControls): connect to
-	"fill_popup_menu" signal on the source selector.
-	(fill_popup_menu_cb): callback to create our menu items.
-
-2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: remove the AlarmNotify service, no
-	more need for it, since the alarm daemon will listen for changes
-	on the GConf key.
-
-	* gui/gnome-cal.c (add_alarms): removed function to talk to the
-	alarm daemon.
-	(client_cal_opened_cb): don't call add_alarms().
-
-	* gui/alarm-notify/alarm-notify.[ch]: made it a basic GObject.
-	(AlarmNotify_addCalendar, AlarmNotify_removeCalendar): removed
-	AlarmNotify interface implementation.
-	(alarm_notify_class_init): no epv to initialize.
-	(alarm_notify_remove_calendar): new function, copied from the
-	CORBA method implementation.
-	(alarm_notify_factory_fn): return NULL, since there is no objects
-	that can be created via this factory now.
-
-	* gui/alarm-notify/notify-main.c (main): now the factory is the alarm
-	notification service itself.
-	(load_calendars): no need to use exceptions here.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	now the factory is the alarm notification service itself.
-
-	* gui/main.c (launch_alarm_daemon_cb): dont use the AlarmNotify CORBA
-	types.
-
-2003-11-17  Harry Lu  <harry.lu@sun.com>
-
-        * gui/dialogs/recurrence-page.c (make_ending_count_special):
-        Make ending count of occurrences of Recurrence tab numeric only.
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_set_property): add a uri
-
-	* gui/e-tasks.c: kill e_tasks_open
-
-	* gui/e-tasks.h: remove proto
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_view_objects_added_cb): emit the added
-	signal for the correct rows
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (is_in_uids): copy in here
-	(update_uris_for_selection): save the selection
-	(update_selection): update the selection when its changed
-	somewhere else
-	(config_selection_changed_cb): update the selection if the
-	configuration changes
-	(impl_createControls): store the source selector
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c (calendar_config_get_tasks_selected): get
-	the list of task lists selected
-	(calendar_config_set_tasks_selected): save it
-	(calendar_config_add_notification_tasks_selected): get notified
-	about it
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): add it via e-tasks
-	(remove_uri_for_source): remove it via e-tasks
-	(get_default_task): provide a default for editing
-	(impl_createControls): create the control directly
-	(impl_requestCreateItem): implement
-
-	* gui/gnome-cal.c (gnome_calendar_purge): don't let the two list
-	iterators clobber each other
-
-	* gui/e-tasks.h: add protos
-
-	* gui/e-tasks.c (e_tasks_destroy): free the client list and the
-	hash, disconnect signals
-	(e_tasks_new_task): use the default client
-	(e_tasks_add_todo_uri): add a uri
-	(e_tasks_remove_todo_uri): remove a uri
-	(e_tasks_set_default_uri): set default uri
-	(e_tasks_get_default_client): get default client
-	(e_tasks_delete_completed): expunge from all clients
-	(e_tasks_setup_view_menus): use default client uri
-
-	* gui/e-tasks.c (set_timezone): set the timezone for all clients
-	(e_tasks_init): set up the clients has table
-
-	* gui/e-calendar-table.etspec: yank some useless display columns
-
-	* gui/e-cal-model.c (remove_client): remove objects in reverse
-	order so we don't clobber ourselves
-
-	* gui/calendar-component.c: add FIXME
-
-2003-11-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-component.c (get_default_event): set up a event to
-	be edited
-	(impl_requestCreateItem): implement
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/*.[hc]: include e-source* from e-d-s
-
-2003-11-14  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_calendars_selected):
-	config accessor
-	(calendar_config_set_calendars_selected): ditto
-	(calendar_config_add_notification_calendars_selected): config
-	notification
-
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config-keys.h: add new key
-
-	* gui/calendar-component.c (is_in_uids): util function
-	(update_uris_for_selection): save the selection in the
-	configuration
-	(update_selection): update the selection from the config info
-	(source_selection_changed_cb): only pass one param
-	(config_selection_changed_cb): listen for config changes
-	(impl_dispose): remove config notification
-	(impl_createControls): use bonobo_exception_set; add a config
-	notification
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New.
-	(tasks_component_class_init): Install.
-
-	* gui/calendar-component.c (impl__get_userCreatableItems): New.
-	(impl_requestCreateItem): New, for now just a stub.
-	(calendar_component_class_init): Install into the EPV.
-
-2003-11-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add a component_alias
-	of "calendar" for the calendar and "tasks" for the tasks.
-
-2003-11-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (add_popup_menu_item): Use non-deprecated
-	gtk_menu_shell_append ().
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50808
-                                                                                
-        * gui/goto.c (goto_dialog): set initial selection to current day.
-                                                                                
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_offline): use
-	a standard calendar status
-	(backend_cal_opened_online): ditto
-	
-	* gui/alarm-notify/alarm-queue.c (cal_opened_cb): ditto
-
-	* gui/gnome-cal.c (client_cal_opened_cb): ditto
-
-	* gui/e-tasks.c (cal_opened_cb): ditto
-
-	* gui/e-itip-control.c (default_server_started_cb): ditto
-
-	* gui/e-cal-model.c (cal_opened_cb): ditto
-
-	* gui/comp-editor-factory.c (cal_opened_cb): ditto
-
-2003-11-11  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): load the
-	calendar synchronously
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): ditto
-	
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* importers/icalendar-importer.c (update_single_object): return
-	boolean not ECalStatus
-	(update_objects): ditto
-	(process_item_fn): handle above returns
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_due_status): just check the boolean
-
-2003-11-10  JP Rosevear <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): use proper change list free function
-	name
-	(post_sync): ditto
-
-	* conduits/todo/todo-conduit.c: same
-	
-2003-11-10  Dan Winship  <danw@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_completed): Remove get-vtype check
-	from the completed-tasks query (and don't leak the sexp string).
-
-	* gui/e-cal-model.c (update_e_cal_view_for_client): Don't adjust
-	the sexp to use get-vtype.
-
-	* gui/gnome-cal.c (adjust_e_cal_view_sexp, gnome_calendar_purge):
-	Remove get-vtype check from queries
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: remove includes for toplevel libical dir
-
-	* gui/dialogs/Makefile.am: ditto
-
-	* importers/Makefile.am: ditto
-
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* In the gui this is a search and replace commit for moving the
-	calendar to evolution-data-server; it also deletes the old backend
-	files; e-cal-view was rename to e-calendar-view to remove name
-	conflict
-	
-2003-11-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/migration.c: fix typo
-
-2003-11-05  Larry Ewing  <lewing@ximian.com>
-
-	* gui/migration.c (process_old_dir): add a unimplemented warning
-	so we at least avoid relocation errors.
-
-2003-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): added more
-	menu items.
-	(delete_calendar_cb): callbacks for new popup menu items.
-	(impl_createControls): add the source selector widget to the
-	CalendarComponentPrivate structure.
-
-	* gui/migration.[ch] (migrate_old_tasks): new function to migrate
-	old tasks setups.
-	(process_old_dir): renamed and added a "filename" argument, so that
-	the same function can be used for tasks and calendar directories.
-	(migrate_old_calendars): added new argument when calling
-	process_old_dir().
-
-	* gui/tasks-component.c (tasks_component_init): call
-	migrate_old_tasks() if there are no groups defined.
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/e-cal-view.c: add new signal "selected_time_changed" 
-	* gui/e-day-view-main-item.c (e_day_view_main_item_class_init):
-	a11y initialization
-	* gui/e-day-view-top-item (e_day_view_top_item_get_day_label):
-	new public function.
-	* gui/e-day-view.c (e_day_view_ensure_rows_visible,
-	e_day_view_update_calendar_selection_time): make static functions public
-	(e_day_view_cursor_key_up, e_day_view_cursor_key_down,
-	e_day_view_cursor_key_left, e_day_view_cursor_key_right): emit
-	"selected_time_changed".
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-meeting-model.c (SELECT_NAMES_OAFID): Append "_2".
-	* gui/e-select-names-editable.c (SELECT_NAMES_OAFIID): Likewise.
-	* gui/e-meeting-list-view.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/alarm-options.c (SELECT_NAMES_OAFID): Likewise.
-	* gui/dialogs/e-delegate-dialog.c (SELECT_NAMES_OAFID): Likewise
-
-2003-11-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: use
-	"evolution2:config_item" properties instead of
-	"evolution:config_item" ones.
-
-2003-11-03  Harry Lu  <harry.lu@sun.com>
-
-	Fix for #50387.
-
-	* importers/icalendar-importer.c (support_format_fn):
-	Call icalcomponent_is_valid() to check whether the returned
-	icalcomponent is valid.
-
-2003-10-31  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): Add the webcal
-	source group.
-
-	* gui/dialogs/new-calendar.c (print_uri_noproto): Implement.
-	(group_is_remote): Implement.
-	(create_new_source_with_group): Implement webcal case.
-	(new_calendar_dialog): Get optional location from dialog.
-
-	* gui/dialogs/new-calendar.glade: Add location entry.
-
-	* pcs/Makefile.am: Build http backend.
-
-	* pcs/cal-backend-http.[ch]: Add skeleton based on cal-backend-file.
-
-2003-10-31  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.h: Add CAL_STATIC_CAPABILITY_NO_THISANDFUTURE
-	and CAL_STATIC_CAPABILITY_NO_THISANDPRIOR
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): Add a
-	CalClient argument. Use cal_client_get_static_capability to decide
-	whether or not to offer THISANDFUTURE and THISANDPRIOR options
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes, save_cmd,
-	save_close_cmd): Pass a CalClient to recur_component_dialog.
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize,
-	e_day_view_finish_resize, e_day_view_on_editing_stopped,
-	e_day_view_on_top_canvas_drag_data_received,
-	e_day_view_on_main_canvas_drag_data_received): Likewise
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise
-
-	* gui/calendar-component.c (impl_createControls): set an exception
-	if we fail, so evo won't crash.
-
-2003-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): fixed
-	mismatched condition in if/else statement.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.[ch] (e_tasks_get_cal_client): removed.
-
-	* gui/tasks-control.c (sensitize_commands): fixed to work correctly
-	with the ECalView's model.
-	(tasks_control_set_property): don't use e_tasks_get_cal_client.
-
-	* gui/alarm-notify/alarm-notify.c (free_client_hash): new function
-	to remove items from the CalClient's hash table.
-	(alarm_notify_finalize): call free_client_hash() for each item
-	in the hash table.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (client_die_cb): use
-	bonobo_main_quit, not gtk_main_quit.
-
-	* gui/alarm-notify/alarm-queue.c (free_client_alarms_cb): callback
-	for freeing ClientAlarms stored in the hash table.
-	(alarm_queue_done): call free_client_alarms_cb() for each opened
-	client.
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (mark_dirty, save_idle): removed, since
-	we dont save the file anymore in idle callbacks.
-	(cal_backend_file_dispose): removed all traces of the idle saving.
-	(check_dup_uid, create_cal, cal_backend_file_add_timezone,
-	cal_backend_file_create_object, cal_backend_file_modify_object,
-	cal_backend_file_remove_object, cal_backend_file_receive_objects):
-	call save() directly instead of mark_dirty().
-
-2003-10-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object):
-	implemented THIS and ALL recurrences cases, blowing away or detaching
-	recurrences from the main component as required.
-	(get_rid_string): make it return const.
-	(get_rid_timetype): new convenience function for getting
-	libical's recurrence ID from a CalComponent.
-	(cal_backend_file_is_read_only, remove_recurrence_cb,
-	remove_component): fixed warnings.
-	(remove_object_instance_cb): callback to remove the instances
-	from the hash on the THISANDPRIOR and THISANDFUTURE cases.
-	(cal_backend_file_remove_object): replaced mismatched if/else
-	statement with proper management of each of the recurrence cases.
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-util.c (date_edit_destroy_cb): unref the
-	config manager
-	(comp_editor_new_date_edit): set up a config manager for the date
-	editor
-
-	* gui/e-date-edit-config.[hc]: config manager for e-date-edit
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): no need to
-	update config settings everywhere explicitly
-
-	* gui/tasks-component.c (update_uris_for_selection): cast the
-	widget
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c (setup_widgets): don't update config settings
-	explicitly
-	(gnome_calendar_update_config_settings): kill
-
-	* gui/e-week-view.c: remove null chars
-
-	* gui/e-tasks.h: remove proto
-
-	* gui/e-tasks.c (set_timezone): set the timezone on the client
-	(timezone_changed_cb): changed timezone callback
-	(setup_config): setup config stuff
-	(e_tasks_init): setup config and widgets here
-	(e_tasks_new): construct is dead, no need to track all widgets
-	(cal_opened_cb): set the timezone upon opening
-	(e_tasks_update_all_config_settings): kill
-
-	* gui/control-factory.c (control_factory_new_control): create the
-	calendar ourselves
-
-	* gui/calendar-config.c (on_timezone_set): don't update the
-	settings everywhere here, we have config managers now
-
-	* gui/calendar-component.c (impl_createControls): create the
-	calendar ourselves
-
-	* gui/calendar-commands.h: remove protos
-
-	* gui/calendar-commands.c: remove dead functions
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view-config.c (set_twentyfour_hour): set the format on
-	the cal view
-
-	* gui/e-week-view-config.c (set_twentyfour_hour): ditto
-	
-	* gui/e-cal-list-view-config.c (set_twentyfour_hour): set the 24
-	hour format on the view
-	(twentyfour_hour_changed_cb): 24 hour format change callback
-	(e_cal_list_view_config_set_view): handle 24 hour format changes
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): unref
-	config manager
-	(init_widgets): create config manager for the e-calendar
-
-	* gui/e-tasks.c (setup_widgets): create config manager for the
-	table view
-	(e_tasks_destroy): unref config manager
-	(e_tasks_open): return FALSE not NULL
-	(e_tasks_update_all_config_settings): don't configure the calendar
-	table here, we have a manager
-
-	* gui/calendar-config.c: remove dead config functions (handled by
-	config managers now)
-
-2003-10-29  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (set_timezone): set the timezone for all clients
-	(timezone_changed_cb): callback for changes
-	(setup_config): setup the configuration
-	(setup_widgets): setup up configuration managers for the list
-	view, task list and date navigator
-	(gnome_calendar_init): setup config
-	(gnome_calendar_destroy): destroy configuration managers and
-	notifications
-	(gnome_calendar_update_config_settings): remove dead bits
-
-	* gui/e-mini-calendar-config.[hc]: manage configuration of an
-	e-calendar
-
-	* gui/e-day-view-config.h: remove extraneous comment, type the
-	parent class correctly
-
-	* gui/e-week-view-config.h: ditto
-	
-	* gui/e-day-view-config.c (e_day_view_config_class_init): type the
-	class correctly
-	(set_timezone): set timezone
-	(timezone_changed_cb): timezone changed callback
-	(e_day_view_config_set_view): track timezone changes
-
-	* gui/e-week-view-config.c: ditto
-	
-	* gui/e-cell-date-edit-config.[hc]: manage configuration of a date
-	edit cell
-
-	* gui/e-calendar-table-config.[hc]: manage configuration of a
-	e-calendar-table
-
-	* gui/e-cal-list-view.c (get_current_time_cb): use the view
-	timezone to compute
-
-	* gui/e-cal-list-view-config.[hc]: manage configuration of a
-	list view
-
-	* gui/calendar-config.h: update protos
-
-	* gui/calendar-config.c
-	(calendar_config_add_notification_timezone): notify of timezone
-	change
-	(calendar_config_add_notification_dnav_show_week_no): notify of
-	show week number setting change
-
-	* gui/calendar-component.c (calendar_component_peek): remove bad
-	comma
-
-	* gui/Makefile.am: build new config classes
-
-2003-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (fill_popup_menu_callback): fixed
-	typo in menu item label.
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_use_24_hour_format): new
-	function.
-
-	* gui/e-cal-view.[ch]: no need to keep the 'use_24_hour' setting,
-	it's already in the model.
-	(e_cal_view_get_use_24_hour_format,
-	e_cal_view_set_use_24_hour_format): new functions.
-
-	* gui/e-day-view.[ch] (e_day_view_get_24_hour_format,
-	(e_day_view_set_24_hour_format): removed.
-	(e_day_view_convert_time_to_display, e_day_view_update_event_label,
-	e_day_view_get_time_string_width): use the ECalView's function to
-	get the 24 hour format.
-
-	* gui/e-week-view.[ch] (e_week_view_get_24_hour_format,
-	e_week_view_set_24_hour_format): removed.
-	(e_week_view_convert_time_to_display,
-	e_week_view_get_time_string_width): use the ECalView's function
-	to get the 24 hour format.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	* gui/e-week-view-event-item.c (e_week_view_draw_time):
-	don't use the view's use_24_hour_format, but the ECalView method.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): connect to
-	"fill_popup_menu" on the ESourceSelector.
-	(fill_popup_menu_callback): add popup menu items here.
-	(add_popup_menu_item): new function to add items to the
-	popup menu.
-	(new_calendar_cb): callbacks for the popup menu items.
-
-2003-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c: no need to keep the timezone here, it is
-	already stored in the model.
-	(e_cal_view_get_timezone): call e_cal_model_get_timezone().
-	(e_cal_view_set_timezone): call e_cal_model_set_timezone().
-	(e_cal_view_new_appointment_for): use the model's timezone.
-
-2003-10-27  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_notify_object_created,
-	cal_backend_notify_object_modified,
-	cal_backend_notify_object_removed): New; tell each query about a
-	created/modified/removed object.
-
-	* pcs/cal.c (cal_notify_object_created): Use
-	cal_backend_notify_object_created.
-	(cal_notify_object_modified, cal_notify_object_removed): Likewise
-	for modified/removed
-	(cal_notify_objects_received): we need both the before and after
-	forms for the modified objects so they can be resolved as
-	adds/modifies/removes per-query. But the caller can just call the
-	cal_backend_* routines for each object anyway, so just remove the
-	created/modified/removed lists.
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects):
-	Remove created/modified/removed list arguments.
-	(_cal_backend_receive_objects): Likewise.
-
-	* pcs/cal-backend-file.c (cal_backend_file_receive_objects):
-	Remove created/modified/removed list arguments. Replace the one
-	use of *removed with a call to cal_backend_notify_object_removed.
-
-2003-10-27  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): store config objects as well
-	(gnome_calendar_set_default_uri): return FALSE if the
-	pre-condition fails
-	(gnome_calendar_update_config_settings): remove settings that are
-	now handled by the config objects
-
-	* gui/e-week-view.c (e_week_view_set_compress_weekend): queue a
-	draw
-
-	* gui/e-itip-control.c (start_default_server): comment out
-
-	* gui/e-day-view-config.[hc]: a class to track config changes of
-	interest to day views
-
-	* gui/e-week-view.[hc]: ditto for week views
-	
-	* gui/calendar-config.h: add protos
-
-	* gui/calendar-config.c: use the #defines for the keys and add
-	notification routines
-
-	* gui/calendar-config-keys.h: a list of defines for gconf keys
-
-	* gui/Makefile.am: build new files
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.h: changed fill_component_from_model virtual
-	method to get an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model.c (ecm_append_row): the source model sent from
-	ETable is an ETableModel, not an ECalModel.
-
-	* gui/e-cal-model-calendar.c (ecmc_fill_component_from_model):
-	get an ETableModel for the 'source_model' argument.
-
-	* gui/e-cal-model-tasks.c (ecmt_fill_component_from_model): ditto.
-
-2003-10-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (add_uri_for_source): pass FALSE as the
-	'only_if_exists' parameter, so that the calendar gets created when
-	it still does not exist.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-component.c (tasks_component_init): initialize private
-	structure on TasksComponent.
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_class_init): removed
-	repeated initialization.
-	(calendar_component_peek): use G_STRLOC for g_warning's.
-
-	* gui/tsaks-control.[ch] (tasks_control_activate,
-	tasks_control_deactivate): made these 2 functions public.
-
-	* gui/tasks-component.[ch]: implementation of the tasks component.
-
-	* gui/Makefile.am:
-	* gui/GNOME_Evolution_Calendar.server.in.in: added tasks component.
-
-	* gui/main.c: ditto.
-	(factory): added code to create the tasks component when requested.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_changes): Remove type arg
-
-	* conduits/calendar/calendar-conduit.c (pre_sync, post_sync):
-	Update for that
-
-	* conduits/todo/todo-conduit.c (pre_sync, post_sync): Likewise
-
-	* idl/evolution-calendar.idl (getChanges): Remove type arg.
-
-	* pcs/cal.c (impl_Cal_getChanges): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_changes): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_changes): Update
-	for that
-
-	* pcs/Makefile.am: build libpcs.la and libpcsfile.la instead of
-	just .a.
-	(libpcs_la_LIBADD): depend on libcal-util.la and libeutil.la
-	(libpcsfile_la_LIBADD): depend on libpcs.la
-
-2003-10-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_construct_instance,
-	cal_util_remove_instances): new functions for individual
-	instances management.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object): if we
-	dont have a recurrence in our hash table, generate one for the
-	specified recurrence ID.
-	(match_recurrence_sexp): new function to match recurrences on
-	regular expresessions.
-	(match_object_sexp): call match_recurrence_sexp() for all recurrences.
-	(cal_backend_file_modify_object): handle mod_types.
-	(cal_backend_file_remove_object): handle mod_types.
-
-2003-10-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: update protos
-
-	* gui/gnome-cal.c (gnome_calendar_set_default_uri): set the
-	default client based on uri
-
-	* gui/calendar-component.c (add_uri_for_source): rename from
-	load_uri_for_source and take a calendar
-	(remove_uri_for_source): utility routine to remove the source's
-	uri from the calendar
-	(is_in_selection): checks to see if the uid of the given source
-	matches any of those in the given selection
-	(update_uris_for_selection): remove any uris no longer in the
-	selection, add those that still exist
-	(source_selection_changed_callback): call above
-	(primary_source_selection_changed_callback): we have the calendar
-	easily now; set the default by uri
-	(control_activate_cb): handle activation and de-activation
-	(impl_createControls): create the calendar control ourselves so we
-	have access to the calendar
-	(impl_dispose): release the source selection
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (add_component): if the component received
-	is an instance, add it to the recurrences hash table.
-	(free_recurrence): callback for g_hash_table_foreach() to free
-	the recurrences in the CalBackendFileObject structure.
-	(free_object): call free_recurrence for each recurrence.
-	(remove_recurrence_cb): g_hash_table_foreach() callback to
-	remove recurrences from the calendar.
-	(remove_component): remove all recurrences.
-	(cal_backend_file_open): check write access on the file, and
-	set read_only flag appropriately.
-	(cal_backend_file_is_read_only): return the private flag.
-	(cal_backend_file_init): initialize read_only flag.
-	(cal_backend_file_get_object): deal with recurrences.
-
-	* gui/alarm-notify/notify-main.c (main): unref the alarm
-	notification service when terminating.
-	(client_die_cb): call bonobo_main_quit instead of gtk_main_quit.
-
-2003-10-23    <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): just
-	uses the views array and the current view type
-	(setup_widgets): ditto
-	(set_view): ditto
-	(backend_died_cb): ditto
-	(gnome_calendar_get_calendar_model): ditto
-	(gnome_calendar_update_config_settings): ditto
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c: accept also text/calendar for D&D.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fix typo
-	(e_day_view_on_main_canvas_drag_data_received): fix C99 issue, fix
-	typo
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): use the internal client list to
-	create the queries
-	(gnome_calendar_destroy): use the internal client list to
-	disconnect signal handlers
-	(gnome_calendar_add_event_uri): add the client to the internal
-	list
-	(gnome_calendar_remove_event_uri): remove the client from the
-	internal list and lookup the client
-	(gnome_calendar_update_config_settings): use the internal client
-	list to update the config settings
-
-2003-10-23  Harry Lu  <harry.lu@sun.com>
-
-	* cal-client/cal-client.c: (cal_client_get_timezone): remove and free
-	op before return.
-
-	* gui/e-cal-view.c (e_cal_view_add_event): modified from
-	selection_received_add_event() so that it call be called out of
-	e-cal-view.c.
-	(selection_received): modified to call e_cal_view_add_event().
-
-	* gui/e-cal-view.h: add declaration for e_cal_view_add_event().
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): Provide a
-	icalcomponent for both TARGET_CALENDAR_EVENT and TARGET_VCALENDAR.
-	(e_day_view_on_top_canvas_drag_data_received): If dragging between
-	different windows, make it works like a copy and paste.
-	(e_day_view_on_main_canvas_drag_data_received): ditto.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-util/cal-recur.c: update g_date calls to non-deprecated
-	calls
-
-	* cal-util/Makefile.am: turn off deprecated funcs
-
-	* cal-client/Makefile.am: turn off deprecated funcs
-
-	* cal-client/cal-client.c (cal_client_get_error_message): add OK
-	message
-
-	* pcs/cal-backend.[hc]: remove dead funcs
-
-	* pcs/query.c: tidy headers
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.c (query_notify_objects_removed_1): Fix c/p typo -
-	call removed instead of modify
-
-2003-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect also to ETableModel's
-	"model_cell_changed" signal.
-	(e_cal_view_set_model): likewise.
-	(model_cell_changed_cb): callback for "model_cell_changed".
-	(e_cal_view_destroy): use g_signal_handlers_disconnect_matched instead
-	of g_signal_handlers_disconnect_by_func, so that all handlers are
-	disconnected.
-
-2003-10-23  JP Rosevear <jpr@ximian.com>
- 
- 	* pcs/cal.c (cal_notify_object_modified): guard against irrelevant
- 	args (ie if there was an error) 
- 	(cal_notify_object_removed): ditto
- 	(cal_notify_timezone_added): ditto
- 
- 	* pcs/cal-backend-sync.c (_cal_backend_is_read_only): init value
- 	to something known
- 	(_cal_backend_get_cal_address): ditto
- 	(_cal_backend_get_alarm_email_address): ditto
- 	(_cal_backend_get_ldap_attribute): ditto
- 	(_cal_backend_get_static_capabilities): ditto
- 	(_cal_backend_modify_object): ditto
- 	(_cal_backend_remove_object): ditto
- 	(_cal_backend_get_object_list): ditto
- 
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* gui/e-cal-list-view.c (e_cal_list_view_new): create a model and
- 	pass it as an arg during creation
- 
- 	* gui/e-day-view.c (e_day_view_new): unref the model
- 
- 	* gui/e-week-view.c (e_week_view_new): ditto
-	
-2003-10-22  JP Rosevear <jpr@ximian.com>
- 
- 	* cal-client/cal-client.c (cal_client_get_object): only change to
- 	invalid object error code if we got the object but couldn't parse
- 	it, and only check for timezones if we had success
- 
- 	* gui/comp-util.c (cal_comp_is_on_server): don't throw a warning
- 	if the object simply does not exist
-	
-2003-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_remove_event_uri): new
-	function to remove calendars from the views.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_icon" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evoution:button_sort_order" attribute.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Make the
-	scrolled window have a GTK_SHADOW_IN shadow.
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Likewise.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Set the
-	scrollbar policy to "automatic" for both the horizontal and
-	vertical scrollbars around the source selector.
-
-2003-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Add an
-	"evolution:button_label" property on the component for use in the
-	shell.
-
-2003-10-21  Rodney Dawes  <dobey@ximian.com>
-
-	* cal-client/Makefile.am: Fix typo in libcal_client_la_SOURCES
-	
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): fixed
-	a leak caused by only freeing 'base_uri' in some cases.
-
-2003-10-21  JP Rosevear <jpr@ximian.com>
-
-	* gui/control-factory.c (get_prop): fix parse error
-	(set_prop): gnome_calendar_open was renamed
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): adapt to
-	the cal_client_new changes and the lack of a default calendar
-	routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	adapt to the cal_client_new changes and the lack of a default
-	calendar routine
-	(pre_sync): don't have to pass a type for the default object any
-	more
-
-	* cal-client/cal-client.c (cal_client_open_async): add FIXME
-	comment
-
-2003-10-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: store recurrences per object.
-	(free_object): free correctly the CalBackendFileObject's
-	contained in 'priv->comp_uid_hash'.
-	(lookup_component, check_dup_uid, add_component, remove_component,
-	match_object_sexp):
-	adapted to changes in comp_uid_hash.
-	
-2003-10-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_add_event_uri): renamed
-	from gnome_calendar_open.
-
-	* gui/calendar-component.c (load_uri_for_source): call
-	gnome_calendar_add_event_uri instead of setting the URI property on
-	the Bonobo control.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.c (process_calendar_dir): process subfolders.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/migration.[ch] (migrate_old_calendars): new function.
-
-	* gui/calendar-component.c (calendar_component_init): call
-	the above function to migrate from old setups.
-
-	* gui/Makefile.am: added new files.
-
-2003-10-17  Jeffrey Stedfast <fejj@ximian.com>
-	
-	* conduits/calendar/Makefile.am: Fixed for libical build changes.
-
-	* conduits/todo/Makefile.am: Same.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (on_print): call
-	e_cal_view_get_visible_time_range, not the gnome_calendar_
-	version.
-	(e_cal_view_new_appointment_for, e_cal_view_new_appointment,
-	e_cal_view_edit_appointment): new functions.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_new_appointment_for,
-	gnome_calendar_new_appointment, gnome_calendar_edit_object):
-	removed these functions, now available in e-cal-view.
-
-	* gui/calendar-commands.c:
-	* gui/e-day-view.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: replaced calls to gnome_calendar_* with
-	e_cal_view_* equivalents.
-
-2003-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch] (e_cal_view_get_default_category):
-	(e_cal_view_set_default_category): new functions.
-	(e_cal_view_destroy): free the default_category field.
-
-	* gui/e-day-view.[ch] (e_day_view_set_default_category):
-	removed obsolete function.
-	(e_day_view_init, e_day_view_destroy, e_day_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/e-week-view.[ch] (e_week_view_set_default_category):
-	removed obsolete function.
-	(e_week_view_init, e_week_view_destroy, e_week_view_do_key_press):
-	use the ECalView's default_category.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	also on the list view by using the priv->views array.
-	(search_bar_category_changed_cb, gnome_calendar_set_default_client):
-	use the priv->views array.
-	(gnome_calendar_get_calendar_model): return the model for the
-	current view widget.
-	(gnome_calendar_open): removed tasks opening code.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): if the user
-	presses Cancel, just terminate.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): create
-	directories for the newly-created calendars.
-
-	* gui/dialogs/new-calendar.c (create_new_source_with_group): use
-	e_mkdir_hier instead of mkdir.
-
-2003-10-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-component.c (calendar_component_init): if no groups
-	are present in the configuration, create the "On This Computer"
-	group and the "Personal" and "Work" calendars on it.
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): moved the
-	source creation...
-	(create_new_source_with_group): ...here, and made the code create
-	the directory for the new calendar.
-
-2003-10-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-select-names-editable.c (e_selct_names_editable_get_address):
-	EDestination -> EABDestination.
-
-	* gui/gnome-cal.c (setup_widgets): evolution_dir -> ".evolution".
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-select-names-editable.c (e_select_names_editable_get_address):
-	use EABDestination instead of EDestination.
-
-	* gui/gnome-cal.c (gnome_calendar_open): disabled tasks opening code.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c: adapted to new addressbook API.
-
-	* gui/e-meeting-store.c: adapted to new addressbook API.
-	(find_zone): fixed usage of icalcomponent where an icalproperty
-	is expected.
-	(refresh_busy_periods): fixed call to cal_client_get_free_busy().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	added missing variable.
-	
-2003-10-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/dialogs/meeting-page.c: #include <gal/e-table/e-table.h>
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-list-view.c (start_addressbook_server):
-	updated to new addressbook API.
-	(book_open_cb): removed unneeded function, since we load
-	the local addressbook synchronously.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/Makefile.am: added missing header directories.
-
-	* pcs/cal-factory.h: include <libical/ical.h>, not <ical.h>.
-
-	* gui/dialogs/meeting-page.c: added missing headers.
-	(meeting_page_construct): free 'backend_address' as returned
-	by cal_client_get_cal_address(). Removed code to create the
-	meeting model's ETable not removed with the merge.
-
-	* gui/e-meeting-list-view.c: updated addressbook headers.
-
-	* gui/gnome-cal.h: added missing ',' in the GnomeCalendarViewType
-	enum.
-	
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-	(update_query): removed this function.
-	(e_day_view_recalc_day_starts): call e_day_view_update_query,
-	not update_query.
-
-	* gui/e-week-view.c (e_week_view_update_query): dont set status
-	messages here, already set in e_cal_view_update_query.
-
-	* gui/gnome-cal.c (adjust_query_for_view): new function to adjust
-	the query for the visible time range on a given view.
-	(gnome_calendar_set_query): call adjust_query_for_view for each
-	one of the views.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_init): connect to signals on the
-	model we create here, so that we get notifications for changes.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the query
-	on all models.
-	(gnome_calendar_open): update the date navigator query.
-
-2003-10-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_timezone_requested): never send NULL
-	strings to ORBit.
-
-	* gui/e-cal-view.c (e_cal_view_create_popup_menu): removed
-	unneeded variables. Also, fixed a typo that was making the
-	menu options be disabled when they should be enabled.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_client_for_uri): new function.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_set_default_client): new function.
-
-	* gui/calendar-component.c (primary_source_selection_changed_callback):
-	set the default client on the calendar view to be the primary
-	selection on the source list.
-
-2003-10-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set a default group
-	on the calendar group option menu and create the source if all checks
-	are passed.
-
-2003-10-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.c (new_calendar_dialog): set up widgets
-	loaded from the Glade file.
-
-2003-10-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/Makefile.am (etspec_DATA): Add e-cal-list-view.etspec.
-	(libevolution_calendar_la_SOURCES): Add e-cal-list-view.[ch].
-
-	* gui/calendar-commands.c (show_list_view_clicked): Implement.
-	(calendar_get_text_for_folder_bar_label): Add case for list view.
-	Use month case and tweak it so it doesn't show "%d - %d" if the
-	time span contains only one day.
-	(verbs): Add list view.
-	(pixmaps): Add list view.
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_title):
-	Add list view case.
-	(calendar_view_factory_get_type_code): Add list view case.
-
-	* gui/control-factory.c (get_prop): Add list view case.
-
-	* gui/e-cal-model.c (get_classification): Fix to conform to updated
-	libical.
-	(ecm_set_value_at): Add missing break statements.
-	(ecm_get_color_for_component): Add braces for clarity.
-
-	* gui/gnome-cal.c (gnome_calendar_get_current_view_widget): Add
-	list view case.
-	(get_focus_location): Add list view case.
-	(connect_list_view_focus): Implement.
-	(setup_widgets): Set up list view.
-	(gnome_calendar_direction): Add list view case.
-	(set_view): Add list view case.
-	(gnome_calendar_setup_view_menus): Add list view factory.
-	(gnome_calendar_construct): Account for list view.
-	(gnome_calendar_update_config_settings): Account for list view.
-	(get_days_shown): Implement list view case.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Add list view.
-
-	* gui/e-cal-list-view.[ch]: Implement ECalListView, subclassing
-	ECalView.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/new-calendar.[ch]: added new widget, which implements
-	the dialog to create new calendars.
-
-	* gui/dialogs/new-calendar.glade: basic mockup of the dialog.
-
-	* gui/dialogs/Makefile.am: added new files.
-
-	* gui/calendar-commands.c (file_new_calendar_cb): open the new calendar
-	dialog to allow user to create a new cal.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (calendar_properties_init): pass the
-	BonoboControl to get_prop/set_prop.
-	(get_prop): obtain the GnomeCalendar from the control.
-	(set_prop): ditto, and when the URI property is changed,
-	sensitize the UI as approppriate.
-
-	* gui/calendar-commands.c (calendar_control_sensitize_calendar_commands):
-	made this function public.
-
-	* gui/calendar-commands.h: added new prototype.
-
-2003-10-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (file_new_calendar_cb,
-	file_new_appointment_cb, file_new_event_cb, file_new_meeting_cb,
-	file_new_task_cb): callbacks for "New..." verbs.
-	(sensitize_calendar_commands): sensitize new verbs, and made it
-	sensitize correctly based on the set of clients currently loaded.
-	(sensitize_taskpad_commands): likewise.
-
-2003-10-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-cal-model.c (get_classification): Adapt to libical API changes.
-	(ecm_set_value_at): Break after each case, so we don't set the passed value
-	in more than one field.
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_delete_selected_occurrence):
-	* cal-client/cal-client.c (cal_client_remove_object): added missing
-	argument when calling cal_client_remove_object_with_mod().
-
-2003-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added missing 'rid' argument to the
-	removeObject method.
-
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	* pcs/cal-backend.h:
-	* pcs/cal-backend.c (cal_backend_remove_object):
-	* pcs/cal-backend-sync.h:
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object,
-	_cal_backend_remove_object):
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object):
-	* pcs/cal.c (impl_cal_removeObject): adapted to changes in IDL.
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* cal-client/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
-
-	* gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes
-	made to libical build.
-
-	* gui/alarm-notify/config-data.h: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* gui/dialogs/comp-editor-util.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h>
-	instead of <ical.h>
-
-	* importers/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-	* pcs/Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-	* pcs/cal.c: #include <libical/ical.h> instead of <ical.h>
-
-2003-10-08  Harry Lu  <harry.lu@sun.com>
-
-	* gui/dialogs/alarm-options.glade: Make repeat-quantity and
-	repeat-value of alarm option dialog numeric only.
-
-	* gui/dialogs/task-details-page.glade: Make percent-complete of
-	task details dialog numeric only.
-
-2003-10-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(e_delegate_dialog_get_delegate): same.
-	(e_delegate_dialog_get_delegate_name): same.
-
-	* gui/dialogs/comp-editor-util.c: remove unnecessary #include of
-	e-destination.h.
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets):
-	EDestination => EABDestination, and e_destination =>
-	eab_destination.
-	(malarm_widgets_to_alarm): same.
-
-	* gui/e-meeting-model.c (book_open_cb): track change to error
-	return codes.
-	(start_addressbook_server): use
-	e_book_async_get_default_addressbook.
-	(contacts_cb): rename cursor_cb to this, as we no longer get
-	passed a cursur, and we don't need to check the email address
-	since the query is now "is" instead of "contains".
-	(refresh_busy_periods): use an "is" query, and use
-	e_book_async_get_contacts instead of getting a CardCursor.
-	(process_section): this takes an EABDestination** instead of a
-	SimpleCardList*, which is gone.
-	(select_names_ok_cb): get "destinations" instead of
-	"simple_card_list".
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): fixed
-	documentation comments.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): figure
-	out read-only menu items to disable based on the currently
-	selected object's CalClient.
-
-2003-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: set better error m,essages on the
-	E_CALENDAR_CHECK_STATUS macro.
-	(cal_client_get_error_message): new function.
-
-	* cal-client/cal-client.h: added new prototype.
-
-	* gui/dialogs/comp-editor.c (save_comp): use the GError argument
-	for the cal_client_create/_modify_object calls, and display the
-	error message coming from the backend.
-
-	* gui/comp-util.c (cal_comp_is_on_server): likewise.
-
-2003-10-07  Dan Winship  <danw@ximian.com>
-
-	* idl/evolution-calendar.idl (getDefaultObject): Remove the "type"
-	arg; the backend knows what type it is
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): Likewise
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object,
-	_cal_backend_get_default_object): Likewise
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	Likewise. (Use cal_backend_get_kind() instead.)
-
-	* cal-client/cal-client.c (cal_client_get_default_object):
-	Likewise
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults,
-	cal_comp_task_new_with_defaults): Update calls to
-	cal_client_get_default_object().
-
-	* pcs/cal-backend-sync.c (_cal_backend_get_static_capabilities):
-	Use the right cal notification
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	dont clone NULL icalcomponent's.
-
-2003-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_get_default_client): make sure we
-	always return a default client, if possible, since we rely on having
-	a default client in many places.
-
-	* gui/e-day-view.c (e_day_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-
-	* gui/e-week-view.c (e_week_view_do_key_press): dont create event if
-	e_cal_model_create_component_with_defaults returns NULL.
-	
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	make sure the component has always an UID.
-
-	* gui/e-day-view.c  (e_day_view_find_event_from_uid):
-	* gui/e-week-view.c (e_week_view_find_event_from_uid): check
-	pointers passed to strcmp().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): added missing call to
-	cal_client_open().
-
-	* cal-client/cal-client.c (cal_client_new): fixed documentation
-	comments.
-	(cal_client_open): emit CAL_OPENED signal with appropriate status codes.
-	(open_sync): dont emit CAL_OPENED signal, it's already emitted in
-	cal_client_open().
-
-2003-10-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-editor-factory.c (open_client):
-	* gui/gnome-cal.c (gnome_calendar_open, gnome_calendar_construct):
-	* gui/calendar-offline-handler.c (backend_go_offline, backend_go_online,
-	calendar_offline_handler_init): adapted to changes in cal_client and
-	manage GError's returned by cal_client_open.
-
-	* gui/e-itip-control.c: dont run anymore sub event loops.
-	(start_calendar_server): use synchronous interface for opening calendars.
-	(start_default_server): renamed it from *_async.
-	(start_calendar_server_cb): removed unneeded function.
-	(object_requested_cb): use sync interface.
-
-	* gui/e-tasks.c (e_tasks_construct): dont create the CalClient here.
-	(e_tasks_open): do it here, where we've got all the info needed.
-
-	* importers/icalendar-importer.c (update_single_object): killed warning.
-	(ical_importer_new, vcal_importer_new): don't create CalClient's here.
-	(load_file_fn): create them here.
-	(vcal_load_file_fn): and here.
-	(gnome_calendar_import_data_fn): fixed usage of cal_client_*.
-
-	* */*: integrated JP's changes for synchronous open's in cal_client
-	and one model per view instead of one model for all views.
-	
-2003-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_modify_object): return FALSE
-	if the icalcomponent is NULL.
-
-	* gui/e-day-view.c (e_day_view_finish_resize): commit sequence on
-	CalComponent after changing start/end dates.
-
-2003-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): expand recurrences here.
-
-2003-09-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): removed.
-	(match_object_sexp): dont expand recurrences here.
-
-2003-09-30  Mike Kestner <mkestner@ximian.com>
-
-	* cal-util/cal-util-marshal.list : new VOID:STRING,STRING,STRING
-	* gui/Makefile.am : build the new view/store/renderer/editable
-	* gui/e-select-names-renderer.* : new completion cell renderer
-	* gui/e-select-names-editable.* : new completion cell editable
-	* gui/e-meeting-model.* : killed. code reused in list-view/store
-	* gui/e-meeting-store.* : port of EMeetingModel to GtkTreeModel
-	* gui/e-meeting-list-view.* : GtkTreeView subclass for attendee lists
-	* gui/e-meeting-time-sel.c : Use the new store/view
-	* gui/e-meeting-time-sel-item.c : Use the new store/view
-	* gui/dialogs/Makefile.am : don't install the etspec anymore.
-	* gui/dialogs/event-editor.c : Use the new store/view.
-	* gui/dialogs/meeting-page.c : Use the new store/view.
-	* gui/dialogs/shedule-page.c : Use the new store/view.
-	* gui/dialogs/task-editor.c : Use the new store/view.
-
-2003-09-29  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to libical-evolution
-
-	* conduits/calendar/Makefile.am: ditto	
-	
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove cal_added
-	signal
-
-2003-09-26  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_get_backend): accessor
-	(cal_get_listener): ditto
-
-	* pcs/cal-factory.c (impl_CalFactory_getCal): update to new
-	routine name
-
-	* pcs/cal-backend.h: add protos
-	
-	* pcs/cal-backend.c (cal_backend_init): init client mutex
-	(cal_backend_finalize): destroy client mutex
-	(cal_destroy_cb): just remove the client
-	(listener_died_cb): remove the client, the listener died so it
-	can't really do anything
-	(last_client_gone): signal the last client gone
-	(cal_backend_add_client): add a client with locking and listen for
-	the death of the listener
-	(cal_backend_remove_client): remove client
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-sync.c (_cal_backend_create_object): only free the
-	returned UID if it's not NULL.
-
-	* pcs/cal.c (cal_notify_object_created): dont send NULL strings to
-	ORBit code.
-
-2003-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): free the icalcomponent
-	returned from cal_client_get_object, and return TRUE if we find
-	the component on the backend.
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): added missing case, so that
-	we also display recurrent meetings starting before the time range and
-	ending after the time range.
-
-	* cal-client/cal-listener.c (impl_notifyReadOnly): pass the
-	'read_only' argument to the signal callback correctly (a gboolean
-	not a 'gboolean *').
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): removed
-	the g_assert on 'oc->pending != NULL', since there are now cases
-	(local calendar) where we get to call this function (cal_opened_cb)
-	with no pending requests yet.
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapt to new
-	get_free_busy api
-
-	* conduits/calendar/calendar-conduit.c (post_sync): ditto
-	(pre_sync): ditto
-
-	* conduits/todo/todo-conduit.c (pre_sync): ditto
-	(post_sync): ditto
-
-	* gui/e-meeting-model.c (refresh_busy_periods): ditto
-
-	* gui/e-itip-control.c (send_freebusy): ditto
-
-	* gui/e-cal-view.c (on_publish): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (build_change_list): move here from
-	cal-client.c
-	(impl_notifyChanges): implement
-	(build_free_busy_list): util to create the GList of free busy
-	objects
-	(impl_notifyFreeBusy): implement
-	(cal_listener_class_init): set free busy and changes epv methods,
-	add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_get_changes_cb): get changes call
-	back
-	(cal_get_free_busy_cb): get free busy call back
-	(cal_client_init): listen for free busy and changes signals
-	(cal_client_get_changes): convert to new threaded sync api
-	(cal_client_get_free_busy): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c: remove dead type conversion function
-	(impl_Cal_getChanges): implement by just calling, no return stuff
-	(impl_Cal_getFreeBusy): ditto
-	(cal_notify_changes): do getChanges callback
-	(cal_notify_free_busy): do getFreeBusy callback
-
-	* pcs/cal-backend.h: update protos, vmethods
-	
-	* pcs/cal-backend.c (cal_backend_get_free_busy): call through
-	(cal_backend_get_changes): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_changes): call
-	through
-	(cal_backend_sync_get_free_busy): ditto
-	(_cal_backend_get_changes): backend implementation, notify
-	(_cal_backend_get_free_busy): ditto
-	(cal_backend_sync_class_init): set free busy and changes
-	implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): convert
-	to sync backend method
-	(cal_backend_file_compute_changes_foreach_key): remove from the
-	hash here
-	(cal_backend_file_compute_changes): no need to build the sequence
-	here
-	(cal_backend_file_get_changes): convert to sync backend method
-	(cal_backend_file_class_init): set sync backend methods for free
-	busy and changes
-
-	* idl/evolution-calendar.idl: convert getChanges and getFreeBusy
-	to new async api
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.h: remove dead result enums
-
-	* pcs/cal-backend.c: fix comments
-
-	* idl/evolution-calendar.idl: remove dead exceptions
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_default_object): send back the empty
-	string if the object is NULL
-	(cal_notify_object): ditto
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (edit_existing): convert to api
-	changes
-
-	* conduits/todo/todo-conduit.c (local_record_from_uid): ditto
-	(pre_sync): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_uid):
-	ditto
-	(pre_sync): ditto
-
-	* importers/icalendar-importer.c (update_single_object): ditto
-
-	* gui/dialogs/comp-editor.c (obj_updated_cb): ditto
-
-	* gui/e-itip-control.c (get_real_item): ditto
-	(find_server): ditto
-
-	* gui/comp-util.c (cal_comp_is_on_server): ditto
-	(cal_comp_event_new_with_defaults): ditto
-	(cal_comp_task_new_with_defaults): ditto
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyDefaultObjectRequested):
-	implement
-	(impl_notifyObjectRequested): ditto
-	(cal_listener_class_init): set above epv implementations, add signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_default_object_requested_cb): get
-	default object callback
-	(cal_object_requested_cb): get object callback
-	(cal_client_init): listen for get and get default object signals
-	(cal_client_get_default_object): convert to new sync api
-	(cal_client_get_object): ditto
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_getDefaultObject): just call the backend, it
-	does the notification now
-	(impl_Cal_getObject): ditto
-	(cal_notify_default_object): do getDefaultObject response
-	(cal_notify_object): do getObject response
-
-	* pcs/cal-backend.h: remove vmethods, protos
-
-	* pcs/cal-backend.c: remove a couple of dead functions
-	(cal_backend_class_init): get_object_component is no longer a
-	vmethod
-	(cal_backend_get_default_object): call through
-	(cal_backend_get_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_default_object):
-	call through
-	(cal_backend_sync_get_object): ditto
-	(_cal_backend_discard_alarm): pass correct params to
-	cal_notify_discard_alarm
-	(_cal_backend_get_default_object): call through and notify
-	(_cal_backend_get_object): ditto
-	(cal_backend_sync_class_init): set backend implementations
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	convert to sync backend method
-	(cal_backend_file_get_object): ditto
-	(cal_backend_file_compute_changes_foreach_key): just look up the
-	component rather than using the backend vmethod
-	(cal_backend_file_remove_object): return valid sync status codes
-	(cal_backend_file_class_init): move get_object, get_default_object
-	to sync class
-
-	* idl/evolution-calendar.idl: convert getObject and
-	getDefaultObject to new async idl
-
-2003-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_discardAlarm): just call the backend
-	function, it does the notification
-	(cal_notify_alarm_discarded): notify of discard alarm call
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_discard_alarm): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_discard_alarm): call
-	through
-	(_cal_backend_discard_alarm): call through and notify
-	(cal_backend_sync_class_init): set discard alarm implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_discard_alarm): match
-	sync backend vmethod
-	(cal_backend_file_class_init): set alarm vmethod implementation
-
-	* idl/evolution-calendar.idl: switch discardAlarm to new api
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): match new
-	api
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyAlarmDiscarded): implement
-	(cal_listener_class_init): add alarm, send, receive epv functions,
-	alarm signal
-
-	* cal-client/cal-client.h: update proto
-
-	* cal-client/cal-client.c (cal_alarm_discarded_cb): discardAlarm
-	callback
-	(cal_client_init): listen to discard alarm signal
-	(cal_client_discard_alarm): implement with new threaded sync api
-
-2003-09-25  JP Rosevear <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: remove unused user exceptions
-
-2003-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch] (cal_backend_util_fill_alarm_instances_seq):
-	removed unneeded function.
-
-2003-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/*/*.c: adjust to new timezone api calls
-
-	* gui/*.c: ditto
-
-	* gui/dialogs/*.c: ditto
-
-	* cal-client/cal-listener.h: add new signals
-
-	* cal-client/cal-listener.c (convert_status): convert invalid
-	object as well
-	(impl_notifyTimezoneRequested): implement
-	(impl_notifyDefaultTimezoneSet): ditto
-	(cal_listener_class_init): set epv implementations for timezone
-	functions
-	(cal_listener_class_init): create timezone response signals
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c: fix return values all over the place
-	(cal_get_timezone_cb): getTimezone response
-	(cal_query_cb): setDefaultTimezone response
-	(cal_client_init): listen for new response signals
-	(cal_client_get_timezone): implement using new thread sync api
-	(cal_client_ensure_timezone_on_server): use add timezone call
-	(cal_client_set_default_timezone): oimplement using new thread sync
-	api
-
-	* cal-client/cal-client-types.h: add invalid object status code
-
-	* idl/evolution-calendar.idl: getQuery no longer raises any user
-	exceptions, remove dead types and exceptions
-
-2003-09-24  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: new protos
-
-	* pcs/cal.c (impl_Cal_getTimezone): call backend implementation
-	(impl_Cal_addTimezone): ditto
-	(impl_Cal_setDefaultTimezone): ditto
-	(cal_class_init): set epv implementations of timezone functions
-	(cal_notify_timezone_requested): notify of get timezone response
-	(cal_notify_default_timezone_set): notify of default timezone
-	being set
-
-	* pcs/cal-backend.h: new vmethods, protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new timezone
-	vmethods
-	(cal_backend_get_timezone): call through
-	(cal_backend_set_default_timezone): ditto
-	(cal_backend_add_timezone): ditto
-	(cal_backend_internal_get_default_timezone): ditto
-	(cal_backend_internal_get_timezone): ditto
-
-	* pcs/cal-backend-sync.h: add vmethods, protos
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_timezone): call
-	through
-	(cal_backend_sync_set_default_timezone): ditto
-	(_cal_backend_set_default_timezone): call through and notify
-	(_cal_backend_get_timezone): ditto
-	(cal_backend_sync_class_init): set backend implementations for new
-	funcs
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): get
-	time_t values based on the zone
-
-	* pcs/cal-backend-file.c: reorg so we don't have to prototype
-	everything
-	(cal_backend_file_get_timezone): implement the sync backend way
-	(cal_backend_file_add_timezone): ditto
-	(cal_backend_file_set_default_timezone): ditto
-	(cal_backend_file_internal_get_default_timezone): internal method,
-	for sexp comparison
-	(cal_backend_file_internal_get_timezone): ditto
-
-	* idl/evolution-calendar.idl: convert timezone routines to async
-	api
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (func_occur_in_time_range): dont expand
-	recurrences, since they are supposed to be expanded in the backends.
-	(instance_occur_cb, resolve_tzid): removed unneeded functions.
-
-	* pcs/cal-backend-file.c (cal_backend_file_add_timezone): guard against
-	adding the timezone if it's already there.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_created): notify with the object,
-	not the uid
-
-	* gui/e-cal-model.c (add_new_client): don't listen for
-	non-existent signal
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove dead proto
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-	* gui/itip-utils.c (comp_server_send): use the new send_objects
-	routine
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove send result enum
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-client.h: remove enum, protos
-
-	* cal-client/cal-client.c: remove remove status enum typing
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (update_objects): new function
-	to manage the update of components, taking into account
-	VTIMEZONE components.
-	(process_item_fn, gnome_calendar_import_data_fn): use
-	update_objects instead of cal_client_update_objects.
-
-2003-09-23  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_addTimezone): just call add_timezone, it
-	does the notification
-	(cal_notify_object_created): only notify the query if the object
-	matches
-	(cal_notify_object_removed): ditto
-
-	* pcs/cal-backend.h: update proto, vmethod
-
-	* pcs/cal-backend.c (cal_backend_add_timezone): returns void
-
-	* pcs/cal-backend-sync.h: update proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): add the
-	object as an out param
-	(_cal_backend_remove_object): get the object and pass it in the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): kill
-	cal_backend_file_update_objects call, its more efficient to create
-	the comp ourselves; stamp the creation time, add the component to
-	the toplevel
-	(cal_backend_file_modify_object): kill the
-	cal_backend_file_update_objects call, add the component to the
-	toplevel
-	(cal_backend_file_remove_object): pass back the object when
-	removing
-
-2003-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_finalize): disconnect the
-	signal handlers
-
-	* cal-client/cal-client.c (cal_client_get_query): unref the
-	listener when done
-
-2003-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (selection_received): add VTIMEZONE components
-	contained in the clipboard data to the backend.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): modify and create instead
-	of update, simplify mod code
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): modify
-	the object instead of update, simplify the instance handling
-	(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
-
-2003-09-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): use
-	'has-alarms' function in the search expression.
-
-	* pcs/cal-backend-object-sexp.c (func_has_alarms): new SExp function.
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): we return if
-	there is no text and it *not* on the server
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): create the
-	object if its not on the server or modify it if it is
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.h: remove proto
-
-	* gui/gnome-cal.c: remove gnome_calendar_unrecur_selection
-
-	* gui/e-week-view.h: remove proto
-
-	* gui/e-week-view.c: remove e_week_view_unrecur_appointment
-
-	* gui/e-day-view.h: remove proto
-
-	* gui/e-day-view.c: remove e_day_view_unrecur_appointment
-
-	* gui/e-cal-view.c: remove on_unrecur_appointment (this is handled
-	better via recurrence id's now)
-
-2003-09-22  JP Rosevear <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status): ifdef out, leave
-	temporarily for reference, but otherwise it shouldn't be needed
-	(update_item): switch to using receive objects
-	(ok_clicked_cb): update item when receiving a reply
-
-	* gui/e-calendar-table.c (selection_received): switch to using
-	create object from update_objects
-
-	* gui/e-cal-view.c (selection_received_add_event): util routine to
-	prevent duplication
-	(selection_received): use above
-
-	* gui/e-cal-model.c (ecm_set_value_at): switch to using modify
-	object from update_objects
-	(ecm_append_row): switch to using create object from
-	update_objects
-
-	* gui/e-cal-model-calendar.c (ecmc_set_value_at): switch to using
-	modify object from update_objects
-
-	* gui/e-cal-model-tasks.c (ecmt_set_value_at): ditto
-
-2003-09-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libical_util_la_LIBADD):
-	libical.la -> libical-evolution.la
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libicalvcal.la -> libicalvcal-evolution.la
-
-	
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: removed getAlarmsInRange and
-	getAlarmsForObject methods.
-
-	* pcs/cal.c (impl_Cal_getAlarmsInRange, impl_Cal_getAlarmsForObject):
-	removed unneeded CORBA methods.
-	(cal_class_init): dont set removed methods in the epv.
-
-	* pcs/cal-backend.[ch]: removed get_alarms_in_range and
-	get_alarms_for_object virtual methods.
-	(cal_backend_get_alarms_in_range, cal_backend_get_alarms_for_object):
-	removed.
-	(cal_backend_class_init): dont set removed virtual methods.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_in_range,
-	cal_backend_file_get_alarms_for_object): removed.
-	(cal_backend_file_class_init): dont set removed virtual methods.
-
-2003-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): changed
-	to use queries.
-	(build_component_alarms_list): create the alarm list from a list
-	of iCalendar strings.
-	(build_alarm_instance_list): removed.
-	(cal_client_get_alarms_for_object): dont call the CORBA methods,
-	just get alarms by itself.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-listener.[ch]: added "add_timezone" signal.
-	(impl_notifyTimezoneAdded): implemented new CalListener method.
-	(cal_listener_class_init): create "add_timezone" signal for the class.
-
-	* cal-client/cal-client.[ch] (cal_client_add_timezone): new function.
-	(cal_client_init): connect to "add_timezone" signal on the
-	CalListener.
-	(cal_add_timezone_cb): callback for the "add_timezone" signal.
-
-2003-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added 'notifyTimezoneAdded' method
-	to the Calendar::Listener interface.
-
-	* pcs/cal-backend-sync.[ch] (cal_backend_sync_add_timezone):
-	(_cal_backend_add_timezone): new functions for the new virtual
-	method implementation.
-
-	* pcs/cal.[ch] (cal_notify_timezone_added): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): converted to
-	return a CalBackendSyncStatus.
-	(cal_backend_file_class_init): the 'add_timezone' method we implement
-	is the one in the CalBackendSync class.
-	(cancel_receive_object): added missing 'return'.
-	(free_cal_component): removed unused function.
-
-2003-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_add_timezone): added new
-	virtual method implementation.
-
-	* pcs/cal.c (impl_Cal_addTimezone): check return value from
-	cal_backend_add_timezone, and set an exception if an error is
-	returned.
-
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added addTimezone method.
-
-	* pcs/cal.c (impl_Cal_addTimezone): implemented new method.
-	(cal_class_init): set new method on the epv.
-
-	* pcs/cal-backend.[ch]: added 'add_timezone' virtual method.
-	(cal_backend_add_timezone): implemented new virtual method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_modify_object): it's
-	cal_component_get_as_string, not cal_component_as_string.
-
-	* cal-client/cal-client.c (cal_client_ensure_timezone_on_server):
-	dont use anymore updateObjects method, use addTimezone instead.
-	
-2003-09-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* conduits/todo/Makefile.am: removed libwombat reference.
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): return
-	the UID of the added object.
-	(cal_backend_file_remove_object): ditto for old_object.
-
-2003-09-15  JP Rosevear <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (replace_record): switch to modify
-	object
-	(add_record): switch to using create object
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): switch
-	to using create object
-	(add_record): switch to using create object
-	(replace_record): switch to modify object
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectsReceived):
-	implement listener method
-	(build_object_list): ditto
-	(cal_listener_class_init): create receive_objects and send_objects
-	signals
-
-	* cal-client/cal-client.h: add, update protos
-
-	* cal-client/cal-client.c (cal_objects_received_cb):
-	receive_objects callback
-	(cal_objects_sent_cb): send_objects callback
-	(cal_client_init): listen for above signals
-	(cal_client_create_object): pass back uid
-	(cal_client_receive_objects): implement
-	(cal_client_send_objects): ditto
-
-	* idl/evolution-calendar.idl: add receive/send objects methods and
-	yank updateObjects
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_receiveObjects): implement
-	(impl_Cal_sendObjects): ditto
-	(cal_class_init): add epv methods
-	(cal_notify_objects_received): notify of objects received call,
-	updating queries
-	(cal_notify_objects_sent): notify of objects sent
-
-	* pcs/cal-backend.h: remove proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove obj_updated
-	signal
-	(cal_backend_class_init): init vmethods properly
-	(cal_backend_receive_objects): call through
-	(cal_backend_send_objects): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects): call
-	through
-	(cal_backend_sync_send_objects): ditto
-	(_cal_backend_receive_objects): call backend method and notify
-	(_cal_backend_send_objects): ditto
-	(cal_backend_sync_class_init): override send/receive object
-	vmethods
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set
-	remove/send objects sync vmethods
-	(cal_backend_file_create_object): remove call to dead method
-	(cal_backend_file_remove_object): ditto
-	(cal_backend_file_modify_object): ditto
-	(cancel_received_object): cancel an object
-	(check_tzids): check we have all the tzid's for the object
-	(cal_backend_file_receive_objects): receive a bunch of objects via
-	itip
-	(cal_backend_file_send_objects): skeleton implementation
-
-2003-09-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidObject CallStatus.
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object): implemented.
-	(cal_backend_file_modify_object): implemented.
-
-2003-09-15  Harry Lu  <harry.lu@sun.com>
-
-	* gui/apps_evolution_calendar.schemas: change last_notification_time's
-	type from string to int.
-
-2003-09-12  Bolian Yin <bolian.yin@sun.com>
-
-	* e-week-view.c (e_week_view_focus): make jump button focusable
-	 (e_week_view_on_jump_button_event): key_press and focus event for jump button
-	 (e_week_view_jump_to_button_item): new function, jump to the day view.
-	 (e_week_view_is_jump_button_visible): new function.
-
-	
-2003-09-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (cal_notify_cal_address, cal_notify_alarm_email_address,
-	cal_notify_ldap_attribute, cal_notify_static_capability):
-	make sure we always notify listeners, regardless of whether the
-	string is empty or not.
-
-	* cal-client/cal-client.c (check_capability): guard against using
-	NULL strings with strstr.
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): listen for other query
-	signals
-
-	* cal-client/cal-listener.h: add signals
-
-	* cal-client/cal-listener.c (impl_notifyObjectCreated): implement
-	(impl_notifyObjectModified): implement
-	(cal_listener_class_init): assign epv implementations
-	(cal_listener_class_init): add create/modify object signals
-
-	* cal-client/cal-client.h: add protos
-
-	* cal-client/cal-client.c (cal_object_created_cb): object created
-	callback
-	(cal_object_modified_cb): object modified callback
-	(cal_client_init): listen for create/modify object signals from
-	the listener
-	(cal_client_create_object): call the create object method
-	(cal_client_modify_object): call the modify object method
-
-	* cal-client/client-test.c (cal_opened_cb): listen for all the
-	query signals, tidy
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.c (impl_Cal_createObject): implement
-	(impl_Cal_modifyObject): ditto
-	(cal_class_init): set epv methods for create/modify
-
-	* pcs/cal-backend.h: add protos, vmethod
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new vmethods
-	(cal_backend_create_object): call through
-	(cal_backend_modify_object): ditto
-
-	* pcs/cal-backend-sync.h: add protos, vmethods
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_create_object): call
-	through
-	(cal_backend_sync_modify_object): ditto
-	(_cal_backend_create_object): create object and notify
-	(_cal_backend_modify_object): modify object and notify
-
-	* pcs/cal-backend-file.c (cal_backend_file_create_object):
-	skeleton routine for creating objects
-	(cal_backend_file_modify_object): ditto for modifying
-
-	* idl/evolution-calendar.idl: add createObject and modifyObject
-	calls
-
-2003-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c (cal_notify_object_removed): its uid, not uids
-
-2003-09-12  JP Rosevear <jpr@ximian.com>
-
-	* pcs/query.h: add protos
-
-	* pcs/query.c (query_object_matches): use the sexp to check for a
-	match
-	(query_notify_objects_added_1): notify of one object added to
-	query
-	(query_notify_objects_modified_1): ditto for modification
-	(query_notify_objects_removed_1): ditto for removal
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (cal_notify_object_created): notify of object creation
-	(cal_notify_object_modified): notify of object modification
-	(cal_notify_object_removed): use the _1 routines
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): this returns a
-	boolean
-	(cal_backend_file_update_objects): don't signal removals here now
-
-	* idl/evolution-calendar.idl: add object created and modified
-	responses
-
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (cal_notify_object_removed): notify relevant queries
-	of removal
-
-	* pcs/cal-backend.c (cal_backend_get_queries): ref the list before
-	passing it back
-
-	* pcs/cal-backend-sync.c (_cal_backend_remove_object): pass uid to
-	notification
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp): don't unref the
-	component
-
-	* cal-client/client-test.c (cal_opened_cb): listen to objects
-	added signal
-	(objects_added_cb): print the object uid
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* pcs/cal-backend-object-sexp.c (cal_backend_object_sexp_text):
-	return the base text
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): fix c/p typo
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (update_query): start the query
-
-	* gui/e-cal-model.c (update_query_for_client): ditto
-
-	* cal-client/client-test.c (cal_opened_cb): ditto
-	
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* cal-client/cal-query.h: add proto
-
-	* cal-client/cal-query.c (cal_query_start): start the query
-
-2003-09-11  JP Rosevear <jpr@ximian.com>
-
-	* gui/dialogs/delete-error.c (delete_error_dialog): accept GError
-	and base error messages on that
-
-	* gui/dialogs/delete-error.h: update proto
-
-	* gui/e-tasks.c (e_tasks_delete_completed): pass extra param to
-	cal_client_remove_object
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): ditto
-	(delete_record): ditto
-	
-	* gui/gnome-cal.c (gnome_calendar_purge): ditto
-
-	* gui/dialogs/comp-editor.c (delete_comp): ditto
-	
-	* gui/e-cal-view.c (e_cal_view_cut_clipboard): pass the error to
-	delete_error_dialog
-	(delete_event): ditto
-	(e_cal_view_delete_selected_occurrence): ditto
-	
-	* gui/e-itip-control.c (remove_item): ditto
-
-	* gui/e-calendar-table.c (delete_selected_components): ditto
-
-	* cal-client/cal-listener.h: add signal
-
-	* cal-client/cal-listener.c (impl_notifyObjectRemoved): implement
-	(cal_listener_class_init): set object removed implementation and
-	create signal
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_object_removed_cb): object removal
-	callback
-	(cal_client_init): listen for object removal signal
-	(cal_client_remove_object_with_mod): make call synchronous
-	(cal_client_remove_object): pass new params
-
-	* pcs/cal.h: add proto
-
-	* pcs/cal.c (impl_Cal_removeObject): just call the backend
-	function
-	(cal_notify_object_removed): notify of removal
-
-	* pcs/cal-backend.h: remove and update protos, remove signal
-
-	* pcs/cal-backend.c (cal_backend_class_init): kill obj_removed
-	signal
-	(cal_backend_remove_object): there is no return value now
-
-	* pcs/cal-backend-sync.h: add vmethod, proto
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_remove_object): call
-	through
-	(_cal_backend_remove_object): remove the object and then do the
-	notification
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): remove
-	object is not part of the sync class
-	(cal_backend_file_update_objects): there is no more removed signal
-	(cal_backend_file_remove_object): return sync status codes
-
-	* idl/evolution-calendar.idl: make removeObject oneway and and a
-	notification method in the listener
-
-2003-09-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.[ch] (query_get_text): new function.
-	(query_get_object_sexp): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_start_query): implemented.
-
-2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-	* cal-util/cal-component.c (cal_component_get_classification)
-	(cal_component_set_classification)
-	(get_text_list)
-	(get_icaltimetype)
-	(get_datetime)
-	(get_period_list)
-	(get_recur_list)
-	(cal_component_get_transparency)
-	(cal_component_set_transparency): Adapt to new libical.
-
-	* cal-util/cal-util.c (cal_util_event_dates_match): Ditto.
-
-	* pcs/cal-backend-file.c (create_user_free_busy): Ditto.
-
-	* gui/e-cal-model-tasks.c (get_completed)
-	(get_due)
-	(get_due_status): Ditto.
-
-	* gui/e-cal-model.c (get_dtstart)
-	(set_classification): Ditto.
-
-	* gui/e-cal-model-calendar.c (get_dtend)
-	(get_transparency)
-	(set_transparency): Adapt to new libical and fix a comparison bug.
-
-	* importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
-	libical-evolution.la -> libical.la
-
-2003-09-11  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove
-	libcal-util-static.la
-
-	* cal-client/Makefile.am (noinst_LTLIBRARIES): Remove
-	libcal-client-static.la
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	use non-static libraries. The static ones were only needed for
-	libtool 1.3.
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise
-
-        * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
-        here. It's already in libcal-client.
-
-2003-09-11  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* conduits/todo/Makefile.am:
-	Statically link with wombat. Fix ETodo conduit.
-	(Mdk bug #5348)
-
-	
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: update proto
-
-	* pcs/cal.c (impl_Cal_getObjectList): just call the backend, it
-	will do the notification now
-	(cal_notify_object_list): the list is a list of strings
-
-	* pcs/cal-backend.h: update vmethod, proto
-
-	* pcs/cal-backend.c (cal_backend_get_object_list): call through
-
-	* pcs/cal-backend-sync.h: add proto, vmethod
-
-	* pcs/cal-backend-sync.c (cal_backend_sync_get_object_list): call
-	through
-	(_cal_backend_get_object_list): get the list of objects from the
-	sync backend and do the notification
-	(cal_backend_sync_class_init): set vmethod implementation
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): the get
-	object list call is now part of the sync backend
-	(cal_backend_file_get_object_list): return a status and put the
-	object list in the passed in param
-
-2003-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): unref the elist
-	(cal_backend_init): init the query elist
-
-2003-09-10  JP Rosevear <jpr@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_objects_added_cb): match new query
-	signals - just tag here
-	(dn_query_objects_modified_cb): always retag
-	(dn_query_objects_removed_cb): ditto
-	(update_query): connect to new signals
-	(gnome_calendar_destroy): we don't keep a list of expunging
-	queries
-	(gnome_calendar_purge): no need to do the
-	expunge async, just get the object list immediately
-
-	* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
-	expunge async, just get the object list immediately
-
-	* gui/e-cal-model.c (query_objects_added_cb): callback for objects
-	added to the query
-	(query_objects_modified_cb): ditto for modifications
-	(query_objects_removed_cb): ditto for removed
-	(query_progress_cb): progress of the query
-	(query_done_cb): query is done
-	(update_query_for_client): connect to the new signals
-
-	* cal-client/client-test.c (cal_opened_cb): run a query
-
-	* cal-client/cal-query.c: we are given the listener now - listen
-	for signals from the listener and emit signals matching the api
-	changes
-
-	* cal-client/query-listener.[hc]: rewrite to match new query
-	listener methods and emit signals rather than using function
-	callbacks
-
-	* cal-client/cal-marshal.list: add to marshallers
-
-	* cal-client/cal-listener.h: add query signal
-
-	* cal-client/cal-listener.c (impl_notifyQuery): implement
-	(cal_listener_class_init): set notifyQuery method
-	(cal_listener_class_init): add query signal
-
-	* cal-client/cal-client.h: update protos
-
-	* cal-client/cal-client.c (cal_query_cb): handle response to
-	getQuery
-	(cal_client_init): listen for query signal
-	(cal_client_get_query): get a query from the calendar
-
-	* pcs/query.h: update protos
-
-	* pcs/query.c: rewrite to implement the query start method and
-	provide notification calls
-
-	* pcs/cal.h: add proto
-
-	* pcs/cal.c (impl_Cal_getQuery): re-implement so the backend
-	doesn't create the query for us
-	(cal_notify_query): respond with the query
-
-	* pcs/cal-factory.c: re-order includes
-
-	* pcs/cal-common.h: add types
-
-	* pcs/cal-backend.h: update protos, vmethods
-
-	* pcs/cal-backend.c (cal_backend_class_init): init start_query
-	vmethod
-	(cal_backend_finalize): free mutex
-	(cal_backend_start_query): call through
-	(cal_backend_add_query): add a query to the list the backend is
-	running
-	(cal_backend_get_queries): get the query list
-
-	* pcs/cal-backend-object-sexp.h: add proto
-
-	* pcs/cal-backend-file.c (cal_backend_file_start_query): skeleton
-	for new backend implementation
-
-	* pcs/Makefile.am: don't build dead files
-
-	* idl/evolution-calendar.idl: make the getQuery call async, make
-	the query listener calls oneway and match the addressbook
-
-2003-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component):
-	added case for getting the individual recurrences if 'rid' is
-	not NULL,
-
-2003-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_object_sexp): expand recurrences
-	for recurrent objects.
-	(match_recurrence_sexp): add the recurrences that match the query
-	expression to the object list.
-
-2003-09-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: don't store all recurrences in the
-	private structure.
-	
-2003-09-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (process_component):
-	* gui/e-week-view.c (process_component): dont expand recurrences,
-	since they are now expanded by the backends.
-
-2003-09-02  JP Rosevear <jpr@ximian.com>
-
-	* gui/tasks-control.c (sensitize_commands): adapt to cal-client
-	threaded sync api changes
-
-	* gui/itip-utils.c (itip_organizer_is_user): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_purge): ditto
-
-	* gui/e-meeting-model.c (process_section): ditto
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): ditto
-
-	* gui/e-cal-view.c (e_cal_view_create_popup_menu): ditto
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): ditto
-	(sensitize_taskpad_commands): ditto
-
-	* gui/dialogs/task-editor.c (set_menu_sens): ditto
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): ditto
-
-	* gui/dialogs/event-editor.c (set_menu_sens): ditto
-
-	* gui/dialogs/alarm-page.c (add_clicked_cb): ditto
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): convert to
-	cal_client api changes
-
-	* conduits/todo/todo-conduit.c (pre_sync): ditto
-	
-	* cal-client/client-test.c (list_uids): match new error handling
-
-	* cal-client/cal-marshal.list: marshallers
-
-	* cal-client/cal-listener.[hc]: emit signals for corba listener
-	callbacks - start with is_read_only, get_static_capabilities,
-	get_cal_address, get_ldap_attribute, open, remove and object_list
-
-	* cal-client/cal-client.h: move the status enum away from here,
-	update protos to new thread sync api standard
-
-	* cal-client/cal-client.c: the listener emits signals instead of
-	using callback functions now and we return booleans + GError in
-	outs for results
-	(e_calendar_error_quark): for GError handling
-	(cal_read_only_cb): handle listener op callback
-	(cal_cal_address_cb): ditto
-	(cal_alarm_address_cb): ditto
-	(cal_ldap_attribute_cb): ditto
-	(cal_static_capabilities_cb): ditto
-	(cal_opened_cb): ditto
-	(cal_removed_cb): ditto
-	(cal_object_list_cb): ditto
-
-	* cal-client/cal-client-types.h: add GError stuff
-
-	* cal-client/Makefile.am: build glib marshal stuff
-
-	* pcs/query.c (backend_opened_cb): comment out some break
-	temporarily
-
-	* pcs/cal.h: add protos
-
-	* pcs/cal.c (impl_Cal_open): just call the backend method, it will
-	handle the notification
-	(impl_Cal_remove): ditto
-	(impl_Cal_isReadOnly): ditto
-	(impl_Cal_getCalAddress): ditto
-	(impl_Cal_getAlarmEmailAddress): ditto
-	(impl_Cal_getLdapAttribute): ditto
-	(impl_Cal_getStaticCapabilities): ditto
-	(impl_Cal_getObjectList): simplify
-	(cal_new): set poa to be threaded
-	(cal_notify_read_only): notification utils
-	(cal_notify_cal_address): ditto
-	(cal_notify_alarm_email_address): ditto
-	(cal_notify_ldap_attribute): ditto
-	(cal_notify_static_capabilities): ditto
-	(cal_notify_open): ditto
-	(cal_notify_remove): ditto
-	(cal_notify_object_list): ditto
-
-	* pcs/cal-factory.c (impl_CalFactory_getCal): dup the key and the
-	object
-	(cal_factory_new): set poa to be threaded
-
-	* pcs/cal-backend.h: update vmethods and protos
-
-	* pcs/cal-backend.c (cal_backend_get_cal_address): we no longer
-	return anything - the callee is responsible for notification
-	(cal_backend_get_alarm_email_address): ditto
-	(cal_backend_get_ldap_attribute): ditto
-	(cal_backend_get_static_capabilities): ditto
-	(cal_backend_open): ditto
-	(cal_backend_remove): ditto
-
-	* pcs/cal-backend-file.h: update inheritance
-
-	* pcs/cal-backend-file.c: inherit from CalBackendSync and make
-	is_read_only, get_static_capabilities, get_cal_address, get_ldap_attribute, open and
-	remove match
-
-	* pcs/Makefile.am: build new files
-
-2003-09-02 JP Rosevear  <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: make all listener callbacks one ways
-
-2003-09-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (match_recurrence_sexp, match_object_sexp):
-	new callbacks for g_hash_table_foreach in get_object_list.
-	(cal_backend_file_get_object_list): don't use the priv->comp list
-	to check the components, use the hash table, which contains all
-	the recurrences already expanded.
-	(add_component): only expand recurrences for recurrent components.
-
-2003-09-01  Andrew Wu <Yang.Wu@sun.com>
-
-	* gui/e-day-view.c:
-	(e_day_view_change_event_end_time_up):
-	(e_day_view_change_event_end_time_down): Use
-	"ctrl+shift+alt+Up/Down" to change the end time of the editing
-	event.
-
-2003-08-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (lookup_component): take into account the 'rid'
-	argument.
-	(get_rid_string): new function to convert the recurrence ID to string.
-	(add_recurrence_to_object): callback for cal_recur_generate_instances.
-	(add_component): expand recurrences and g_strdup the hash's key.
-	(free_cal_component): free also the hash's key.
-	
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb)
-	(display_notification): Use images that come with Evolution instead
-	of unreleased stock, for now.
-
-2003-08-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/alarm-notify/util.[ch]: Added alarm-notify utils.
-
-	* gui/alarm-notify/Makefile.am: Added alarm-notify utils.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (timet_to_str_with_zone):
-	Move to util.c.
-
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb)
-	(on_dialog_removed_cb)
-	(notify_dialog_cb)
-	(tray_icon_destroyed_cb)
-	(tray_icon_clicked_cb)
-	(tray_icon_blink_cb)
-	(display_notification): Add Rodrigo Moya's code for tray icon
-	notification of appointments, with some fixes and blink code by me.
-	Requires HEAD gnome-icon-theme for now.
-
-2003-08-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #29032.
-
-	* gui/dialogs/task-details-page.c (status_changed): When task status
-	is set to "In Progress", set percent complete to 50% only if it was
-	previously set to 0% or 100%.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/Makefile.am use libevolution-calendar-a11y instead of libevolution-a11y.
-
-2003-08-26  Jack Jia  <jack.jia@sun.com>
-
-	** Fixes #47863.
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_removeCalendar): set
-	the initial value of lc_ptr and orig_str_ptr to NULL to avoid crash.
-
-
-2003-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: QueryListener::notifyObjUpdated now gets
-	a sequence of CalObj's.
-
-	* pcs/query.c (add_component): send the whole object to the listener,
-	not just the UID. Improved the way the listeners are notified, by allocating
-	a CORBA sequence to be used for all listeners, not one for each.
-	(match_component): pass the CalComponent to add_component, not only the UID.
-	(start_cached_query_cb): send the whole object to the listener.
-
-	* cal-client/cal-query.[ch]: changed argument names for "obj_updated"
-	signal.
-	(obj_updated_cb): pass the calobj's, not uid's.
-
-	* gui/e-tasks.c (query_obj_updated_cb):
-	* gui/gnome-cal.c (dn_query_obj_updated_cb, purging_obj_updated_cb):
-	* gui/e-cal-model.c (query_obj_updated_cb): we now get the object's
-	string representation instead of the UID.
-
-2003-08-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): added a 'rid' argument
-	to match the IDL method.
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_uid):
-	* conduits/todo/todo-conduit.c (local_record_from_uid):
-	* gui/comp-editor-factory.c (edit_existing):
-	* gui/comp-util.c (cal_comp_is_on_server):
-	* gui/e-cal-model.c (query_obj_updated_cb):
-	* gui/e-itip-control.c (find_server, get_real_item, update_attendee_status):
-	* gui/gnome-cal.c (dn_query_obj_updated_cb, purging_obj_updated_cb):
-	* gui/dialogs/comp-editor.c (obj_updated_cb): adapted to changes in
-	cal_client_get_object().
-
-2003-08-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.c (object_updated_cb):
-	* pcs/cal-backend.c (cal_backend_get_type_by_uid): use 'rid' parameter
-	where appropriate.
-
-	* pcs/cal-backend-file.c (check_dup_uid): removed unused variables.
-	(cal_backend_file_compute_changes_foreach_key): pass a NULL 'rid'
-	to cal_backend_get_object().
-	(lookup_component): get a 'rid' argument also.
-	(cal_backend_file_cancel_object, cal_backend_file_remove_object):
-	pass correct number of parameters to lookup_component().
-
-2003-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: use UID/RID pairs to identify objects.
-
-	* pcs/cal.c (impl_Cal_getObject): added 'rid' parameter.
-
-	* pcs/cal-backend.c (cal_backend_get_object): added 'rid' parameter.
-	(cal_backend_get_object_component): ditto.
-	(get_object): ditto.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component):
-	added 'rid' parameter.
-	(lookup_component): added 'rid' parameter and made it search for the
-	recurrence when that parameter is not NULL.
-	(cal_backend_file_get_alarms_for_object, cal_backend_file_update_object):
-	adapted to changes in lookup_component().
-	
-2003-08-22  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* gui/alarm-notify/notify-main.c: (main):
-	Ensure we get UTF-8 strings from gettext.
-
-2003-08-22 Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #47779
-
-	* gnome-cal.c (gnome_calendar_get_visible_time_range): fix the return value bug.
-
-2003-08-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch] (cal_client_send_object): use a 'char **'
-	for the 'error_msg' argument, instead of a fixed size string.
-
-	* gui/itip-utils.c (comp_server_send): pass the correct parameter to
-	cal_client_send_object.
-
-2002-08-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-itip-control.c (start_defalt_server): Rename to
-	start_default_server_async () and don't run a nested main loop. Let
-	the caller deal with the client object and signals.
-	(default_server_started_cb): Implement. Async signal handler for
-	'cal_opened' signal, does the embedding.
-	(object_requested_cb): Rewritten to work asynchronously, and finish
-	the embedding when default_server_started_cb() is called.
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (setup_popup_icons): new function to set icons
-	on the popup menu items.
-	(e_calendar_table_show_popup_menu): call setup_popup_icons.
-
-	* gui/e-cal-view.c (setup_popup_icons): set more icons for the
-	popup menu.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-
-	* gui/Makefile.am : Add a11y dependency.
-	* gui/calendar-commands.c (calendar_get_text_for_folder_bar_label)
-	* gui/e-cal-view.c: Add two new events: "event_changed" and "event_added" 
-	* gui/e-day-view.c (e_day_view_class_init): init a11y.
-	  (e_day_view_find_event_from_item): make it public from private
-	  (e_day_view_update_event_cb): emit "event_changed" signal
-	  (e_day_view_reshape_day_event): emit "event_added" signal
-	  (e_day_view_reshape_long_event): emit "event_added" signal
-	* gui/e-week-view.c (e_week_view_class_init): init a11y.
-	  (e_week_view_find_event_from_item): make it public from private
-	  (e_week_view_update_event_cb): emit "event_changed" signal
-	  (e_week_view_reshape_event_span): emit "event_added" signal
-	* gui/gnome-cal.c (gnome_calendar_class_init): init a11y.
-	  (gnome_calendar_get_e_calendar_widget),
-	  (gnome_calendar_get_search_bar_widget),
-          (gnome_calendar_get_view_notebook_widget): new functions
-
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.c (foreach_uid_cb): use the icalcomponent
-	to call icalcomponent_get_uid, not the string.
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c: store objects by UID and RID.
-	(free_object): new function to free the CalBackendFileObject structure.
-	(cal_backend_file_dispose): use free_object callback to remove the
-	objects in the comp_uid_hash.
-	(lookup_component): search correctly the component in the new hash
-	table organizarion.
-	(check_dup_uid): ditto.
-	(add_component): ditto.
-	(remove_component): ditto.
-
-2003-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): set up models here
-	(gnome_calendar_construct): not here
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): we have a list of calcomponents
-	rather than uids now
-	(process_multi_day): build a list of components rather than uids
-	(pre_sync): use get_object_list instead of getting uids
-	(for_each): create local records from calcomponents
-
-	* conduits/todo/todo-conduit.c: as above
-	
-	* gui/print.c (instance_cb): mark as true if we found an instance
-	(print_month_small): see if atleast one instance exists in a
-	slight different way
-
-	* cal-client/client-test.c (list_uids): use get_object_list
-
-	* cal-client/cal-listener.h: update protos
-
-	* cal-client/cal-listener.c (cal_listener_class_init): set object
-	list callback implementation
-	(impl_notifyObjectListRequested): implement
-	(cal_listener_construct): take object list callback function
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add status
-
-	* cal-client/cal-client.c (e_calendar_new_op): create new op
-	(e_calendar_get_op): retrieve current op
-	(e_calendar_free_op): free the op
-	(e_calendar_remove_op): clear current op
-	(cal_client_init): create new mutex
-	(cal_client_finalize): destroy mutex
-	(build_object_list): build list of icalcomponents
-	(cal_object_list_cb): handle getObjectList response
-	(real_open_calendar): pass extra listener arg
-	(cal_client_get_object_list): implement using thread safe mutex
-	locking
-	(cal_client_get_object_list_as_comp): return calcomponents instead
-	of icalcomponents
-	(cal_client_generate_instances): just get the object list - no
-	need to make it atomic since get_object_list is already atomic
-
-	* pcs/query.c (query_finalize): free new sexp class
-	(parse_sexp): use new sexp class
-	(match_component): ditto
-
-	* pcs/query-backend.c (foreach_uid_cb): use icalcomponent to
-	extract uid
-	(query_backend_new): get all objects using object list call
-
-	* pcs/cal.c (impl_Cal_getObjectList): implement
-	(cal_class_init): adjust for idl method changes
-
-	* pcs/cal-backend.h: update vmethods, add proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove get_uids and
-	get_objects_in_range vmethods, add get_object_list vmethod
-	(cal_backend_get_object_list): call through to vmethod implementation
-
-	* pcs/cal-backend-object-sexp.[hc]: nice class to represent a sexp
-	and search cal components
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): remove
-	get_uids and get_objects_in_range calls and set get_object_list
-	call
-	(cal_backend_file_get_object_list): implement
-	(create_user_free_busy): use sexp ops to implement
-	(cal_backend_file_compute_changes): just iterate over the
-	component list rather than fetching uids
-	
-	* pcs/Makefile.am: build new files
-
-	* idl/evolution-calendar.idl: make opening a oneway call, add
-	getObjectList call, remove getUIDS and getObjectsInRange call -
-	both can be done with getObjectList; make listener callbacks
-	oneway
-
-2003-08-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_purge): don't leak the client list.
-	(gnome_calendar_destroy): disconnect from all callbacks on all
-	loaded clients.
-	
-2003-08-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): use
-	"black" for normal tasks, since the light colors from the palette
-	are too light.
-
-	* gui/gnome-cal.c (gnome_calendar_purge): don't leak the client list.
-	(gnome_calendar_destroy): disconnect from all callbacks on all
-	loaded clients.
-
-2003-08-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c: fixed the problem with a new event being
-	created for each keystroke.
-	(e_day_view_add_event): don't create a new default component, use
-	the one we get as parameter.
-	(e_day_view_do_key_press): get the UID from the icalcomponent.
-
-	* gui/e-week-view.c (e_week_view_add_event, e_week_view_do_key_press):
-	same as e-day-view.c
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-component.c (impl_createControls): Oops, pass
-	[NULL, NULL] to gtk_scrolled_window_new().
-
-2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/main.c (factory): Ref the object from
-	calendar_component_peek() before returning it.
-
-2003-08-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/control-factory.h: #include <bonobo/bonobo-control.h>.
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Link to
-	libeutil.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
-	Don't use the global_shell_client.
-
-	* gui/main.c (factory): Call calendar_component_peek() for the
-	GNOME_Evolution_Calendar_Component OAFIID.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Set up the
-	GNOME_Evolution_Calendar_Component server and rename
-	GNOME_Evolution_Calendar_Factory to
-	GNOME_Evolution_Calendar_Factory_2.
-	* gui/main.c: Updated IDs accordingly.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Use calendar_component_peek_config_directory() instead of
-	evolution_dir.
-	* gui/gnome-cal.c (setup_widgets): Likewise.
-	(gnome_calendar_destroy): Likewise.
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_open): #if 0 some code for
-	figuring out where the task list is.
-
-	* gui/calendar-component.c: New file.
-	* gui/calendar-component.h: New file.
-
-	* gui/itip-utils.c (itip_addresses_get): Unref the GConf client
-	from gconf_client_get_default.
-
-2003-08-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (ecm_get_color_for_component): use tigert's
-	new color palette.
-	(cal_removed_cb): when a client is removed, remove it from the model.
-	(backend_died_cb): remove it also when the backend dies.
-	(add_new_client): connect to new signals for CalClient's.
-
-2003-08-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_finalize): don't unref the
-	'accounts' field, since it is internal to itip-utils.c.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar):
-	initialize all fields of the LoadedClient struct before calling
-	cal_client_open_calendar(), since the "cal_opened_cb" signal is
-	now emitted within it.
-
-2003-08-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_free_component_data): new
-	function.
-
-	* gui/e-cal-view.h: added 'allocated_comp_data' field to the
-	ECalViewEvent structure.
-
-	* gui/e-day-view.c (e_day_view_add_event): allocate the event's
-	ECalModelComponent if it hasn't been set.
-	(e_day_view_update_event_cb, e_day_view_remove_event_cb,
-	e_day_view_free_event_array): if the ECalModelComponent has
-	been allocated by the view, free it here.
-
-	* gui/e-week-event.c (e_week_view_add_event,
-	e_week_view_update_event_cb, e_week_view_remove_event_cb,
-	e_week_view_free_events): same as EDayView.
-
-2003-08-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (e_cal_model_create_component_with_defaults):
-	use the default client to call cal_comp_*_new_with_defaults, and
-	if no client is available, just create an empty icalcomponent.
-
-	* gui/e-cal-view.c (e_cal_view_init): create an empty model.
-
-	* gui/e-week-view.c (e_week_view_add_event): use the event's client.
-
-2003-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): unref the client if there
-	is an error.
-	(update_query): set status bar messages for progress.
-	(update_query_timeout): re-enabled.
-	(client_cal_opened_cb): install timeout handler for the query updates.
-
-	* gui/e-cal-view.c (e_cal_view_set_model): connect to all appropriate
-	signals on the model, to be called for every change.
-	(model_row_changed_cb, model_rows_changed_cb): new model callbacks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): colorize
-	the background for multiple days events.
-
-2003-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (ecm_append_row, ecm_get_color_for_component):
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): merged
-	missing bith from calendar-views-with-model branch.
-
-2003-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (real_open_calendar): set the priv->cal
-	pointer in a slightly different spot so we have it in the call
-	back
-
-	* gui/e-cal-model.c (e_cal_model_get_client_list): merge this in
-	properly
-
-2003-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (ecm_get_color_for_component): assign the colors
-	based on the URI, which is stored in a common place for all models.
-	Thus different views will use the same color for the same calendar.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): draw
-	a filled rectangle and a black border around it for one-day events.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	fill the rectangle for the item with its associated color.
-
-2003-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): unref the client if there
-	is an error.
-	(update_query): set status bar messages for progress.
-	(update_query_timeout): re-enabled.
-	(client_cal_opened_cb): install timeout handler for the query updates.
-
-	* gui/e-cal-view.c (e_cal_view_set_model): connect to all appropriate
-	signals on the model, to be called for every change.
-	(model_row_changed_cb, model_rows_changed_cb): new model callbacks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): colorize
-	the background for multiple days events.
-	
-2003-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/client-test.c (create_client): there is no more
-	object updated signal
-
-	* cal-client/cal-listener.c: clean up comment
-
-	* cal-client/cal-client.c (cal_client_class_init): remove
-	obj_updated and obj_removed signals
-
-	* cal-client/cal-client.h: ditto
-	
-2003-08-12  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.h: remove get_uri vmethod
-
-	* pcs/cal-backend.c (cal_backend_class_init): remove get_uri
-	vmethod init
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): no longer
-	a get uri vmethod
-	(cal_backend_file_get_uri): remove implementation of above
-
-2003-08-12  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/client-test.c (main): use tmp uris
-
-	* cal-client/cal-listener.h: update protos
-
-	* cal-client/cal-listener.c (cal_listener_init): init removed
-	function
-	(cal_listener_finalize): clear removed function
-	(impl_notifyCalOpened): take file status
-	(impl_notifyCalRemoved): implement
-	(cal_listener_construct): take remove function arg
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add remove status
-
-	* cal-client/cal-client.c
-	(cal_client_remove_status_enum_get_type): add remove status type
-	(cal_client_class_init): add removed signal
-	(cal_opened_cb): can no longer get unsupported exception here
-	(cal_removed_cb): emit removed status
-	(real_open_calendar): pass removed callback function to listener
-	(get_fall_back_uri): no longer append tasks.ics or calendar.ics
-	(cal_client_remove_calendar): new c wrapper for corba function -
-	calendar must be open currently
-
-	* pcs/query.c (backend_opened_cb): only disconnect the open
-	callback
-	(backend_removed_cb): handle calendar removal
-	(query_construct): listen for remove signal as well
-
-	* pcs/cal.h: cal no longer takes uri during construction
-
-	* pcs/cal.c (backend_to_listener_status): convert backend to corba
-	status code
-	(impl_Cal_open): backend open no longer takes uri, use above to
-	send back status
-	(impl_Cal_remove): implement
-	(cal_construct): we no longer track the uri
-	(cal_finalize): ditto
-	(cal_class_init): set remove epv method
-
-	* pcs/cal-factory.c (impl_CalFactory_getCal): instantiate backend
-	with uri and kind properties
-
-	* pcs/cal-backend.h: list file status enum, add protos
-
-	* pcs/cal-backend.c (cal_backend_set_property): implement object
-	properties
-	(cal_backend_get_property): ditto
-	(cal_backend_class_init): add properties vmethods and uri, kind
-	properties, removed signal
-	(cal_backend_get_uri): don't get the uri from the backend
-	(cal_backend_get_kind): get the kind from the backend
-	(cal_backend_open): adapt to new open call, no uri passed in
-	(cal_backend_remove): call through to remove implementation
-	(cal_backend_opened): use new file status
-	(cal_backend_removed): emit removed signal
-
-	* pcs/cal-backend-file.h: update protos
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override
-	remove vmethod
-	(cal_backend_file_init): default file name to calendar.ics
-	(cal_backend_file_set_file_name): accessor for filename tacked on
-	to uri
-	(cal_backend_file_get_file_name): ditto
-	(open_cal): return "file" type status codes
-	(create_cal): ditto
-	(get_uri_string): construct the full uri string
-	(cal_backend_file_open): use above
-	(cal_backend_file_remove): implement
-
-	* pcs/cal-backend-file-todos.c (cal_backend_file_todos_init): set
-	the file name to tasks.ics
-
-	* pcs/cal-backend-file-events.c (cal_backend_file_events_init):
-	set the file name to calendar.ics
-
-	* cal-util/cal-util.c (cal_util_expand_uri): just return a copy of
-	the uri now
-
-	* idl/evolution-calendar.idl: convert OpenStatus to FileStatus so
-	remove() can use it as well
-
-	* gui/gnome-cal.c (gnome_calendar_open): just open the default
-	folder in all cases
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_component_has_alarms): new function.
-
-	* gui/gnome-cal.[ch]:
-	* gui/goto.c:
-	* gui/itip-bonobo-control.c:
-	* gui/print.c:
-	* gui/e-week-view.[ch]:
-	* gui/e-day-view.[ch]: lots of fixes to make all compile with no
-	warnings.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_component_has_organizer):
-	new function.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: adaptated to changes in ECalViewEvent.
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_client_list): new function.
-	(ecm_append_row): fixed usage of icalcomponent variable.
-
-	* gui/e-cal-view.c (e_cal_view_class_init): removed unused variable.
-	(selection_received): use default client for pasting from clipboard.
-	(e_cal_view_cut_clipboard): cut the appointment from its client.
-	(e_cal_view_copy_clipboard, delete_event, on_save_as, om_print_event,
-	e_cal_view_delete_selected_occurrence, on_meeting, on_forward,
-	e_cal_view_create_popup_menu): adapted to changes in ECalViewEvent.
-	(e_cal_view_delete_selected_event, e_cal_view_delete_selected_events):
-	pass the ECalViewEvent to delete_event, so that it knows which
-	CalClient to use.
-	(on_edit_appointment): pass CalClient and icalcomponent to
-	gnome_calendar_edit_object.
-	(on_publish): publish F/B info for all the clients currently loaded
-	in the view.
-	(setup_popup_icons): added missing argument to gtk_image_new_from_stock.
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish F/B info
-	for all the clients currently loaded in the view.
-	(sensitize_calendar_commands): use icalcomponent functions.
-
-	* gui/e-day-view.c:
-	* gui/comp-editor-factory.c (impl_editExisting):
-	* gui/calendar-offline-handler.c (backend_cal_opened_online):
-	* gui/e-alarm-list.c (e_alarm_list_finalize):
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
-	* gui/e-date-time-list.c (e_date_time_list_finalize):
-	* gui/control-factory.c (get_prop): fixed warnings.
-	
-2003-08-12  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-offline-handler.c (impl_dispose): Chain. Prevent
-	double unrefs.
-	(impl_finalize): Chain.
-
-	* gui/e-alarm-list.c (finalize): Chain.
-
-	* gui/e-comp-editor-registry.c (destroy): Chain. Prevent double frees.
-	(editor_destroy_cb): Don't crash if we get the destroy signal twice.
-
-	* gui/e-date-time-list.c (e_date_time_list_finalize): Chain.
-
-	* gui/e-meeting-attendee.c (finalize): Chain.
-
-	* gui/e-meeting-model.c (finalize): Chain.
-
-2003-08-12 Andrew Wu <Yang.Wu@sun.com>
-
-       * gui/e-day-view.c
-       (e_day_view_change_duration_to_start_of_work_day):
-       In DayView, Shift+Home, Change the duration to the time
-       that begins the current work day.
-       (e_day_view_change_duration_to_end_of_work_day):
-       In DayView, Shift+End, Change the duration to the time
-       that ends the current work day
-
-2003-08-12  Hans Petter Jansson <hpj@ximian.com>
-
-	* gui/e-itip-control.c (html_destroyed):
-	(init):
-	(write_html): Add destroy chaining.
-
-2003-08-12  Andrew Wu <Yang.Wu@sun.com>
-
-       * gui/e-week-view.c
-       (e_week_view_on_key_up):
-       (e_week_view_on_key_down):
-       (e_week_view_on_key_left):
-       (e_week_view_on_key_right):
-       In the WeekView, Navigation through days with arrow keys.
-
-2003-08-12  Harry Lu <harry.lu@sun.com>
-
-	** fixes #47464.
-
-	* gui/dialogs/meeting-page.c: (get_widgets): The Organizer's value
-	need not match one of the values in the list.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_update_query):
-	* gui/e-week-view.c (e_week_view_update_query): remove the status bar
-	messages when the operation is finished.
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	draw a rectangle filled with the color associated with the event's
-	calendar.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_component_has_alarms): new function.
-
-	* gui/gnome-cal.[ch]:
-	* gui/goto.c:
-	* gui/itip-bonobo-control.c:
-	* gui/print.c:
-	* gui/e-week-view.[ch]:
-	* gui/e-day-view.[ch]: lots of fixes to make all compile with no
-	warnings.
-
-2003-08-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_component_has_organizer):
-	new function.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-week-view-event-item.c:
-	* gui/e-week-view.c: adaptated to changes in ECalViewEvent.
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_client_list): new function.
-	(ecm_append_row): fixed usage of icalcomponent variable.
-
-	* gui/e-cal-view.c (e_cal_view_class_init): removed unused variable.
-	(selection_received): use default client for pasting from clipboard.
-	(e_cal_view_cut_clipboard): cut the appointment from its client.
-	(e_cal_view_copy_clipboard, delete_event, on_save_as, om_print_event,
-	e_cal_view_delete_selected_occurrence, on_meeting, on_forward,
-	e_cal_view_create_popup_menu): adapted to changes in ECalViewEvent.
-	(e_cal_view_delete_selected_event, e_cal_view_delete_selected_events):
-	pass the ECalViewEvent to delete_event, so that it knows which
-	CalClient to use.
-	(on_edit_appointment): pass CalClient and icalcomponent to
-	gnome_calendar_edit_object.
-	(on_publish): publish F/B info for all the clients currently loaded
-	in the view.
-	(setup_popup_icons): added missing argument to gtk_image_new_from_stock.
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish F/B info
-	for all the clients currently loaded in the view.
-	(sensitize_calendar_commands): use icalcomponent functions.
-
-	* gui/e-day-view.c:
-	* gui/comp-editor-factory.c (impl_editExisting):
-	* gui/calendar-offline-handler.c (backend_cal_opened_online):
-	* gui/e-alarm-list.c (e_alarm_list_finalize):
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
-	* gui/e-date-time-list.c (e_date_time_list_finalize):
-	* gui/control-factory.c (get_prop): fixed warnings.
-
-2003-08-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_component_is_instance,
-	cal_util_component_has_recurrences, cal_util_component_has_rdates,
-	cal_util_component_has_rrules, cal_util_event_dates_match):
-	new functions needed for the CalComponent->icalcomponent
-	transition.
-
-	* gui/e-day-view.[ch]:
-	* gui/e-week-view.[ch]: more adaptation to changes in ECalViewEvent.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): use icalcomponent's
-	instead of CalComponent's.
-
-2003-08-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c: more adaptation to changes in ECalViewEvent.
-	(e_day_view_update_event_cb): use an ECalModelComponent, not a
-	CalComponent.
-	(process_component): pass an ECalModelComponent to
-	e_day_view_update_event_cb().
-	
-	* gui/e-week-view.c: more adaptation to changes in ECalViewEvent.
-	(e_week_view_update_event_cb, e_week_view_reshape_event_span):
-	set the	background color on the event's summary text.
-
-2003-08-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view.c (e_day_view_update_query): no more query
-	management here.
-	(query_obj_updated_cb, query_obj_removed_cb, query_query_done_cb,
-	query_eval_error_cb): removed query signals' callbacks.
-	(adjust_query_sexp): removed.
-	(process_component): new function to draw all components from
-	the model.
-
-	* gui/e-day-view.c: adapted to changes in ECalViewEvent structure.
-	(e_day_view_update_query): no more query management here.
-	(query_obj_updated_cb, query_obj_removed_cb, query_query_done_cb,
-	query_eval_error_cb): removed query signals' callbacks.
-	(adjust_query_sexp): removed.
-	(process_component): new function to draw all components from
-	the model.
-
-2003-08-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (e_cal_view_destroy): disconnect from signals
-	on the model.
-	(e_cal_view_set_model): disconnect from signals on the old model
-	and connect on the new one.
-	(model_changed_cb): tell the views to redraw when the model changes.
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb, gnome_calendar_destroy,
-	client_categories_changed_cb): removed the 'client' field from the
-	private structure, so don't use it anymore
-	(client_cal_opened_cb): if successful, add the CalClient to the
-	views' model.
-	(gnome_calendar_construct): don't add the client to the task model,
-	add it in client_cal_opened_cb().
-	(gnome_calendar_get_cal_client): removed.
-	(gnome_calendar_get_calendar_model): new function.
-	(gnome_calendar_open): create the CalClient here, to be added to the
-	views' model in client_cal_opened_cb().
-
-2003-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch] (e_cal_view_get_cal_client,
-	e_cal_view_set_cal_client, e_cal_view_get_query,
-	e_cal_view_set_query): removed unneeded functions.
-	(e_cal_view_get_model, e_cal_view_set_model): new functions.
-	(e_cal_view_destroy): free the model.
-	(e_cal_view_init): removed sexp initialization.
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): set the
-	query on the view's model, not on the view.
-	(gnome_calendar_construct): create the calendar model and associate
-	it to all the views.
-
-2003-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-calendar.c (ecmc_fill_component_from_model):
-	implemented new virtual method.
-	(ecmc_class_init): initialize new virtual method.
-
-2003-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_update_object_with_mod):
-	cal_client_get_component_as_string_internal expects now a
-	icalcomponent, not a CalComponent.
-
-	* gui/e-cal-model.h: added fill_component_from_model virtual method.
-
-	* gui/e-cal-model.c (e_cal_model_get_default_client): return
-	the default URI as per the configuration if we've got that
-	client loaded. If not, return the first client.
-	(get_dtstart): retrieve the value from the icalproperty.
-	(set_summary): implemented correctly.
-	(set_categories, set_classification, set_description): changed
-	to really get an ECalModelComponent.
-	(ecm_append_row): pass the correct arguments to the set_ functions
-	and call the class' fill_component_from_model method to fill in the
-	created icalcomponent.
-
-	* gui/e-cal-model-tasks.c (set_due): added missing function.
-	(ecmt_set_value_at): implemented case for DUE field.
-	(ecmt_fill_component_from_model): implemented new virtual method.
-	(ecmt_append_row): removed.
-
-	* gui/e-cal-model-calendar.c (ecmc_append_row): removed.
-
-	* gui/e-calendar-table.c (e_calendar_table_init): initialize
-	missing fields. Disabled call to g_object_unref on the 'extras'
-	object, since it causes GLib warnings. Something is wrong here.
-
-2003-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (cal_opened_cb): don't call remove_client,
-	since the client, at this point, hasn't been added anywhere.
-	(ecm_finalize): don't call e_cal_model_remove_all_clients, since
-	that function triggers notifications on the model.
-	(query_obj_updated_cb): free all the date fields.
-
-2003-08-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (ecm_value_at): don't convert to an integer
-	the return value from get_color.
-	(ecm_get_color_for_component): use correct GTK 2.x color values.
-
-	* gui/e-calendar-table.c: replace all CAL_COMPONENT_FIELD...
-	with the correct E_CAL_MODEL_*_FIELD...
-
-2003-08-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model-tasks.c (get_completed, get_due): added
-	missing implementation.
-	(ecmt_class_init): initialize missing virtual method.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): fixed typo.
-
-2003-08-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch] (cal_client_get_component_as_string):
-	* cal-util/cal-util.[ch] (cal_util_add_timezone_from_component):
-	use icalcomponent's instead of CalComponent's.
-
-	* gui/Makefile.am:
-	* gui/calendar-model.[ch]: removed old model class.
-
-	* gui/e-calendar-table.[ch]: use ECalModelTasks class instead
-	of CalendarModel.
-	(e_calendar_table_set_status_message): new function.
-	(get_selected_comp): return an ECalModelComponent.
-	(get_selected_objects): return a list of ECalModelComponent's.
-	(delete_selected_components): use the CalClient associated
-	with each component.
-	(copy_row_cb): adapted to changes in get_selected_comp.
-
-	* gui/e-tasks.c:
-	* gui/print.c:
-	* gui/dialogs/comp-editor.c (save_as_cmd):
-	* gui/e-day-view.c (e_day_view_on_drag_data_get):
-	* gui/e-cal-view.c (e_cal_view_copy_clipboard, on_save_as): pass
-	an icalcomponent to cal_util_add_timezones_from_component and
-	cal_client_get_component_as_string.
-
-	* gui/e-cal-model.[ch] (e_cal_model_set_use_24_hour_format):
-	(e_cal_model_get_default_client):
-	(e_cal_model_set_default_category): new functions.
-
-	* gui/e-cal-model-tasks.[ch] (e_cal_model_tasks_mark_task_complete):
-	new function.
-	(ecmt_get_color_for_component): chain the call to the parent class
-	so that it assigns the per-client color to 'normal' tasks.
-
-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table):
-	call e_cal_model_set_use_24_hour_format.
-
-2003-08-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (ecm_get_color_for_component): use the color
-	palette from Tuomas.
-
-2003-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch]: removed 'create_component_with_defaults'
-	virtual method.
-	(e_cal_component_create_component_with_defaults):
-	(e_cal_component_get_color_for_component): new functions.
-
-2003-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_set_query): new function.
-	(e_cal_model_remove_all_clients): implemented.
-	(remove_client): also remove all objects belonging to the
-	client being removed.
-
-2003-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.c (get_dtstart, set_dtstart): implemented.
-	(ecm_value_at, ecm_set_value_at, ecm_duplicate_value,
-	 ecm_free_value, ecm_value_to_string): added case for DTSTART
-	 field.
-	(free_comp_data): free also the other date values in the
-	ECalModelComponent struct.
-	(e_cal_model_date_value_to_string): new function.
-
-	* gui/e-cal-model.h: added new prototypes.
-
-	* gui/e-cal-model-calendar.[ch]: new ECalModel-based class for
-	containing events.
-
-	* gui/e-cal-model-tasks.c (ecmt_value_to_string): implemented
-	the case for date fields.
-
-2003-08-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (generate_instances_obj_updated_cb): fixed
-	parameters in call to cal_client_get_object().
-	(get_objects_atomatically): same.
-
-	* gui/e-cal-model.[ch]: added "get_color_for_component" virtual method.
-	(get_color): new function to return the color. It calls the virtual
-	method of the current class.
-	(ecm_value_at): return a value for the color and icon columns.
-	(e_cal_model_class_init): initialize virtual methods.
-
-	* gui/e-cal-model-tasks.c (ecmt_get_color_for_component): implemented
-	new class' virtual method.
-
-2003-08-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client_/cal-client.c (cal_client_get_default_object): use
-	correctly the pointer to pointer.
-
-	* gui/e-week-view.c (query_obj_updated_cb): fixed the call to
-	cal_client_get_object().
-
-2003-08-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch] (cal_client_get_default_object):
-	(cal_client_get_object): use icalcomponent instead of CalComponent.
-
-	* gui/e-cal-model.c (get_dtstart): implemented.
-	(query_obj_updated_cb):
-	(query_obj_removed_cb):
-	(query_done_cb):
-	(query_eval_error_cb): implemented missing functions.
-
-	* gui/calendar-model.c:
-	* gui/comp-editor-factory.c:
-	* gui/comp-util.c:
-	* gui/e-day-view.c:
-	* gui/e-itip-control.c:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/dialogs/comp-editor.c:
-	* conduits/todo/todo-conduit.c:
-	* conduits/calendar/calendar-conduit.c: adapted to changes
-	in CalClient API.
-
-2003-08-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.[ch] (cal_query_new): added a 'CalClient'
-	argument to this function.
-	(cal_query_get_client): new function.
-
-	* cal-client/cal-client.c (cal_client_get_query): added new parameter
-	in call to cal_query_new ().
-
-2003-08-01  Lorenzo Gil <lgs@sicem.biz>
-
-	* gui/e-alarm-list.c: added the include <config.h> line at the
-        beginning to enable gettext.
-
-2003-08-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch] (e_cal_model_get_component_at): new function.
-	(ecm_append_row): use the client from the source model.
-	(e_cal_model_get_timezone, e_cal_model_set_timezone): new functions.
-
-	* gui/e-cal-model-tasks.[ch]: new class for the tasks model.
-
-2003-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-model.[ch]: new class, based on CalendarModel to be
-	an abstract class for calendar models.
-
-	* gui/Makefile.am: added new files to build.
-
-2003-07-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client-multi.[ch]:
-	* cal-client/Makefile.am: removed obsolete code.
-
-2003-07-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/main.c (factory): Do not depend on global_shell_client being
-	not NULL for creating the calendar preferences dialog.
-
-	* gui/e-itip-control.c (show_current): Don't call get_servers
-	anymore [to be fixed].
-	(get_servers): #if 0ed out.
-	(object_requested_cb): Don't create the folder selector button.
-
-	* gui/e-cal-view.c (e_cal_view_set_status_message): Don't create
-	an activity client.
-
-	* gui/calendar-model.c (calendar_model_set_status_message): Don't
-	create an activity client.
-
-	* gui/calendar-component.c: Removed global variable
-	global_shell_client.
-	(owner_set_cb): Don't set global_shell_client.
-	(owner_unset_cb): Don't set it here either.
-
-2003-07-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes all "alarm daemon doesn't start with session"
-
-	* gui/alarm-notify/notify-main.c (main): use LIBGNOMEUI_MODULE
-	instead of LIBGNOME_MODULE so that the default session client
-	is created in gnome_program_init.
-
-2003-07-29 Harry Lu <harry.lu@sun.com>
-
-	Fixes #46769
-
-	* gui/dialogs/task-page.c: (task_page_fill_component): Popup a 
-	error dialog if due date time is before start datetime when saving
-	a task.
-
-2003-07-29  Bolian Yin <bolian.yin@sun.com>
-
-        Fixes #46847
-
-        * gui/e-day-view.c (e_day_view_get_next_tab_event, e_day_view_focus):
-         add day view widget in the tab loop of events.
-        * gui/e-week-view.c (e_week_view_get_next_tab_event, e_week_view_focus):
-         add week view widget in the tab loop of events.
-
-        Also: add some comments in gui/e-day-view.c and gui/e-week-view.c
-              remove two compile warnings in gui/e-day-view.c
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch] (e_cal_view_delete_selected_occurrence):
-	new function.
-	(e_cal_view_get_timezone, e_cal_view_set_timezone): new functions.
-	(e_cal_view_class_init): added new class' signal.
-
-	* gui/e-week-view.[ch] (e_week_view_delete_occurrence,
-	 e_week_view_delete_occurrence_internal): removed.
-	(e_week_view_get_timezone): removed.
-	(e_week_view_set_timezone): renamed to timezone_changed_cb, as
-	the callback for timezone changes in the parent ECalView.
-	(e_week_view_on_button_press): call gnome_calendar_new_appointment
-	instead of the non-existant e_week_view_new_appointment.
-
-	* gui/e-day-view.[ch] (e_day_view_delete_occurrence,
-	 e_day_view_delete_occurrence_internal): removed.
-	(e_day_view_get_timezone): removed.
-	(e_day_view_set_timezone): renamed to timezone_changed_cb, as
-	the callback for timezone changes in the parent ECalView.
-
-	* gui/gnome-cal.c (gnome_calendar_delete_selected_occurrence):
-	made it call e_cal_view_delete_selected_occurrence.
-	(gnome_calendar_update_config_settings): call the generic
-	e_cal_view_set_timezone on all view widgets.
-
-	* gui/e-day-view-top-item.c:
-	* gui/e-week-view-main-item.c:
-	* gui/e-day-view-main-item.c: removed mentions to non-existant
-	structure fields.
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.h: define ECalViewEvent as the base struct for
-	the other views.
-
-	* gui/e-day-view.[ch]: EDayViewEvent is now based on ECalViewEvent.
-	(e_day_view_get_selected_events): made it return a list of
-	ECalViewEvent's, not CalComponent's, so that we can get more
-	information about the events.
-
-	* gui/e-week-view.[ch]: EWeekViewEvent is now based on ECalViewEvent.
-	(e_week_view_get_selected_events): same as e_day_view_get_selected_events.
-
-	* gui/e-cal-view.c (e_cal_view_cut_clipboard, e_cal_view_copy_clipboard,
-	 e_cal_view_delete_selected_event, e_cal_view_delete_selected_events,
-	 on_edit_appointment, on_save_as, on_print_event, on_meeting,
-	 on_forward, e_cal_view_create_popup_menu):
-	* gui/calendar-commands.c (sensitize_calendar_commands): updated
-	to read ECalViewEvent's instead of CalComponent's as returned
-	by e_cal_view_get_selected_events().
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (delete_event): check the uid before using it.
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_delete_event,
-	 e_day_view_delete_event_internal):
-	* gui/e-week-view.c (e_week_view_delete_event,
-	 e_week_view_delete_event_internal): removed.
-
-	* gui/e-cal-view.[ch] (e_cal_view_delete_selected_event): renamed
-	from e_cal_view_delete_event_internal.
-	(e_cal_view_delete_selected_events): new function.
-
-	* gui/gnome-cal.c (gnome_calendar_delete_selection): call
-	e_cal_view_delete_selected_events().
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_get_position,
-	 e_week_view_event_item_button_press):
-	* 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):
-	adapted to changes in E*ViewPosition.
-
-2003-07-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.c (on_print): added missing cases.
-	(setup_popup_icons): new function to set up icons for the popup menu.
-	(e_cal_view_create_popup_menu): call setup_popup_icons.
-
-2003-07-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch]: moved the duplicated popup menu code here.
-	(e_cal_view_create_popup_menu): new function to create the popup
-	menu for all views.
-	(on_new_appointment, on_new_event, on_new_meeting, on_new_task,
-	 on_goto_today, on_goto_date, on_edit_appointment, on_print,
-	 on_save_as, on_print_event, on_meeting, on_forward, on_publish,
-	 on_settings, on_delete_appointment, on_cut, on_copy, on_paste,
-	 on_unrecur_appointment): callbacks for the popup menu items.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment,
-	  e_week_view_new_appointment, e_week_view_on_new_event,
-	  e_week_view_on_new_meeting, e_week_view_on_new_task,
-	  e_week_view_on_goto_today, e_week_view_on_goto_date,
-	  e_week_view_on_edit_appointment, e_week_view_on_print,
-	  e_week_view_on_save_as, e_week_view_on_print_event,
-	  e_week_view_on_meeting, e_week_view_on_forward,
-	  e_week_view_on_publish, e_week_view_on_settings,
-	  e_week_view_on_delete_appointment,
-	  e_week_view_delete_event_internal, e_week_view_on_cut,
-	  e_week_view_on_copy, e_week_view_on_paste):
-	* gui/e-day-view.c (e_day_view_on_new_appointment,
-	  e_day_view_on_new_event, e_day_view_on_new_meeting,
-	  e_day_view_on_new_task, e_day_view_on_goto_today,
-	  e_day_view_on_goto_date, e_day_view_on_edit_appointment,
-	  e_day_view_on_print, e_day_view_on_save_as,
-	  e_day_view_on_print_event, e_day_view_on_meeting,
-	  e_day_view_on_forward, e_day_view_on_publish,
-	  e_day_view_on_settings, e_day_view_on_delete_appointment,
-	  e_day_view_delete_event_internal, e_day_view_on_cut,
-	  e_day_view_on_copy, e_day_view_on_paste): removed duplicated code.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_unrecur_selection): new function.
-
-2003-07-23  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am: Use EVO_MARSHAL_RULE, and add
-	MARSHAL_GENERATED to CLEANFILES
-
-	* gui/alarm-notify/alarm-queue.c (on_dialog_obj_updated_cb): Fix
-	an unused variable
-
-	* gui/calendar-commands.c (purge_cmd): Fix warnings.
-
-	* gui/calendar-config.h: s/confirm_expunge/confirm_purge/ to match
-	the actual functions
-
-	* gui/control-factory.c: add some missing #includes
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Fix a
-	warning
-
-	* gui/e-itip-control.c (write_label_piece): Remove unused variable.
-
-	* gui/print.c (print_calendar): Remove unused variable
-	(print_comp): Likewise.
-
-	* gui/tasks-control.c (confirm_purge): Fix warnings.
-	(print_tasks): Remove unused variable.
-
-2003-07-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.h:
-	* gui/e-week-view.h: removed unneeded prototypes.
-
-	* gui/e-cal-view.[ch] (e_cal_view_get_visible_time_range): new
-	function.
-	(selection_received): deal correctly with the selected time range.
-
-	* gui/e-week-view.c (e_week_view_get_visible_time_range): made it
-	private as the implementation of the 'get_visible_time_range'
-	virtual method.
-
-	* gui/e-day-view.c (e_day_view_get_visible_time_range): ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_direction): merged redundant 'case'.
-	(focus_current_view): removed redundant code.
-
-2003-07-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_get_selected_events):
-	* gui/e-week-view.c (e_week_view_get_selected_events): manage the
-	case where the selected events are the popup menu ones.
-
-2003-07-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_copy_clipboard,
-	gnome_calendar_cut_clipboard, gnome_calendar_paste_clipboard):
-	removed missing calls to e_day/week_view_*_clipboard.
-
-2003-07-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch]: added "get_selected_events",
-	and "update_query" virtual methods.
-	(e_cal_view_class_init): initialize new virtual methods.
-	(e_cal_view_destroy): destroy new private members.
-	(e_cal_view_get_selected_events, e_cal_view_set_cal_client,
-	 e_cal_view_get_cal_client): new functions.
-	(e_cal_view_cut_clipboard, e_cal_view_copy_clipboard,
-	 e_cal_view_paste_clipboard): merged clipboard stuff.
-
-	* gui/e-day-view.c (e_day_view_cut_clipboard,
-	  e_day_view_copy_clipboard, e_day_view_paste_clipboard): removed.
-	(e_day_view_get_selected_events): made these private as the
-	implementation of the 'get_selected_events' base class virtual method.
-
-	* gui/e-week-view.c (e_week_view_get_selected_events): ditto.
-	(e_week_view_cut_clipboard, e_week_view_copy_clipboard,
-	 e_week_view_paste_clipboard): removed.
-	
-	* gui/calendar-commands.c (sensitize_calendar_commands): call
-	e_cal_view_get_selected_events.
-
-	* gui/gnome-cal.c: removed a lot of redundant code thanks to the
-	above changes.
-
-2003-07-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: removed e_day_view_set_calendar prototype.
-	(e_day_view_set_status_message): removed.
-
-	* gui/e-week-view.[ch] (e_week_view_set_status_message): removed.
-
-	* gui/e-cal-view.[ch] (e_cal_view_set_status_message): new functions.
-	(e_cal_view_destroy): unref activity client.
-
-	* gui/gnome-cal.c: updated to e_*_view/e_cal_view.
-
-2003-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]:
-	* gui/e-week-view.[ch]: moved duplicated code to...
-
-	* gui/e-cal-view.[ch]: ...here.
-	(e_cal_view_get_calendar, e_cal_view_set_calendar): new functions.
-
-	* gui/e-week-view-event-item.c (e_week_event_item_double_click):
-	* gui/gnome-cal.c (setup_widgets): adapted to changes in views.
-
-2003-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-cal-view.[ch]: new base class for calendar views.
-
-	* gui/e-day-view.[ch]:
-	* gui/e-week-view.[ch]: base these classes on ECalView.
-
-	* gui/Makefile.am: added new files.
-
-2003-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.[ch]:
-	* gui/tasks-control.c: s/expunge/purge.
-
-2003-07-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.[ch] (gnome_calendar_purge): new function,
-	which uses a CalQuery to retrieve the objects older than a given date.
-	(check_instance_cb): callback for cal_recur_generate_instances.
-	(purging_obj_updated_cb): call check_instance_cb on each recurrence
-	to double-check the event can be deleted.
-	(purging_query_done_cb, purging_eval_error_cb): needed callbacks to
-	finish the query.
-	(gnome_calendar_destroy): free new members.
-
-	* gui/calendar-commands.c (purge_cmd): added implementation for the
-	'Purge' menu item.
-
-2003-07-16  Andrew Wu <Yang.Wu@sun.com>
-
-      Fixes #45774
-
-      * gui/e-day-view.c (e_day_view_goto_start_of_work_day):
-      implemented select the time that begins a work day.
-      (e_day_view_goto_end_of_work_day):
-      implemented select the time that ends a work day.
-
-2003-07-16  Andrew Wu <Yang.Wu@sun.com>
-	
-	Fixes #45772
-	
-	* gui/gnome-cal.c(gnome_calendar_goto_date): implemented Alt+Left/Right
-	  to go to the same day of the previous/next week.
-	* gui/gnome-cal.h:add two element in GnomeCalendarGotoDateType.
-
-2003-07-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41676
-
-	* gui/dialogs/alarm-options.c (palarm_options_changed_cb,
-	  repeat_spin_button_changed_cb, repeat_unit_changed_cb): new callbacks for
-	managing modifications in the 'Run a program' alarm case.
-	(repeat_toggle_toggled_cb): if the alarm being edited has a procedure
-	action, call palarm_options_changed_cb.
-	(init_widgets): connect new callbacks.
-	(alarm_to_dialog): disable 'OK' button if a procedure alarm.
-
-2003-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: Changed the "URL:" label to
-	"_Web Page:".  Added a widget name to the URL label so that we can
-	hook up its mnemonic by hand.  Added underlines to the "%
-	Complete:" and "Date Completed:" labels.  Added a widget name to
-	the date completed label, also so that we can hook up its mnemonic.
-
-	* gui/dialogs/task-details-page.c (get_widgets): Get the url_label
-	and date_completed_label as well.
-	(init_widgets): Set the mnemonic widgets of the url_label and the
-	date_completed_label by hand, as their respective widgets are
-	not created by libglade.
-
-	* gui/e-calendar-table.c (tasks_popup_menu): Added an item for
-	"Open Web Page".
-	(e_calendar_table_show_popup_menu): Disable the aforementioned
-	menu item if the selected task doesn't have the URL property set.
-	(open_url_cb): New callback.
-
-	* gui/e-tasks.c (write_html): Make the HTML say "Web Page:"
-	instead of "URL:".
-
-2003-07-10  Harry Lu <harry.lu@sun.com>
-
-	Fixes #46075.
-
-	* gui/e-date-time-list.c (compare_datetime): new function to compare
-	two CalComponentDateTime instances.
-	(e_date_time_list_append): check whether the date already exists
-	before adding it to the list.
-
-2003-07-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #45910
-
-	* gui/dialogs/task-editor.c (task_editor_class_init): set up the
-	handler for the set_cal_client virtual method.
-	(task_editor_set_cal_client): added missing virtual method.
-
-2003-07-07  Jack Jia <jack.jia@sun.com>
-
-	* cal-client/cal-client.c (cal_client_get_static_capability): add
-	g_return_val_if_fail to check the input param.
-
-2003-07-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (setup_widgets): added a paned widget to contain
-	the task list and a HTML widget for displaying the task's details.
-	Connect to "cursor_change" signal on the ETable.
-	(table_cursor_change_cb): update the HTML view every time the selected
-	task changes.
-	(timet_to_str_with_zone): new function copied from alarm daemon.
-	(url_requested_cb): callback for "url_requested" signal on the
-	GtkHTML widget.
-	(on_link_clicked_cb): respond to clicks linked on the HTML widget.
-	(vpaned_resized_cb): set the configuration entry for the task vpane
-	position.
-	(e_tasks_destroy): free new member.
-	(e_tasks_construct): connect to "obj_removed" signal on the CalClient.
-	(client_obj_removed_cb): if the updated object is the one being
-	displayed in the HTML widget, update it.
-
-	* gui/calendar-config.[ch] (calendar_config_get_task_vpane_pos):
-	(calendar_config_gset_task_vpane_pos): new functions.
-
-	* gui/apps_evolution_calendar.schemas: added task vpane position.
-
-2003-07-03  Antonio Xu <antonio.xu@sun.com>
-
-	Fixes #45767
-	
-	* conduits/todo/Makefile.am: removed libwombat from the build.
-
-2003-07-02  Harry Lu <harry.lu@sun.com>
-
- 	Fixes #44485
-
- 	* gui/e-timezone-entry.c (e_timezone_entry_set_entry): pass a 
- 	new allocated string to gtk_entry_set_text instead of the one
- 	that might come from gettext.
-
-2003-07-02  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (real_open_calendar): Don't leak
-	exceptions
-	(load_static_capabilities): free the capability string
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Free the
-	description text if it *was* set, rather than if it wasn't.
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): Free the priv
-	struct.
-
-2003-07-02  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45328, #45329
-
-	* gui/e-day-view.c (e_day_view_do_key_press): Do not process
-	PageUp/PageDown, .. when the Alt key is pressed (give key binding
-	set the chance).
-	* gui/gnome-cal.h : define new enum type, GNOME_CAL_GOTO_DATE_TYPE.
-	* gui/gnome-cal.c (gnome_calendar_class_init): define new signal
-	 "goto_date".  Add key bindings for "Alt+PageUp/PageDown",
-	 "Alt+Home/End".
-	(gnome_calendar_goto_date): Impl. signal handler for "goto_date".
-
-2003-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #45524
-
-	* gui/calendar-commands.c: use stock icons where approppriate.
-
-	* gui/tasks-control.c: removed EPixmaps structure, since we only use
-	stock icons now.
-	(tasks_control_activate): no need to call e_pixmaps_update.
-
-2003-07-01  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45274
-
-	* gui/e-week-view.c: implemented tabbing though events in week view.
-
-2003-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: removed usage of WombatClient.
-	(client_get_password_cb, client_forget_password_cb): removed.
-	(real_open_calendar): don't create the WombatClient object.
-	(cal_client_init, cal_client_finalize): removed WombatClient
-	related code.
-	(cal_client_finalize): re-enabled call to destroy_factories.
-
-	* pcs/cal.c: removed usage of WombatClient interface.
-	(cal_construct): don't get a reference to the WombatClient.
-	(cal_get_password, cal_forget_password): removed unused functions.
-
-	* conduits/calendar/Makefile.am:
-	* cal-client/Makefile.am: removed references to libwombat.
-
-2003-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/send-comp.[ch] (send_component_dialog):
-	* gui/dialogs/cancel-comp.[ch] (cancel_component_dialog): added a
-	GtkWindow argument for callers to specify the parent window.
-
-	* gui/dialogs/changed-comp.[ch] (changed_component_dialog): added
-	'parent' argument and use GtkMessageDialog instead of
-	gnome_question_dialog.
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected):
-	* gui/e-day-view.c (e_day_view_delete_event_internal,
-	  e_day_view_on_cut, e_day_view_finish_long_event_resize,
-	  e_day_view_finish_resize, e_day_view_on_editting_stopped,
-	  e_day_view_on_top_canvas_drag_data_received, selection_received):
-	* gui/e-week-view.c (e_week_view_delete_event_internal,
-	  e_week_view_on_cut, e_week_view_on_editing_stopped,
-	  selection_received):
-	* gui/dialogs/event-editor.c (cancel_meeting_cmd):
-	* gui/dialogs/task-editor.c (cancel_task_cmd):
-	* gui/dialogs/comp-editor.c (delete_cmd, obj_removed_cb): pass the parent window to
-	the *_component_dialog() functions.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): use the 'widget'
-	argument to get the parent window for the dialog.
-
-2003-06-26  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45276
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event): set focus to dayview
-	when editing is canceled.
-	* gui/e-week-view.c (e_week_view_on_text_item_event): set focus to weekview
-	when editing is canceled
-
-2003-06-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #44723
-
-	* gui/dialogs/alarm-page.c: added a new field to the private structure
-	to keep track of the old summary.
-	(alarm_page_init): initialize new field.
-	(alarm_page_finalize): free new field.
-	(alarm_page_set_summary): iterate over the list of alarms to change
-	their description if it was the same as the event's summary.
-
-2003-06-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #44719
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog): use
-	gtk_window_set_icon_from_file to set the window's icon and implemented
-	the code to make the window sticky with GTK 2.x API.
-	
-2003-06-25  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45275
-
-	* gui/e-calendar-table.c (e_calendar_table_show_popup_menu): new function.
-	(e_calendar_table_on_right_click_menu): call e_calendar_table_show_popup_menu.
-	(e_calendar_table_on_popup_menu): callback for "popup_menu" signal.
-	(e_calendar_table_init): connect to ETable's "popup_menu" signal.
-
-2003-06-25  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #45273
-
-	* gui/e-day-view.c: implemented tabbing though events in day view.
-	
-2003-06-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (make_title_from_string, set_title_from_string):
-	new functions.
-	(page_summary_changed_cb): change the window title when the object's
-	summary changes.
-
-2003-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (get_factories): don't use a static GList,
-	since the value returned is freed in destroy_factories, making several
-	clients use a buggy GList if one of them happen to be destroyed.
-
-2003-06-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (get_font_for_size): Remove debug output.
-
-	* gui/tasks-control.c (print_tasks): Ref and sink the printable.
-	Use fixed (5%) margins instead of what gnome-print gives us.
-
-2003-06-19  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): don't leak the
-	CalBackendPrivate.
-
-2003-06-18  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_hpane_pos) 
-	(calendar_config_get_vpane_pos) 
-	(calendar_config_get_month_hpane_pos) 
-	(calendar_config_get_month_vpane_pos): Plug in the defaults from
-	the schemas file here, so that even if something goes wrong with
-	the schemas, people will still get reasonable defaults instead of
-	"I click on the calendar and it shows me tasks".
-
-2003-06-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): removed unused
-	variable.
-
-2003-06-12  Jack Jia <jack.jia@sun.com>
- 
- 	* gui/e-itip-control.c
- 	(struct _EItipControlPrivate): switch the "view_only" arg to be an
-	int.
- 	(init): ditto.
- 	(e_itip_control_set_view_only): ditto.
- 	(e_itip_control_get_view_only): ditto.
- 
- 	* gui/itip-bonobo-control.c
- 	(get_prop): switch BONOBO_ARG_SET_BOOLEAN to BONOBO_ARG_SET_INT.
- 	(set_prop): switch BONOBO_ARG_GET_BOOLEAN to BONOBO_ARG_GET_INT.
- 	(itip_bonobo_control_new): switch BONOBO_ARG_BOOLEAN to
-	BONOBO_ARG_INT.
- 
- 	Function "bonobo_property_bag_client_set_value_gboolean" can not
-	work on solaris.
-
-2003-06-10  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes #44682, Shift+F10 to active popup menu on day/week view
-
-	* gui/e-day-view.c (e_day_view_key_press, e_day_view_do_key_press):
-	  When the key press is not handled, give keybindings the chance.
-	 (e_day_view_popup_menu, e_day_view_show_popup_menu,
-	 e_day_view_on_event_right_click ): popup menu will be activated from
-	 both keyboard and mouse.
-
-	* gui/e-week-view.c (e_week_view_key_press, e_week_view_do_key_press):
-          When the key press is not handled, give keybindings the chance.
-	 (e_week_view_popup_menu): popup menu can be activated from keyboard
-
-2003-06-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41582
-
-	* gui/gnome-cal.c (gnome_calendar_hpane_resized): killed warnings
-	and added code to resize the EDayView's time column on the hpane's
-	resizing.
-	(gnome_calendar_vpane_resized): killed warnings.
-	
-2003-06-05  Not Zed  <NotZed@Ximian.com>
-
-	** For #42691.
-
-	* gui/Makefile.am (%.server.in): implicit rule for .in file.
-	(BUILT_SOURCES): added server_DATA.
-
-	* gui/alarm-notify/Makefile.am (%.server.in): added implicit rule
-	for .in file.
-	(BUILT_SOURCES): added server_DATA.
-
-2003-06-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (start_cached_query_cb): adapted to changes in
-	EComponentListener API.
-	(query_construct): ditto.
-
-	* cal-client/cal-client.c (cal_opened_cb): ditto.
diff --git a/calendar/ChangeLog.pre-1-4 b/calendar/ChangeLog.pre-1-4
deleted file mode 100644
index 912411acd1..0000000000
--- a/calendar/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,21872 +0,0 @@
-2003-06-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #43388
-
-	* importers/icalendar-importer.c (prepare_events):
-	(prepare_tasks): use external iterators for removing components from
-	the main component.
-
-2003-05-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43763
-
-	* gui/e-week-view.c (e_week_view_init): use g_signal_connect_after
-	for "button_press_event" callback.
-
-	* gui/e-day-view.c (e_day_view_init): ditto.
-
-2003-05-29  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #43775
-	
-	* gui/weekday-picker.c (get_day_text): calculate the characters to
-	display correctly
-	(configure_items): use it
-	(weekday_picker_style_set): ditto
-
-	* gui/print.c (format_date): use e_utf8_strftime
-	(print_week_view_background): ditto
-	(print_month_summary): ditto
-	(range_selector_new): ditto
-	(print_comp_item): ditto
-
-	* gui/itip-utils.c (comp_description): the translation is already
-	utf8
-
-	* gui/e-itip-control.c (write_label_piece): the string is already
-	in utf8
-
-	* gui/e-day-view.c (e_day_view_style_set): use e_utf8_strftime
-	(e_day_view_recalc_cell_sizes): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): use
-	e_utf8_strftime
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): return the
-	duplicated buffer (its already utf8)
-	(show_date_warning): use e_utf8_strftime
-
-	* gui/calendar-model.c (date_value_to_string): return the
-	duplicated buffer (its already utf8)
-	(calendar_model_value_to_string): the translations should already
-	be in utf8
-
-	* gui/calendar-config.c
-	(calendar_config_locale_supports_12_hour_format): use
-	e_utf8_strftime
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): use
-	e_utf8_strftime
-
-2003-05-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #43455
-
-	* gui/tasks-control.c (confirm_expunge): converted to a GtkMessageDialog
-	and removed object weak's ref code, not needed anymore.
-	
-2003-05-20  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43308
- 	
- 	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
- 	adjust row heights to reflect changes in etable row heights and
- 	set display top to align properly
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
- 	not ref the client
-	
-2003-05-22  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41329
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_zoomed_out_toggled): make sure the
-	meeting time is shown afterwards
-	(e_meeting_time_selector_on_working_hours_toggled): ditto
-
-2003-05-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41234
-
-	* gui/dialogs/e-delegate-dialog.glade: changed button ordering.
-
-2003-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Removed
-	debugging message.
-
-2003-05-20  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): Change this
-	dialog from using a gnome_message_box (which has been deprecated), 
-	to using a gtk_message_dialog. This HIG-ifies this dialog, and 
-	fixes bug #42046.
-
-2003-05-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #42056
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't create accel groups for menuitem mnemonics. Don't use
-	deprecated functions where we actually need accel groups.
-
-2003-05-19  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_finalize): Don't double-free
-	newly-added categories that the gui hasn't been told about yet.
-	#43321
-
-2003-05-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (factory): set 'initialized' to TRUE when initialization
-	is done, or we get the initialization code called over and over.
-
-2003-05-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/e-meeting-time-sel.c:  (e_meeting_time_selector_construct): 
-	Added HIG-blessed padding to (some of) the widgets in the
-	dialog.
-
-	* gui/dialogs/meeting-page.glade: Added HIG-blessed border width
-	and spacing to the meeting page of the event editor.
-
-	* gui/dialogs/schedule-page.glade: Added HIG-blessed border width
-	to the schedule page on the event editor. 
-
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): remove the query time
-	out if its still alive
-	(update_query_timeout): update the query and clear the time out
-	(client_cal_opened_cb): add the query update timeout
-
-2003-05-19  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #43103
-	
-	* gui/e-day-view.c (e_day_view_init): connect normally instead of
-	after so that our boolean return values afffect the action signal
-	emmissions properly
-	(e_day_view_on_top_canvas_drag_motion): fix proto to be a gboolean
-	(e_day_view_on_main_canvas_drag_motion): ditto
-
-	* gui/e-week-view.c (e_week_view_init): connect normally instead
-	of after so that our boolean return values afffect the action
-	signal emmissions properly
-
-2003-05-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): the title is
-	already in UTF-8
-
-2003-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #42220
-
-	* gui/e-day-view.c (e_day_view_finish_resize): hide canvas items and
-	update internal fields before updating the object.
-
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/dialogs/comp-editor.c (comp_editor_finalize): unref the
-	client and the ui component
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #41935
- 	
-	* gui/e-week-view.c (e_week_view_init): listen for scroll events
-	on the canvas
-	(e_week_view_on_button_press): don't scroll here
-	(e_week_view_on_scroll): scroll here
- 
-	* gui/e-day-view.c (e_day_view_init): listen for scroll events on
-	the time and main canvases
-	(e_day_view_on_main_canvas_button_press): don't scroll here
-	(e_day_view_on_main_canvas_scroll): scroll here
-	(e_day_view_on_time_canvas_scroll): and here
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #43029
- 	
-	* gui/e-week-view.c (e_week_view_init): don't listen for destroy
-	signal
-	(e_week_view_destroy): check for NULL and make invisible NULL
-	after we destroy it, unref cursors and NULL them out as well,
-	guard against freeing events multiple times
- 
-	* gui/e-day-view.c (e_day_view_destroy): check for NULL and make
-	invisible NULL after we destroy it, unref cursors and NULL them
-	out as well, guard against freeing events multiple times
-	(e_day_view_init): don't listen for destroy signal
- 
-	* gui/e-calendar-table.c (e_calendar_table_init): don't listen for
-	destroy signal
-	(e_calendar_table_destroy): check for NULL and make invisible NULL
-	after we destroy it
-	
-2003-05-15  JP Rosevear	 <jpr@ximian.com>
- 
-	Fixes #41930
-	
-	* idl/evolution-calendar.idl: Make sure everything that can raise
-	a NotFound exception lists it
-	
-2003-05-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): ref ourselves the
-	number of times we'll get called back
-
-2003-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): guard against multiple destroys
-
-	* cal-client/cal-client.c (cal_client_finalize): unref the
-	bonobo listener
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): guard against multiple
-	destroy calls
-
-	* gui/e-week-view.c (e_week_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-day-view.c (e_day_view_init): connect after destroy
-	(invisible_destroyed): don't unref, its already destroyed
-
-	* gui/e-calendar-table.c (e_calendar_table_class_init): make sure
-	we set the parent class
-	(e_calendar_table_init): connect after the destroy handler runs
-	(e_calendar_table_destroy): guard against multiple destroys
-	(invisible_destroyed): don't unref the invisible, its already
-	being destroyed
-
-	* gui/calendar-offline-handler.c (backend_cal_set_mode): unref the
-	client, we are done with it now
-	(backend_cal_opened_online): ditto
-	(impl_dispose): unref our main client
-
-	* gui/calendar-commands.c (control_util_set_folder_bar_label):
-	release/unref the shell view once we are done with it
-	(control_util_show_settings): ditto
-
-2003-05-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): fixed memory
-	leak introduced by previous commit.
-
-2003-05-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41760
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): don't add a new
-	alarm, but update the already existing one.
-	(notify_dialog_cb): make sure we don't remove the alarm if we are
-	snoozing.
-	
-2003-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.glade: fix button conversion problem
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): only free the percent if its
-	non-null
-
-2003-05-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_discard_alarm): added missing
-	assignment.
-
-2003-05-05  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41811
-	
-	* gui/alarm-notify/Makefile.am: don't dist idl generated files
-
-2003-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): unref the
-	model again
-	(task_editor_edit_comp): don't allow editing if the assignee has
-	delegated
-
-	* gui/dialogs/meeting-page.c (popup_delete_cb): set the new
-	non-delegator to be editable
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): don't allow
-	editing if the attendee has delegated
-	(event_editor_finalize): unref the model again
-
-	* gui/e-meeting-model.c: remove e-table-without related functions
-	(finalize): don't create without table
-	(e_meeting_model_etable_from_model): build the table with this as
-	model
-	(e_meeting_model_etable_model_to_view_row): directly use the
-	model_to_view call
-	(e_meeting_model_etable_view_to_model_row): as above
-	(attendee_changed_cb): make sure pre change is alwasy called
-
-	* gui/e-meeting-model.h: use DECLS, remove protos for long dead
-	functions, don't include config.h
-
-2003-04-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	unused code.
-	
-2003-04-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_finalize): ditto
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): don't unref
-	the model here
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy): null
-	up the display_top and display_main for re-entrancy purposes
-
-2003-04-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): kill warnings
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Added HIG-blessed padding
-	to the alarm options dialog. Fixes bug #41221.
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added appropriate spacing
-	and padding to the calendar/tasks page of the settings dialog. 
-	Fixes bug #41129
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-	
-	* gui/dialogs/task-page.glade: Finishes up fixing #41256 by
-	adding appropriate spacing/padding to the main task page.
-
-	* gui/dialogs/task-details-page.glade: Added appropriate
-	spacing and padding to the task-details page. Partially 
-	fixes #41256.
-
-
-2003-04-28  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/recurrence-page.glade: Added padding/spacing
-	to this page as specified by the HIG. Partially fixes #41215.
-
-	* gui/dialogs/alarm-page.glade: Added padding/spacing/stock 
-	buttons to the alarm page. Partially fixes #41215.
-
-	* gui/dialogs/event-page.glade: Added padding/spacing to the
-	event-page (partially fixes #41215)
-
-
-2003-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #35814
-	
-	* gui/calendar-component.c: Change mnemonic/keybinding for
-	New Meeting to not conflict with other items in the File->New menu
-	
-2003-04-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41661
-
-	* idl/evolution-calendar.idl: added discardAlarm method to
-	GNOME:Evolution:Calendar:Cal interface.
-
-	* pcs/cal.c (cal_class_init): set new epv's method.
-	(impl_Cal_discardAlarm): implementation of new CORBA method.
-
-	* pcs/cal-backend.[ch]: added 'discard_alarm' virtual method, and
-	CAL_BACKEND_RESULT_NOT_IMPLEMENTED to CalBackendResult enum.
-	(cal_backend_class_init): initialize new class method.
-	(cal_backend_discard_alarm): new method.
-	(cal_backend_update_objects, cal_backend_remove_object): return
-	proper CalBackendResult values.
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): initialize
-	new class method.
-	(cal_backend_file_discard_alarm): implementation of new method.
-	
-	* pcs/cal-client.[ch] (cal_client_discard_alarm): new function.
-
-	* gui/alarm-notify/alarm-queue.c (remove_qeueud_alarm): don't remove
-	the alarm directly from the component, call cal_client_discard_alarm
-	and let the backend deal with it.
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/apps_evolution_calendar.schemas: set the hpane default to
- 	32000 so we never see a pane no matter the start up window size
- 	unless the user changes it
-
-2003-04-24  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #37552
-	
-	* gui/dialogs/Makefile.am: build delete-error.[hc]
-
-	* gui/e-tasks.c: wrap calls to cal_client_remove_object with
-	delete_error_dialog
-
-	* gui/e-itip-control.c: ditto
-
-	* gui/e-calendar-table.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: ditto
-
-	* gui/dialogs/delete-error.[hc]: gemerate an error message based
-	on result
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): removed
-	unused variable..
-
-2003-04-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #41641
-
-	* gui/e-day-view.c (e_day_view_focus_in): Remove assert an old
-	input method code.
-	(e_day_view_focus_out): Ditto.
-	(e_day_view_reshape_long_event): Set input method context.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_on_editing_started): Let EText handle the context popup.
-	(e_day_view_on_editing_stopped): Turn off EText's handling of context
-	popup.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Set input
-	method context.
-	(e_week_view_on_text_item_event): Let the EText item handle
-	right-click context popup if we're editing it.
-	(e_week_view_on_editing_started): Let the EText item handle the
-	context popup.
-	(e_weeK_view_on_editing_stopped): Turn off EText's handling of
-	context popup.
-
-2003-04-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41671
-
-	* gui/alarm-notify/notify-main.c (main): added calls to gnome_sound_init
-	and gnome_sound_shutdown.
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): check that the
-	sound file exists, and gdk_beep if not.
-
-2003-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes part of #41148, #41216 and #41235
-
-	* gui/e-itip-control.c (init):
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct,
-	  e_meeting_time_selector_add_key_color):
-	* gui/e-timezone-entry.c (e_timezone_entry_init):
-	* gui/gnome-cal.c (setup_widgets):
-	* gui/tasks-control.c (confirm_expunge):
-	* gui/dialogs/comp-editor.c (setup_widgets):
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	* gui/dialogs/meeting-page.c (meeting_page_construct):
-	* gui/dialogs/recurrence-page.c (make_weekly_special,
-	  make_monthly_special, make_ending_count_special):
-	* gui/dialogs/schedule-page.c (schedule_page_construct):
-	use HIG-suggested spacing.
-
-2003-04-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #22444
-
-	* gui/calendar-commands.c: added new verbs for occurrence-related
-	menu items.
-	(delete_occurrence_cmd): added callback for "Delete this occurrence"
-	menu item. "Delete all occurrences" is just the same as "Delete".
-	(sensitize_calendar_commands): sensitive ocurrence-related menu items.
-
-	* gui/gnome-cal.[ch] (gnome_calendar_delete_selected_occurrence): new
-	function.
-	(gnome_calendar_get_current_view_widget): made this public.
-
-	* gui/e-week-view.[ch] (e_week_view_get_selected_event):
-	(e_week_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_instance_internal.
-
-	* gui/e-day-view.[ch] (e_day_view_get_selected_event):
-	(e_day_view_delete_occurrence): new functions.
-	(e_week_view_delete_occurrence_internal): real implementation of the
-	'Delete Occurrence' logic.
-	(e_week_view_on_delete_occurrence): call delete_occurrence_internal.
-
-2003-04-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.glade: removed 'heading' and
-	'message' labels.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: removed deleted widgets.
-	(alarm_notify_dialog): don't load the removed widgets.
-
-2003-04-18  Rodney Dawes  <dobey@ximian.com>
-
-	Fixes #21499
-
-	* gui/Makefile.am:
-	* gui/calendar-commands.c:
-	* gui/tasks-control.c:
-	* gui/dialogs/Makefile.am:
-	* gui/dialogs/comp-editor.c:
-	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
-	
-2003-04-17  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41459
-	
-	* gui/dialogs/meeting-page.c: comment out delegation stuff
-
-2003-04-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34498
-
-	* gui/alarm-notify/alarm-queue.c: added a 'uid' field to the
-	CompQueuedAlarms structure.
-	(remove_queued_alarm): free the 'uid' field when freeing the
-	structure.
-	(add_component_alarms): g_strdup the component's UID and use that as
-	the key for the hash table.
-
-2003-04-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #41129, #41215, #41221, #41256
-
-	* gui/alarm-notify/alarm-notify.glade:
-	* gui/dialogs/alarm-options.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/cal-prefs-dialog.glade:
-	* gui/dialogs/e-delegate-dialog.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade:
-	* gui/dialogs/schedule-page.glade:
-	* gui/dialogs/task-details-dialog.glade:
-	* gui/dialogs/task-page.glade:
-	* gui/dialogs/event-page.glade: set spacing to 6 pixels
-	everywhere.
-
-2003-04-16  JP Rosevear  <jpr@ximian.com>
- 
-	Fixes #41230
- 	
- 	* gui/e-itip-control.c (show_current): make sure to pass TRUE for
- 	tasks
- 	(start_calendar_server): make sure we don't gtk_main_quit if we
- 	haven't gtk_main'ed
- 	(start_calendar_server_cb): ditto
-
-2003-04-15  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39735 and 40257
-	
-	* gui/gnome-cal.c: convert float pane positions to ints
-	(setup_widgets): set the initial position after realization and
-	track the drags to get the new position, pack the panes slightly
-	differently
-	(gnome_calendar_set_pane_positions): set purely pixel oriented
-	positions
-	(gnome_calendar_update_config_settings): no need to update quanta
-	setting
-	(gnome_calendar_hpane_realized): realization callback
-	(gnome_calendar_vpane_realized): ditto
-	(gnome_calendar_vpane_resized): resize callback, store new size
-	(gnome_calendar_hpane_resized): ditto
-
-	* gui/calendar-model.c (get_due_status): handle an error getting
-	the timezone
-
-	* gui/calendar-config.c (calendar_config_get_hpane_pos): return an int
-	(calendar_config_set_hpane_pos): take an int
-	(calendar_config_get_vpane_pos): return an int
-	(calendar_config_set_vpane_pos): take an int
-
-	* gui/calendar-config.h: update protos
-
-	* gui/apps_evolution_calendar.schemas: update defaults for pane
-	positions
-
-2003-04-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-component.c (owner_set_cb): If we already have an
-	evolution_dir, free the old one before setting it anew.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): Unref the
-	metrics.
-
-	* gui/e-day-view.c (e_day_view_style_set): Unref the metrics.
-	(e_day_view_recalc_cell_sizes): We don't need font metrics here.
-	(e_day_view_reshape_long_event): Ditto.
-
-	* gui/e-meeting-model.c (init): Don't dup the string passed to
-	e_table_without_hide().
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	Unref the metrics.
-	(e_meeting_time_selector_recalc_date_form): Doesn't need metrics.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Unref the metrics.
-
-	* gui/e-week-view.c (e_week_view_style_set): Unref metrics.
-	(e_week_view_recalc_cell_sizes): Ditto.
-	(e_week_view_reshape_event_span): Move Pango stuff to where it
-	can't be leaked due to an early return. Unref metrics.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Unref metrics.
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): Free default
-	address.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Oops. Add this
-	back. Turns out it's still needed by other parts.
-
-2003-04-11  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/task-page.glade: Remove the "Contacts" button and
-	entry from here too. Supposed to have been part of #35926
-
-	* gui/dialogs/task-page.c: Remove all code pertaining to the
-	contacts button
-
-	* gui/dialogs/comp-editor-util.c: 
-	* gui/dialogs/comp-editor-util.h: Likewise
-
-	* gui/dialogs/Makefile.am (IDL_GENERATED, etc): Remove
-	select-names stuff, which is no longer used.
-
-2003-04-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added missing capabilities.
-
-	* cal-client/cal-client.c (cal_client_get_one_alarm_only,
-	  cal_client_get_organizer_must_attend,
-	  cal_client_get_save_schedules):
-	* gui/itip-utils.c (itip_organizer_is_user):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/dialogs/event-page.c (event_page_fill_widgets):
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): use the macros
-	defined in cal-util.h for static capabilities.
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (start_addressbook_server): load the
-	default book to look for additional free/busy info in
-	(init): ugly hack to make sure we get destroyed, set idle id to 0
-	(process_callbacks): unref the im because we are now done with it
-	(refresh_busy_periods): set idle id to 0, ref the model and handle
-	e_book_get_cursor error
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_destroy): guard against multiple
-	destroy calls
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_get_free_busy): only print a
-	message if the exception isn't the reasonable NotFound
-
-2003-04-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/schedule-page.c (schedule_page_finalize): unref the
-	main widget since we ref it when we un-parent it
-
-	* gui/dialogs/alarm-page.c (alarm_page_finalize): ditto
-
-	* gui/dialogs/task-page.c (task_page_finalize): ditto
-
-	* gui/dialogs/event-page.c (event_page_finalize): ditto
-
-	* gui/dialogs/task-details-page.c (task_details_page_finalize):
-	ditto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_finalize): ditto
-
-	* gui/dialogs/meeting-page.c (meeting_page_finalize): ditto
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): added the
-	allocation's X and Y position to the calculated coordinates.
-
-2003-04-10  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #41127
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	unref here, when the callback is done
-	(e_meeting_time_selector_refresh_free_busy): don't unref here
-
-	* gui/e-meeting-model.c (process_free_busy): if the type is
-	unexpected, make sure we cleanup properly
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): only remove
-	the alarm for backends that want it (Exchange).
-
-2003-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added #define's for static capabilities.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_static_capabilities):
-	use the #define's above.
-
-2003-04-09  Chris Toshok  <toshok@ximian.com>
-
-	Fixes #40133
-	
-	* pcs/cal-backend.c (cal_backend_class_init): use G_TYPE_INT
-	instead of G_TYPE_ENUM as a parameter type for the signal to get
-	rid of runtime warning.
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40915
-	
-	* gui/calendar-model.c (get_due_status): when getting the current
-	time for date values, use a timezone aware function
-
-2003-04-09  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40952
-	
-	* pcs/cal-backend-file.c (cal_backend_file_open): check for file
-	method instead of is_local
-
-2003-04-08  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40894
-	
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): update the
-	selection for all view types
-
-2003-04-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c: Remove button_ok, button_cancel,
-	canceled members from struct Dialog.
-	(get_widgets): Do not initialize.
-	(close_dialog): Destroy the toplevel.
-	(toplevel_delete_event_cb): Removed.
-	(button_cancel_clicked_cb): Removed.
-	(button_ok_clicked_cb): Removed.
-	(close_dialog): Removed.
-	(alarm_options_dialog_run): Use gtk_dialog_run.
-	(init_widgets): Do not init ->canceled, do not connect OK/Cancel
-	buttons.
-	(alarm_to_dialog): No need to make the file entry modal from here
-	anymore.
-
-	* gui/dialogs/alarm-options.glade: Turned into a GtkDialog.  Set
-	the "modal" property to True for the file entry.
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #35926.
-
-	* gui/dialogs/event-page.glade: Remove contacts entry/chooser.
-
-	* gui/dialogs/event-page.c: Remove contacts entry/chooser.
-	(event_page_init): Remove references.
-	(event_page_finalize): Ditto.
-	(event_page_fill_widgets): Ditto.
-	(event_page_fill_component): Ditto.
-	(get_widgets): Ditto.
-	(init_widgets): Ditto.
-	(contacts_clicked_cb): Remove wholesale.
-	(contacts_changed_cb): Ditto.
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40876
-	
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_refresh_free_busy): guard against
-	callbacks after destruction
-	(e_meeting_time_selector_refresh_cb): ditto
-
-2003-04-07  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-page.glade: create buttons properly
-
-	* gui/itip-utils.c (comp_server_send): for errors other than busy,
-	we want to email the results
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): insert the new
-	category in the category list as well
-	(idle_notify_categories_changed): reset idle id
-
-2003-04-07  Not Zed  <NotZed@Ximian.com>
- 
- 	Fixes #40252
- 
- 	* conduits/todo/todo-conduit.c: Same as below.
- 
- 	* conduits/calendar/calendar-conduit.c: Change the LOG macro to a
- 	single arg macro which copies its arg.  Fix all callers.  Change
- 	WARN and INFO to simply g_warning/g_message.  Init G_LOG_DOMAIN
- 	before including anything.
-	
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: 
-	Likewise
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Likewise. Also mark the evolution:menu_name for i18n
-
-2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-attendee.[ch]: GObjectify. Eliminates ref/sink
-	warnings from the meeting editor.
-
-2003-04-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	Week view part of fix for #39895.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use the UNFOCUSSED colour if we're not focused, rather than not
-	drawing anything.
-
-	* gui/e-week-view.c: Set up the UNFOCUSSED colour.
-
-	* gui/e-week-view.h: Add the UNFOCUSSED colour.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #40790
-	
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	return based on the response code (not old button stuff)
-
-2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_dialog): Make the file
-	entry modal.  [#40792]
-  
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40789
-	
-	* gui/dialogs/alarm-options.c (alarm_to_dalarm_widgets):
-	description is a text buffer
-	(alarm_to_malarm_widgets): ditto
-	(dalarm_widgets_to_alarm): ditto
-	(malarm_widgets_to_alarm): ditto
-	(alarm_to_repeat_widgets): check repeat status correctly
-
-2003-04-04  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Don't free static string.
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): guard against
-	multiple destroy calls
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (get_default_uri): guard against empty
-	uri as well
-
-2003-04-04  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #40722
-	
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	guard against multiple destroy calls
-
-2003-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/control-factory.c (set_prop): Add a check to see if the view
-	should be the day-view and change the default to be whatever
-	calendar_config_get_default_view() returns. Should fix bug #39735.
-
-	* gui/calendar-config.h: calendar_config_write() and
-	calendar_config_write_on_exit() no longer exist. Removed
-	prototypes.
-
-	* gui/control-factory.c (set_prop): g_strcasecmp() is
-	deprecated. Since the values can never be anything other than all
-	lowercase anyway, just use strcmp.
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39262
-	
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	use folder_type argument to determine what to import.
-	
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added "folder_type" parameter to EvolutionImporterLoadFileFn.
-	
-2003-04-02  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #39955
-	
-	* gui/itip-utils.c (comp_sentby): don't unref the the account
-
-2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #40661
-	
-	* gui/itip-utils.c: added missing header for Forte compilation.
-
-2003-04-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	Nuke GdkFont and use Pango's font measuring.
-
-	* gui/e-day-view-time-itme.c (e_day_view_time_item_get_column_width)
-	(e_day_view_time_item_draw): Ditto.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw)
-	(e_day_view_top_item_draw_long_event): Ditto.
-
-	* gui/e-day-view.c (e_day_view_style_set)
-	(e_day_view_recalc_cell_sizes)
-	(e_day_view_reshape_long_event)
-	(e_day_view_update_top_canvas_drag)
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set)
-	(e_meeting_time_selector_recalc_date_form): Ditto.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Ditto.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Ditto.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set)
-	(e_week_view_recalc_cell_sizes)
-	(e_week_view_reshape_event_span): Ditto.
-
-	* gui/weekday-picker.c (weekday_picker_style_set): Ditto.
-
-2003-04-01  JP Rosevear  <jpr@ximian.com>
-
-	Fix for #17231 (Evo portion)
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): test for
-	secret flag properly
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	ditto
-
-2003-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn):
-	added filename (tasks.ics/calendar.ics) to the URI if it does not
-	contain it.
-
-2003-03-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39961
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback):
-	(e_meeting_time_selector_autopick_menu_position_callback): use the
-	button's allocation to position the popup menu.
-
-2003-03-29  Not Zed  <NotZed@Ximian.com>
-
-	Fixes #39895
-
-	* gui/e-day-view.h (EDayViewColors): add an unfocussed colour to
-	draw the selection in when we're not focussed.
-
-	* gui/e-day-view.c (e_day_view_realize): Initialise
-	E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED to be 1/2 saturation of
-	the focussed colour.
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw): Use the
-	UFOCUSSED colour if we aren't focussed, rather than just not
-	drawing anything.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): the shell client is a
-	g_object now, ref appropriately
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (comp_destroy_cb)
-	(e_day_view_on_long_event_button_press)
-	(e_day_view_on_event_button_press)
-	(e_day_view_on_long_event_click)
-	(e_day_view_on_event_click)
-	(e_day_view_on_event_double_click)
-	(e_day_view_on_delete_appointment): Hold weak references to the
-	CalComponent instead of connecting to the "destroy" signal.
-
-	* gui/e-week-view.c (comp_destroy_cb)
-	(e_week_view_on_text_item_event): Ditto.
-
-2003-03-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39954
-	
-	* gui/dialogs/recurrence-page.c (make_recurrence_special):
-	Destroy would-be children of the container before the container.
-
-2003-03-28  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_init): init new members
-	(get_current_account): get a matching account for the currently
-	selected user in the combo
-	(meeting_page_finalize): unref the meeting attendee if there is
-	one
-	(meeting_page_fill_widgets): don't set the combo list here
-	(clear_widgets): set the default organizer here and if we don't
-	have an organizer, add the default organizer as an attendee
-	(meeting_page_fill_component): use get_current_account
-	(org_changed_cb): if this is a new meeting and the organizer
-	changes, change the attendee
-	(change_clicked_cb): no need to set the default here
-	(init_widgets): reflect changed callback name
-	(meeting_page_construct): set the combo strings here
-	(popup_delete_cb): remove the organizer attendee if the user
-	explicitly deletes it
-
-	* gui/e-meeting-model.c (attendee_changed_cb): set row properly
-
-	* gui/itip-utils.c (comp_to_list): skip the user themselves if
-	cancelling or requesting
-
-2003-03-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (gnome_calendar_import_data_fn): use
-	g_object_unref for CalClient's.
-	(create_checkboxes_control): use g_signal_connect.
-
-	* cal-client/cal-client.c (cal_client_get_load_state): return correct
-	values in g_return_val_if_fail.
-
-2003-03-26  Jack Jia <jack.jia@sun.com>
-
-	* calendar/gui/dialogs/alarm-options.c
-	(malarm_widgets_to_alarm): add a parameter(TC_CORBA_string) to
-	the bonobo_widget_get_property.
-	
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c: Update for e_notice move
-
-	* gui/tasks-control.c (confirm_expunge): Move the code that used
-	to be e_gnome_dialog_set_parent here, since it was marked
-	deprecated and this was the only place using it.
-
-	* gui/dialogs/comp-editor.c: Update for e_notice move
-	(page_changed_cb, page_summary_changed_cb, page_dates_changed_cb):
-	Pass a parent_window to e_notice.
-
-	* gui/dialogs/meeting-page.c: Update for e_notice move.
-	(meeting_page_fill_component, meeting_page_fill_component,
-	popup_delegate_cb): Pass a parent_window to e_notice
-
-2003-03-25  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-util.c (cal_util_parse_ics_file): Utility wrapper
-	around icalparser.
-
-	* cal-util/test-recur.c (main): Use it
-
-	* pcs/cal-backend-file.c (open_cal): Likewise
-
-	* gui/comp-editor-factory.c (open_client): Add the OpenClient to
-	the hash before calling cal_client_open_calendar, since in some
-	failure cases, that will call cal_opened_cb (which will free the
-	oc) with a failure immediately, causing a crash if we then try to
-	deref it.
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-
-	Fixes #32248
-	
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): make
-	sure the due date is actually a date
-
-2003-03-21  JP Rosevear  <jpr@ximian.com>
-	
-	Fixes #31660
-	
-	* conduits/calendar/calendar-conduit.c (rrules_mostly_equal):
-	check if the rrules are equal other than until/count
-	(find_last_cb): update the data with the start timet
-	(local_record_from_comp): handle the case where the recurrence
-	rule ends after a certain number occurrences
-	(comp_from_remote_record): same
-
-2003-03-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(e_calendar_context_destroy): calcomponents are gobjects now
-	(calconduit_load_configuration): ref and sink to avoid warnings
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	ref and sink to avoid warnings
-	(e_todo_context_destroy): calcomponents are gobjects now
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): use a
-	GtkMessageDialog and deal correctly with the dialog's reponses.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39770
-
-	* gui/itip-utils.c (itip_Send_comp): check the CORBA exception instead
-	of the g_return_val_if_fail. Also, use a CORBA_Object for the value
-	returned from bonobo_activation_activate_from_id.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c: removed activation of shell_client.
-	(importer_destroy_cb): no need to unref shell_client.
-	(connect_to_shell): removed.
-	(ical_importer_new, vcal_importer_new): don't call connect_to_shell.
-
-2003-03-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/ical-importer.c (get_uri_from_folder_path): removed.
-	(load_file_fn, vcal_load_file_fn): use physical_uri instead of
-	folderpath.
-
-2003-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Replace "evolution:menu-name" prop with "evolution:menu_name".
-	[#39692]
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/send-comp.c (send_component_dialog): use GtkMessageDialog
-	instead of gnome_question_dialog, and deal correctly with the dialog's
-	response.
-
-2003-03-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #34505
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added removal
-	of the alarm itself in the calendar if the (new) argument says so.
-	Also, set expecting_update flag to TRUE.
-	(add_component_alarms): initialize expecting_update to FALSE.
-	(remove_alarms): don't remove the component if expecting_update is
-	TRUE.
-	(obj_updated_cb, notify_dialog_cb, procedure_notification): adapted
-	to changes in remove_queued_alarm.
-	
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #34095
-
-	* gui/e-meeting-model.c (append_row): Don't leak meeting attendees;
-	unref the attendee after it's assigned to model.
-
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): Free the actual
-	array of deleted attendees.
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-	* gui/itip-utils.c (comp_description): Rework free/busy information
-	composer so we can free date/time information after use. Then free it.
-	(itip_send_comp): Free the allocated CORBA buffer for attachment data.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_component):
-	Free the destination contacts string once we're done with it.
-
-	* gui/e-calendar-table.c (invisible_destroyed): Unref the invisible.
-
-	* gui/e-day-view.c (invisible_destroyed): Ditto.
-
-	* gui/e-week-view.c (invisible_destroyed): Ditto.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39757
-
-	* gui/dialogs/alarm-page.c (sensitize_buttons): Somehow this code
-	reverted to thinking it was dealing with a GtkCList, when in reality
-	it's a GtkTreeView. Fix that, so the buttons are sensitized correctly.
-
-2003-03-17  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #39736
-
-	* gui/e-day-view.c: Reduce the size of the large-digits font so it's
-	en par with the one in 1.2.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39740
-
-	* gui/e-meeting-model.c (is_cell_editable): check row number is valid
-	before using it as index for the GPtrArray.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #39356
-
-	* gui/Makefile.am:
-	* gui/tasks-migrate.[ch]: removed tasks migration obsolete stuff.
-
-	* gui/calendar-component.c (owner_set_cb): don't call tasks_migrate.
-
-2003-03-14  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* pcs/cal-factory.c (impl_CalFactory_uriList): set_release
-	on the sequence we create.
-
-	* cal-client/cal-client.c (cal_client_uri_list): don't leak the
-	string sequence returned by CalFactory_uriList.
-
-2003-03-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): use a weak ref instead
-	of connecting to backend's "destroy" signal.
-	(backend_destroyed_cb, query_destroyed_cb): changed to be weak
-	reference callbacks.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog): don't use
-	GNOME_STOCK_* defines, but GTK_STOCK_*.
-
-2003-03-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/save-comp.[ch] (save_component_dialog): corrected
-	button ordering and changed the return type to be a GtkResponseType.
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): adapted to
-	changes in save_component_dialog.
-
-2003-03-11  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-config.c (on_timezone_set): Update for timezone
-	dialog API changes.
-
-	* gui/e-timezone-entry.c: Likewise
-
-2003-03-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): issue more descriptive
-	warnings.
-
-2003-03-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): if we
-	already have the client loaded, don't remove it, just increment its
-	reference count.
-
-	* gui/alarm-notify/alarm-queue.c (remove_queued_alarm): added new
-	argument to specify whether we want the component's structure removed
-	if no more alarms exist, and only free the structure if TRUE.
-	(remove_alarms): added same new argument and pass it over to
-	remove_queued_alarm.
-	(remove_comp, obj_updated_cb): passed new argument to remove_alarms.
-	(procedure_notification): passed new argument to remove_queued_alarm.
-	(obj_removed_cb): set all freed pointers to NULL.
-	(notify_dialog_cb): only remove the alarm if the pointers are not NULL.
-
-2003-03-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): create the array
-	to be returned only once.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-queue.c (display_notification): ref the CalClient.
-	(notify_dialog_cb): unref the CalClient.
-
-2003-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.[ch]
-	(alarm_notify_dialog_disable_buttons): new function.
-	(alarm_notify_dialog): made it return a pointer to the dialog structure.
-
-	* gui/alarm-notify/alarm-queue.c (remove_alarms, remove_comp): splitted
-	alarm removal out of remove_comp.
-	(obj_updated_cb): remove the component only when needed. In normal
-	updates, just update the internal structure.
-	(edit_component): don't get a CompQueuedAlarms as argument, since it
-	might be removed.
-	(on_dialog_obj_updated_cb, on_dialog_obj_removed_cb): callbacks for
-	modifications during dialog display.
-	(notify_dialog_cb): disconnect from "obj_*ed" signals and call
-	edit_component with the new set of arguments.
-	(display_notification): added more data to the closure structure.
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31382
-
-	* gui/e-meeting-model.c (async_read): don't assume the buffer is
-	always full, but use GNOME_VFS_ERROR_EOF instead for knowing when
-	the read has finished.
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: fix defaults and
-	descriptions to match what calendar-config wants them to be
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (show_current): g_objectify ref/unref
-
-	* gui/itip-bonobo-control.c (set_data_idle_cb): as above
-	(pstream_load): ditto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): as above
-
-2003-03-05  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (class_init): override finalize, not
- 	destroy
- 	(start_calendar_server): take itip as a param and gtk_main_quit if
- 	it gets destroyed while we are waiting for the cal client to load
- 	(start_default_server): ditto
- 	(get_servers): take itip as a param and don't load if we've been
- 	destroyed, check for an except when retrieving the folder list
- 	(init): ref the html control
-	(destroy): mark ourselves as destroyed
- 	(finalize): clean up, unref html control
- 	(write_html): if the html widget has been destroyed, don't write
- 	anything out
- 	(show_current_todo): pass extra param
- 	(show_current): ref/unref the itip control to avoid finalization while
- 	we are working, pass extra param
- 	(button_selected_cb): pass extra param
- 	(object_requested_cb): ditto
-
-2003-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_go_offline,
-	backend_go_online): cast CalClient's to GObject, not GtkObject.
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
- 	let the user change to an email organizer if the back end is not
- 	an email addres
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened_online): set
-	the backend to REMOTE mode when it opens
-	(backend_go_online): prepare to set calendar mode to REMOTE
-	(impl_goOnline): get all the local calendars and set to REMOTE
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37881
- 	
- 	* gui/e-meeting-model.c (process_section): if the attendee is the
- 	empty string, try to get the email
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-  
- 	Fixes #37883
- 	
- 	* idl/evolution-calendar.idl: getLdapAttribute can raise NotFound
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	Fixes #37806, #37697
- 	
- 	* gui/e-itip-control.c (e_itip_control_set_data): if the text is
- 	null or the empty string, just clear the widget
- 	(init): set the html widget to initially be blank
- 
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* pcs/cal.c (impl_Cal_get_ldap_attribute): implement
- 
- 	* pcs/cal-backend.h: add virtual method
- 
- 	* pcs/cal-backend.c (cal_backend_get_ldap_attribute): call
- 	get_ldap_attribute_method
- 
- 	* pcs/cal-backend-file.c (cal_backend_file_class_init): overrid
- 	get_ldap_attribute method
- 
- 	* idl/evolution-calendar.idl: add getLdapAttribute method
- 
- 	* gui/e-meeting-model.c (process_section): take simple card list
- 	as arg and try to use the ldap attribute (if any) as the attendee,
- 	else use the email address
- 	(select_names_ok_cb): get the simple card list 
- 
- 	* cal-client/cal-client.h: add proto
- 
- 	* cal-client/cal-client.c (cal_client_init): init ldap_attribute
- 	to NULL
- 	(cal_client_destroy): free ldap_attribute
- 	(cal_client_get_ldap_attribute): accessor
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-       * gui/itip-utils.c (itip_organizer_is_user): call
-       cal_client_get_cal_address instead of cal_client_get_email_address
-
-       * gui/dialogs/meeting-page.c (meeting_page_construct): ditto
-
-       * pcs/cal.c (impl_Cal_get_cal_address): implement updated method
-       name
-       (cal_class_init): set method implementation
-
-       * pcs/cal-backend.c (cal_backend_class_init): init get_cal_address
-       virtual function
-       (cal_backend_get_cal_address): call proper function
-
-       * pcs/cal-backend.h: update proto, rename get_email_address
-       virtual function to get_cal_address virtual function
-
-       * pcs/cal-backend-file.c (cal_backend_file_class_init): match
-       get_cal_address call
-       (cal_backend_file_get_cal_address): rename from
-       cal_backend_file_get_email_address
-
-       * cal-client/cal-client.c: rename email_address private member to
-       cal_address
-       (cal_client_init): init cal_address
-       (cal_client_destroy): free cal_address and properly free
-       alarm_email_address
-       (cal_client_get_cal_address): rename from
-       cal_client_get_email_address and call proper corba function
-       
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-  	* idl/evolution-calendar.idl: fix comment
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/calendar-model.c (calendar_model_append_row): update FIXME
- 	note
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/dialogs/recur-comp.h: fix copyright
- 
- 	* gui/dialogs/recur-comp.c: fix copyright
- 	(recur_component_dialog): say "recurring journal entry" instead of
- 	just "recurring journal"
-
-2003-03-04  JP Rosevear  <jpr@ximian.com>
- 
-        Partially  Fixes #23606 (from Jack Jia <jack.jia@sun.com>)
- 	
- 	* gui/dialogs/schedule-page.c (update_time): handle no end date if
- 	the start is date only
- 
- 	* gui/dialogs/event-page.c (update_time): ditto
-	
-2003-03-04  JP Rosevear  <jpr@ximian.com>
-
-	Merging in 1.2 stuff
-	
-	Fixes #35598
-	
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): count a status of needs action
-	as a status of none (not started)
-	(date_changed_cb): set the option menu to a status of none
-	(status_changed): no need to handle needs action status now
-
-	* gui/dialogs/task-details-page.glade: remove needs-action menu
-	item
-
-	Fixes #36763	
-		
-	* gui/dialogs/alarm-page.c (add_clicked_cb): if no address was set
-	for an email alarm, set the default
-	(button_options_clicked_cb): pass the default email address
-
-	* gui/dialogs/alarm-options.h (alarm_options_dialog_run): update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_malarm_widgets): if there
-	are no email attendees, default to the passed in value
-	(alarm_options_dialog_run): take and track an email param
-
-	* pcs/cal.c (impl_Cal_get_alarm_email_address): implement by
-	calling backend method
-	(cal_class_init): set alarm email address method implementation
-
-	* pcs/cal-backend.h: add new virtual proto
-
-	* pcs/cal-backend.c (cal_backend_class_init): set alarm email
-	address virtual method to NULL
-	(cal_backend_get_alarm_email_address): call backend method
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): set alarm
-	email address method
-	(cal_backend_file_get_alarm_email_address): implement by returning
-	NULL
-
-	* idl/evolution-calendar.idl: add getAlarmEmailAddress method
- 
-	Fixes #37102
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): don't allow task
-	assignment if the backend says not to
-
-	* gui/dialogs/recurrence-page.c (fill_component): kill warning
-	(preview_recur): display the recurrences in the dtstart timezone
-	if possible
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): pass NULL to use
-	default tag zone
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): allow display zone
-	for the tagged calendar to be passed in
-	(prepare_tag): use the passed in timezone for display if non-null
-
-	* gui/tag-calendar.h (tag_calendar_by_comp): update proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): make
-	sure we always update the preview
-
-	* conduits/todo/todo-conduit.c (add_record): make sure to create a
-	unique uid for the record
-
-	* conduits/calendar/calendar-conduit.c (add_record): ditto
-
-	* conduits/todo/todo-conduit.c (e_todo_context_new): init default
-	comp and timezone to NULL
-	(e_todo_context_destroy): unref default comp
-	(pre_sync): et the default comp via the client and set the default
-	timezone
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	init default comp to NULL
-	(e_calendar_context_destroy): unref default comp
-	(pre_sync): get the default comp via the client
-	(add_record): pass the default comp as the base comp
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	only add the recurrence rule if its not an instance
-
-	* gui/itip-control-factory.c (set_data_idle_cb): idle call back to
-	set control data
-	(pstream_load): set the data in an idle callback to avoid deadlock
-	(get_prop): handle view_only
-	(set_prop): ditto
-	(itip_control_factory): add view_only
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/e-itip-control.c (write_html): only write out the options if
-	we aren't in view_only mode
-	(e_itip_control_set_view_only): accessor
-	(e_itip_control_get_view_only): ditto
-	
-	Fixes #36909
-	
-	* gui/dialogs/alarm-page.c (button_options_clicked_cb): indicate
-	whether the options dialog should allow repeating
-
-	* gui/dialogs/alarm-options.h: update proto
-
-	* gui/dialogs/alarm-options.c (alarm_to_repeat_widgets): if
-	repeating is not allowed, sensitize the widgets appropriately
-	(alarm_options_dialog_run): store the repeat param
-
-	* gui/calendar-model.c (calendar_model_append_row): guard against
-	saving before the calendar is open
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-	
-	* gui/dialogs/comp-editor.c (page_changed_cb): change warning
-	dialog to not mention email
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/itip-utils.c (itip_organizer_is_user): make the compare case
-	insensitive
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): don't
-	allow the organizer to be changed if its not an email address
-
-	* gui/e-day-view.c, calendar-model.c, e-week-view.c,
-	task-editor.c, event-editor.c, comp-editor.c, meeting-page.c: pass
-	additional param
-
-	* gui/itip-utils.c (itip_organizer_is_user): take client as param,
-	and if organizer-not-email-address and email address and organizer
-	match, assume the user is the organizer
-
-	* gui/itip-utils.h: update proto
-
-	* pcs/cal.c (build_fb_seq): set the max
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_add_attendee_with_defaults): correct typo and set
-	rsvp appropriately
-
-	* gui/dialogs/send-comp.c (send_component_dialog): if save
-	schedules, return FALSE for now
-
-	* gui/dialogs/recurrence-page.c (sensitize_recur_widgets):
-	de-sensitize the preview widget if we are viewing an instance
-	(preview_recur): return if the comp is an instance
-
-	* gui/dialogs/event-page.glade: name the show time frame
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets) 
-	(event_page_init): init show time frame
-	(event_page_fill_widgets): hide/show frame as needed
-	(get_widgets): get the frame
-
-	* gui/alarm-notify/alarm-queue.c (mail_notification): kill mail
-	notification code
-
-	* cal-client/cal-client.c (load_static_capabilities): grab static
-	capabilities string
-	(check_capability): see if a capability is in the string
-	(cal_client_get_one_alarm_only): accessor
-	(cal_client_get_organizer_must_attend): use check_capability
-	(cal_client_get_static_capability): ditto
-
-	* cal-client/cal-client.h: new, changed protos
-
-	* idl/evolution-calendar.idl: change over getSchedulingInformation
-	to a more general getStaticCapabilities call
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_static_capabilities): return
-	"no-email-alarms"
-
-	* pcs/cal-backend.c (cal_backend_get_static_capabilities): ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal.c (impl_Cal_get_static_capabilities): ditto
-
-	* gui/alarm-notify/alarm-queue.c (get_default_address): utility
-	routine to snag address info
-
-	* gui/alarm-notify/Makefile.am: build composer idl
-
-	* *.c: pass client param for send an cancel params
-	
-	* gui/dialogs/send-comp.c (send_component_dialog): take client as
-	a parm and if save schedules return true right away
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): take client
-	as a param and if we are deleting and schedule saves, return true
-	right away
-
-	* gui/dialogs/cancel-comp.h (cancel_component_dialog): update proto
-
-	* gui/dialogs/alarm-options.glade: add Send To: button
-
-	* gui/dialogs/alarm-options.c (addressbook_clicked_cb): display
-	dialog
-	(setup_select_names): attach above to Send To: button clicked
-	signal
-
-	* gui/dialogs/alarm-options.c (get_widgets): get mail alarm
-	widgets
-	(setup_select_names): add the select names widget
-	(alarm_to_malarm_widgets): show the attendees and description
-	(alarm_to_dialog): set the title for mail alarms properly
-	(malarm_widgets_to_alarm): save attendees and descriptions in
-	alarm
-	(alarm_options_dialog_run): call setup_select_names
-
-	* gui/dialogs/alarm-page.c: add email to alarm types
-
-	* gui/dialogs/alarm-options.glade: add mail alarm widgets
-
-	* gui/dialogs/alarm-page.glade: add email to alarm types
-
-	* cal-util/cal-component.c (scan_attendee): kill unnecessary
-	CalComponent param
-	(scan_property): don't pass same
-	(set_attendee_list): take an icalcomp instead of a CalComponent
-	(cal_component_set_attendee_list): pass same
-	(scan_alarm_property): if its an attendee, scan it
-	(make_alarm): set attendee_list member to null
-	(cal_component_alarm_new): ditto
-	(cal_component_alarm_free): free attendee list
-	(cal_component_alarm_get_attendee_list): return attendee list
-	(cal_component_alarm_set_attendee_list): set attendee list
-	(cal_component_alarm_has_attendees): return true if alarm has attendees
-
-	* cal-util/cal-component.h: new protos
-
-	* gui/calendar-model.c (calendar_model_append_row): use
-	cal_comp_task_new_with_defaults
-
-	* gui/comp-editor-factory.c (get_default_task): ditto
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): ditto
-
-	* gui/comp-util.h (cal_comp_task_new_with_defaults): new proto
-
-	* gui/comp-util.c (cal_comp_task_new_with_defaults): new utility
-	routine
-
-	* cal-util/cal-util.c (generate_absolute_triggers): skip omitted
-	alarm types
-	(add_alarm_occurrences_cb): ditto
-	(cal_util_generate_alarms_for_list): take/pass omit param
-	(cal_util_generate_alarms_for_comp): ditto
-
-	* cal-util/cal-util.h: update protos
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	add omit param
-	(cal_backend_file_get_alarms_in_range): ditto
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information):
-	remove dead param
-
-	* gui/dialogs/meeting-page.h: delete proto
-
-	* gui/dialogs/meeting-page.c: remove dead routine
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we don't
-	need to add the organizer as an attendee ourselves, just set the
-	edit level properly
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): ditto
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): take client
-	as arg so we can obtain the default from the backend
-	
-	* gui/comp-editor-factory.c (get_default_event): pass
-	cal_comp_event_new_with_defaults the new param
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): ditto
-
-	* gui/e-week-view.c (e_week_view_key_press): ditto
-
-	* gui/e-day-view.c (e_day_view_key_press): ditto
-
-	* gui/calendar-model.c (calendar_model_append_row): ditto
-
-	* gui/comp-util.h (cal_comp_event_new_with_defaults): update proto
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_default_object):
-	return appropriate default object
-
-	* pcs/cal-backend.c (cal_backend_get_default_object): call
-	get_default_backend class method
-
-	* pcs/cal-backend.h: add proto
-
-	* pcs/cal.c (impl_Cal_get_default_object): implement
-	(cal_class_init): set handler for getDefaultObject call
-
-	* idl/evolution-calendar.idl: remove always schedule from
-	SchedulingInformation and add getDefaultObject call
-
-	* cal-client/cal-client.c (cal_client_get_default_object): gets a
-	default object from the server
-	(cal_client_init): remove always_schedule
-	(load_scheduling_info): ditto
-
-	* cal-client/cal-client.h: add a proto, delete a proto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): if the attendee is
-	not fully editable, don't allow deletion
-	(meeting_page_construct): keep the default organizer as an itip
-	address
-	(meeting_page_get_default_organizer): return the default organizer
-
-	* gui/dialogs/meeting-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): we set
-	appropriate edit levels now for users and if the backend always
-	schedules we always show the meeting pages and add the organizer
-	as an attendee
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same
-
-	* gui/e-meeting-model.c (is_cell_editable): use the edit level of
-	the attendee to determine if cell is editable
-	(init): we no longer keep the attendee list of restricted
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_edit_level): accessor
-	(e_meeting_attendee_set_edit_level): ditto
-
-	* gui/e-meeting-attendee.h: new protos and edit level enum
-
-	* cal-client/cal-client.c (load_scheduling_info): load the
-	scheduling info
-	(cal_client_get_always_schedule): accessor
-	(cal_client_get_organizer_must_attend): ditto
-	(cal_client_get_save_schedules): ditto
-	(cal_client_init): init scheduling data members
-
-	* cal-client/cal-client.h: accessors for scheduling information
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_get_scheduling_information): implement the new
-	virtual method
-
-	* pcs/cal-backend.c (cal_backend_get_scheduling_information): call
-	the class specific method
-
-	* pcs/cal-backend.h: add virtual method
-
-	* idl/evolution-calendar.idl: add a getSchedulingInformation call
-	which describes how the backend does its scheduling
-
-	* pcs/cal.c (impl_Cal_get_scheduling_information): implement above
-
-	* gui/e-day-view.c: pass NULL as parent to recur dialog
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): show recur
-	dialog after prompting, not before
-	(save_cmd): ditto
-	(save_close_cmd): ditto
-	(real_edit_comp): don't show recur dialog before opening
-
-	* gui/dialogs/recur-comp.h (recur_component_dialog): update proto
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): take a parent
-	argument and set the dialog parent if non-null
-	
- 	* gui/e-week-view.c (e_day_view_on_editing_stopped): Don't update
- 	appointment if both the old and the new summary texts are empty.
- 
-	* gui/e-week-view.c (e_week_view_show_popup_menu): mask out "make
-	moveable" if its an instance
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-
-	* gui/e-day-view.c (e_day_view_finish_long_event_resize): if its
-	an instance, show the recur comp dialog and modify it based on the
-	response (or not if cancel is hit)
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): reflect changes in
-	proto of recur_component_dialog
-
-	* gui/dialogs/recur-comp.c (recur_component_dialog): use ok/cancel
-	instead and radio buttons for the mod type
-
-	* gui/dialogs/recur-comp.h: update proto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): allow
-	dragging if its an instance
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp): if its an instance,
-	update with the mod type
-	(real_edit_comp): ask the user what instances they want to change
-
-	* gui/dialogs/recur-comp.[hc]: new dialog to ask user what
-	recurrences to modify
-
-	* gui/dialogs/Makefile.am: Compile new files
-	
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): if its an
-	instance, just remove with THIS mod
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): ditto
-	
-	* cal-client/cal-client.c (cal_client_remove_object_with_mod):
-	send the mod parameter to the backend
-	(cal_client_remove_object): implement with above
-	(cal_client_update_object_with_mod): send the mod parameter to the
-	backend
-	(cal_client_update_object): implement with above
-
-	* cal-client/cal-client.h: new protos
-
-	* cal-client/cal-client.c (cal_client_is_read_only): return
-	booleans in the pre conditions
-	(cal_client_update_object): pass mod param
-	(cal_client_update_objects): ditto
-	(cal_client_remove_object): ditto
-	(cal_client_ensure_timezone_on_server): ditto
-
-	* pcs/cal.c (impl_Cal_update_objects): take mod param
-	(impl_Cal_remove_object): ditto
-
-	* pcs/cal-backend.h: fix protos
-
-	* pcs/cal-backend.c (cal_backend_update_objects): take mod param
-	(cal_backend_remove_object): ditto
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): take
-	mod param
-	(cal_backend_file_remove_object): ditto
-
-	* cal-util/cal-util.h: add mod enum
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): if
-	its an instance, just report the instance
-
-	* cal-util/cal-component.h: new protos
-
-	* cal-util/cal-component.c (cal_component_is_instance): indicate
-	whether the component is an instance or not
-	(cal_component_free_range): free a range
-
-	* idl/evolution-calendar.idl: get remove and update to take mod
-	type 
-
-2003-03-03  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/alarm-page.c
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/schedule-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-page.c (get_widgets): gtk_widget_unparent() ->
-	gtk_container_remove(). The former caused crashes in the
-	addressbook's name-selector.
-
-2003-03-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am: Do importers after the other dirs, as it relies on
-	generated files from there. This is still not optimal... Should
-	probably introduce dependencies.
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* importers/Makefile.am: Shlibify.
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
-	Shlibify.
-
-	* importers/icalendar-importer.c: Add necessary includes.
-	(importer_destroy_cb): This is now a GWeakNotify func. gtk_ -> g_.
-	(ical_importer_new)
-	(vcal_importer_new)
-	(gnome_calendar_importer_destroy_cb): Destroy signal -> weak ref.
-
-	* importers/main.c: Add necessary includes. Shlibify.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/Makefile.am: build libcal-dialogs as an uninstalled
-	shared library
-	($(IDL_GENERATED_H), etc): Only generate
-	Evolution-Addressbook-SelectNames.h, not the corresponding .c
-	files, or we'll get duplicate symbol errors trying to link this
-	into libevolution_calendar.la
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Update for
-	that (and eliminate libtool portability warnings)
-
-2003-02-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add importers/.
-
-	* importers/Makefile.am (server_in_files)
-	(server_DATA): Insert $(libexecdir).
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	oaf_activate_from_id() -> bonobo_activation_activate_from_id().
-	(load_vcalendar_file): U_() -> _().
-
-	* importers/GNOME_Evolution_Calendar_Importer.server.in:
-	Renamed to corresponding .in.in.
-
-2003-02-28  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Remove
-	libalarm.a, which was not being used by the calendar.
-
-	* gui/main.c: Remove unneeded alarm.h include.
-
-	* gui/alarm-notify/Makefile.am (noinst_LIBRARIES): Stop building
-	libalarm.a
-	(evolution_alarm_notify_SOURCES): Add alarm.c, alarm.h
-	(evolution_alarm_notify_LDADD): Remove libalarm.a
-
-2003-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: link to versist libtool object
-
-	* conduits/calendar/Makefile.am: ditto
-	
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes alarm notification work.
-
-	* gui/alarm-notify/notify-main.c (main): Initialize GTK. Don't
-	initialize bonobo activation - bonobo_init() does that for us.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	This makes creating appointments and tasks from the "New" button work.
-
-	* gui/main.c (comp_editor_factory_fn): Doesn't need to take any args.
-	(factory): Add a handler for CompEditorFactory.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #37895.
-
-	* gui/e-day-view.c (e_day_view_destroy): g_object_unref () ->
-	pango_font_description_free ().
-	(e_day_view_style_set): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-
-2003-02-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes Ximian #38306.
-
-	* gui/e-itip-control.c (clean_up): Do nothing if the private structure
-	has been freed. Don't call non-g_free() freers with NULL pointers.
-	(destroy): Do nothing if the private structure has been freed. Clear
-	pointers to freed blocks.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Use fixed margins of 5% of page
-	width/height. This is the same cheat as gtkhtml employs to get
-	around the fact that GNOME_PRINT_KEY_PAGE_MARGIN_* don't return
-	useful values (I think). It sort of sucks, but is better than
-	no margins at all.
-	(print_comp): Ditto.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_view): Get
-	default view from correct key.
-
-2003-02-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (get_widgets): Show start/end-of-day
-	widgets.
-	
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_is_read_only): Don't warn
-	if calendar isn't loaded... Doesn't seem to hurt, but this should
-	probably be investigated further.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	If we have no contacts, don't bother trying to set them in the
-	widget. Used to pass a NULL list, which would lead to much anxiety
-	in callees.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets):
-	If we have no potential organizers, emit a sensible warning.
-
-	* gui/dialogs/task-page.c (init_widgets): Don't try to connect to
-	the "changed" signal of the GtkTextView -- we listen to the
-	GtkTextBuffer now.
-
-2003-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-itip-control.c (destroy): dont unref accounts anymore.
-	(change_status): itipAddress -> EAccount.
-
-	* gui/calendar-model.c (calendar_model_destroy): dont unref
-	accounts anymore.
-	(calendar_model_value_at): simplify logic using account_list_find.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): use new
-	itip_addresses interfaces.
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): use new
-	itip_addresses_* interfaces.  Should probably be using e_account
-	directly.
-	(meeting_page_finalize): dont unref the accounts list.
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): dont unref
-	accounts anymore.
-
-	* gui/itip-utils.c (itip_addresses_get_default): Just use
-	e_account_list_get_default.
-	(itip_addresses_get): dont ref the account object, just keep 1 ref
-	to it.
-	(find_account): remove.
-	(itip_organizer_is_user): use e_account_list_find now.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-
-2003-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/meeting-page.c: addresses->accounts
-	(meeting_page_finalize): unref accounts.
-
-	* gui/dialogs/event-editor.c: Use EAccountList api's
-
-	* pcs/cal-backend-util.c (cal_backend_mail_account_get): Removed,
-	use a global EAccountList instead.
-	(cal_backend_mail_account_get_default): Use the global
-	EAccountList directly.
-	(cal_backend_mail_account_is_valid): And here too.
-
-	* gui/itip-utils.h: Removed ItipAddress structure.
-
-	* gui/itip-utils.c (itip_addresses_get): Change it to return a
-	global account object, so we dont need to duplicate all account
-	info in the calendar.
-	(itip_addresses_free, itip_address_free): Removed, use
-	g_object_unref.
-	(itip_addresses_get_default): Return an EAccount.
-	(find_account): helper to lookup accounts based on name/address.
-	(itip_organizer_is_user): Use helper to find account.
-	(itip_sentby_is_user): "
-	(comp_limit_attendees): "
-	(comp_sentby): Update to use an EAccount direclty.
-	(get_address): Removed, now redundant.
-
-	* gui/e-itip-control.c: Changed priv->addresses to be accounts
-	EAccountList.
-	(destroy): unref accounts.
-	(find_my_address): Change to use accounts list directly, also fix
-	a small potential memleak.
-
-	* gui/calendar-model.c: Change priv->addresses to be a direct
-	reference to an EAccountList, renamed priv->accounts.
-	(calendar_model_destroy): unref accounts.
-	(calendar_model_value_at): Use EAccountList directly to lookup
-	members.
-
-	* gui/calendar-config.c (calendar_config_get_timezone)
-	(calendar_config_set_timezone): Fix timezone key.
-	(calendar_config_get_24_hour_format): Same for 24 hour format key.
-	(calendar_config_set_24_hour_format): And here.
-	(calendar_config_get_week_start_day): "
-	(calendar_config_set_week_start_day): "
-	(calendar_config_get_day_start_hour): "
-	(calendar_config_set_day_start_hour): "
-	(calendar_config_get_day_start_minute): "
-	(calendar_config_set_day_start_minute): "
-	(calendar_config_get_day_end_hour): "
-	(calendar_config_set_day_end_hour): "
-	(calendar_config_get_day_end_minute)
-	(calendar_config_set_day_end_minute)
-	(calendar_config_get_time_divisions)
-	(calendar_config_set_time_divisions)
-	(calendar_config_get_dnav_show_week_no)
-	(calendar_config_set_dnav_show_week_no)
-	(calendar_config_get_default_view)
-	(calendar_config_set_default_view)
-	(calendar_config_get_hpane_pos, calendar_config_set_hpane_pos)
-	(calendar_config_get_vpane_pos, calendar_config_set_vpane_pos)
-	(calendar_config_get_month_hpane_pos)
-	(calendar_config_set_month_hpane_pos)
-	(calendar_config_get_month_vpane_pos)
-	(calendar_config_set_month_vpane_pos)
-	(calendar_config_get_compress_weekend)
-	(calendar_config_set_compress_weekend)
-	(calendar_config_get_show_event_end)
-	(calendar_config_set_show_event_end)
-	(calendar_config_get_working_days)
-	(calendar_config_set_working_days)
-	(calendar_config_get_hide_completed_tasks)
-	(calendar_config_set_hide_completed_tasks)
-	(calendar_config_get_hide_completed_tasks_units)
-	(calendar_config_set_hide_completed_tasks_units)
-	(calendar_config_get_hide_completed_tasks_value)
-	(calendar_config_set_hide_completed_tasks_value)
-	(calendar_config_get_confirm_delete)
-	(calendar_config_set_confirm_delete)
-	(calendar_config_get_confirm_expunge)
-	(calendar_config_set_confirm_expunge)
-	(calendar_config_get_tasks_due_today_color)
-	(calendar_config_set_tasks_due_today_color)
-	(calendar_config_get_tasks_overdue_color)
-	(calendar_config_set_tasks_overdue_color)
-	(calendar_config_get_use_default_reminder)
-	(calendar_config_set_use_default_reminder)
-	(calendar_config_get_default_reminder_interval)
-	(calendar_config_set_default_reminder_interval)
-	(calendar_config_get_default_reminder_units)
-	(calendar_config_set_default_reminder_units)
-	(calendar_config_default_calendar_folder)
-	(calendar_config_default_tasks_folder): Update config paths for
-	new config convention, etc.
-
-	* gui/alarm-notify/save.c (KEY_LAST_NOTIFICATION_TIME, etc):
-	Updated keys to lowercase/proper path.
-	(save_calendars_to_load): Store the calendars list as a gconf
-	list.
-	(get_calendars_to_load): Load the calendars list as a gconf list.
-	(save_blessed_program): Similar, for the blessed program list.
-	(is_blessed_program): Same here.
-
-	* gui/alarm-notify/config-data.c (config_data_get_timezone): Update
-	the path to the timezone key.
-	(config_data_get_24_hour_format): Fix path to config option.
-
-	* conduits/todo/todo-conduit.c (get_default_timezone): lower-case
-	the timezone key.
-
-	* conduits/calendar/calendar-conduit.c (get_default_timezone):
-	lower-case the timezone key.
-
-	* cal-client/cal-client.c (get_default_uri): Use the proper path
-	to get the default folder uri's.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): Appease the compiler.
-	(gnome_calendar_update_paned_quanta): Don't actually try to set
-	the quantum properties. The quantum code should probably go away
-	entirely now that the panes update during resize, but let's keep
-	it around for a bit more.
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Ref & sink
-	the pages.
-
-	* gui/dialogs/task-editor.c (task_editor_construct): Ref & sink
-	the pages.
-
-2003-02-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Eliminate
-	e_utf8_to_gtk_string ().
-
-	* gui/e-timezone-entry.c (e_timezone_entry_get_display_name):
-	Ditto.
-
-	* gui/calendar-model.c (date_value_to_string):
-	e_utf8_from_locale_string () -> g_locale_to_utf8 ().
-	(calendar_model_value_to_string): Ditto.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Ditto.
-
-	* gui/e-itip-control.c (write_label_piece): Ditto.
-
-	* gui/print.c (format_date): Ditto.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_date_label): Ditto.
-	(print_comp_item): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Ditto.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/task-details-page.c (get_widgets): Show the custom
-	widgets, since libglade appears to not want to do that.
-
-	* gui/dialogs/task-page.c (clear_widgets): Make the description
-	field use a GtkTextView.
-	(task_page_fill_widgets): Ditto.
-	(task_page_fill_component): Ditto.
-	(init_widgets): Ditto.
-	(get_widgets): Show the custom widgets, since libglade doesn't do it.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_unref_categories): Add an
-	iteration statement. Fixes hang in wombat.
-
-2003-02-22  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Commit fixes from
-	Grzegorz Goawski <grzegol@pld.org.pl>.
-
-2003-02-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): GObject, not
-	GtkObject.
-	(calendar_model_destroy): -> calendar_model_finalize ().
-
-	* gui/calendar-view.c (calendar_view_class_init): GObject, not
-	GtkObject.
-	(calendar_view_destroy): -> calendar_view_finalize ().
-
-	* gui/comp-editor-factory.c (comp_editor_factory_class_init):
-	GObject, not GtkObject.
-	(comp_editor_factory_destroy): -> comp_editor_factory_finalize ().
-
-	* gui/e-day-view.c (e_day_view_long_event_button_press):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-	(e_day_view_on_event_button_press): Ditto.
-	(e_day_view_on_long_event_click): Ditto.
-	(e_day_view_on_event_click): Ditto.
-	(e_day_view_on_event_double_click): Ditto.
-	(e_day_view_on_delete_appointment): Ditto.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event):
-	gtk_signal_disconnect () -> g_signal_handler_disconnect ().
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_RemoveCalendar):
-	Don't cast to GtkObject.
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* cal-client/Makefile.am (libcal_client_la_LIBADD): depend on
-	libcal-util, libwombat, and libeutil
-	(client_test_LDADD): Remove those deps from here
-
-	* cal-util/Makefile.am (libcal_util_la_LIBADD): depend on
-	libical-evolution.la
-	(test_recur_LDADD): Remove that dependency here (and an ancient
-	libversit dependency).
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDADD):
-	remove some deps
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Likewise.
-
-2003-02-20  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/apps_evolution_calendar.schemas: Add GConf schemas.
-
-	* gui/Makefile.am (EXTRA_DIST): Dist GConf schemas.
-	(install-data-local): Install GConf schemas.
-
-2003-02-20  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD):
-	s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
-	libetimezonedialog
-
-2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
-	$(CORBA_GENERATED_C) rule to that it autogens properly when using
-	parallel makes.
-	* cal-client/Makefile.am: Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Fix path to
-	the calendar's GAL Views directory.  [Pointed out by Grzegorz
-	Goawski.]
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	Enable printing for calendar and tasks.
-
-	* gui/print.c: Set default font to be "Sans". Store the PrintConfig
-	globally instead of PaperInfo (which doesn't exist anymore).
-	(get_font_for_size): Don't use
-	gnome_font_face_find_closest_from_weight_slant() anymore, since
-	it's broken. Instead, use gnome_font_face_find() and put bold- and
-	italicness in the name to look for. Descenders can now be negative,
-	so have to take the absolute value to get font height.
-	(print_comp): Use global, persistent print configuration.
-	GnomePrintDialog is now a GtkDialog. Remove manual configuration
-	parameter shuffling. Set up page using new methods.
-	(print_calendar): Like print_comp(). For month view, force landscape
-	mode by temporarily setting it in the config, and remove the old hack.
-	(print_setup): Port. I'm not sure this works, but at least it
-	compiles now. How do I test this code path?
-	(print_day_view): Pass NULL for page denominator.
-	(print_week_view): Ditto.
-	(print_month_view): Ditto.
-	(print_year_view): Ditto.
-	(print_comp_item): Add missing gnome_print_beginpage(). How did this
-	work before?
-
-	* gui/tasks-control.c: Store the PrintConfig globally instead of
-	passing individual parameters every time. Persistent too.
-	(print_title): Look for "Sans Bold" instead of "Times" with
-	GNOME_FONT_BOLD property. Don't use find_closest_from_weight_slant().
-	(print_tasks): Set up page using new methods. GnomePrintMaster ->
-	GnomePrintJob. Get params from global config instead of args.
-	(tasks_control_print_cmd): Use global, persistent print configuration.
-	Remove manual portrait/landscape hack. GnomePrintDialog is now a
-	GtkDialog. Set params in global config instead of passing them to
-	print_tasks().
-	(tasks_control_print_preview_cmd): print_tasks() now takes fewer
-	args.
-
-2003-02-11  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Don't use gtk_scrolled_window_set_scrollbar_spacing() anymore.
-
-2003-02-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* pcs/cal-backend-file.c (save): Don't try to make an error string
-	from an uninitialized GnomeVFSResult.
-
-2003-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am: Make the CORBA IDL compilation work with
-	parallel makes.
-	* gui/dialogs/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	remove this file, as it's generated now
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
-	Add this file to generate the .server.in from, with hardcoded path
-	* gui/alarm-notify/Makefile.am: Hardcode path in server file
-	
-2003-02-07  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #37706
-
-	* gui/comp-editor-factory.c (cal_opened_cb): added PERMISSION_DENIED
-	case for not ending process on g_assert_not_reached.
-
-2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-day-view-time-item.c
-	(e_day_view_time_item_show_popup_menu): Use
-	e_auto_kill_popup_menu_on_selection_done() instead of
-	e_auto_kill_popup_menu_on_hide().
-	* gui/dialogs/meeting-page.c (right_click_cb): Likewise.
-
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/event-page.c (make_timezone_entry): show the widget
-	before returning it.
-
-	* importers/main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext
-	init
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Remove cruft. Rename ICONSDIR to
-	IMAGESDIR.
-	(gladedir, etspecdir, serverdir): Remove definitions
-	(libevolution_calendar_la_LDFLAGS): Remove -export-dynamic, add
-	-module.
-	
-	* gui/calendar-config.c: #include <string.h>
-
-	* gui/calendar-component.c (add_creatable_item):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/comp-util.c: #include <string.h>
-
-	* gui/e-alarm-list.c: #include e-time-utils.h
-	(row_deleted): Remove unused variable.
-	(e_alarm_list_append): Likewise.
-
-	* gui/e-date-time-list.c: #include e-time-utils.h, timeutil.h,
-	calendar-config.h
-	(row_deleted): Remove unused variable
-	(e_date_time_list_append): Likewise.
-
-	* gui/e-day-view.c (e_day_view_unrealize): Remove unused var
-	(e_day_view_style_set): Likewise.
-	(e_day_view_set_event_font_cb): Likewise.
-
-	* gui/e-day-view-time-item.c: #include <string.h>
-	(e_day_view_time_item_get_column_width): Remove unused variable.
-
-	* gui/e-itip-control.c: #include <unistd.h>
-	(url_requested_cb): s/ICONSDIR/IMAGESDIR/
-
-	* gui/e-week-view.c (e_week_view_unrealize): Remove unused variable
-	(e_week_view_style_set): Likewise
-
-	* gui/e-week-view-titles-item.c: #include string.h
-	* gui/itip-bonobo-control.c: Likewise
-	* gui/print.c: Likewise
-
-
-	* gui/alarm-notify/Makefile.am: Use privlibexecdir.
-	(INCLUDES): Remove cruft.
-	(gladedir, serversdir): Remove definitions
-	(evolution_alarm_notify_LDFLAGS): Remove no-longer-needed
-	-export-dynamic.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	s/ICONSDIR/IMAGESDIR
-
-	* gui/alarm-notify/notify-main.c (main): Fix up gettext
-	initialization
-
-
-	* gui/dialogs/Makefile.am (INCLUDES): Remove cruft. Rename
-	ICONSDIR to IMAGESDIR.
-	(gladedir, etspecdir): Remove definitions
-
-	* gui/dialogs/alarm-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_reminder): Remove unused variable.
-	(alarm_page_fill_component): Likewise.
-	(alarm_page_set_summary): Likewise.
-	(delete_clicked_cb): Likewise.
-
-	* gui/dialogs/comp-editor.c (make_icon_from_comp):
-	s/ICONSDIR/IMAGESDIR/
-
-	* gui/dialogs/event-page.c: #include <string.h>
-
-	* gui/dialogs/meeting-page.c (meeting_page_construct): Remove
-	unused variable.
-	(meeting_page_fill_widgets): Likewise
-
-	* gui/dialogs/recurrence-page.c: #include gtktreeselection.h and
-	gtkcellrenderertext.h
-	(append_exception): Remove unused variable
-	(fill_component): Likewise
-	(recurrence_page_set_summary): Likewise.
-	(exception_delete_cb): Likewise
-
-
-	* cal-client/Makefile.am (libcal_clientincludedir): Define in
-	terms of privincludedir
-
-	* cal-client/client-test.c (main): Fix up gettext initialization
-
-	* cal-client/cal-client.c (cal_client_construct): Likewise
-
-
-	* cal-util/Makefile.am (INCLUDES): Remove cruft.
-	(libcal_utilincludedir): Define in terms of privincludedir
-
-
-	* pcs/Makefile.am (INCLUDES): Remove cruft.
-	(pcsincludedir): Define in terms of privincludedir
-
-	* pcs/cal-backend-file.c (cal_backend_file_finalize): Remove
-	unused variable
-
-
-	* importers/Makefile.am: Update this some although it's not
-	currently being built
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main):
-	s/glade_gnome_init/glade_init/
-
-	* gui/calendar-offline-handler.c: s/BonoboXObject/BonoboObject/
-
-	* gui/comp-editor-factory.c: Likewise
-
-2003-02-05  Dan Winship  <danw@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	From evolution-1-2-branch:
-
-	* gui/e-itip-control.c (write_recurrence_piece): Describe
-	recurrences, if we can. #30993
-	(set_date_label): If the meeting has recurrences, call
-	write_recurrence_piece after writing the start and end dates.
-	(write_label_piece): Wrap the timezone in <font size=-1> to
-	de-emphasize it a bit and try to keep the timestamp on a single
-	line even with big Outlook timezone names. Add an option to show
-	just the date, for describing the end of recurrences (since the
-	time in the UNTIL is the *beginning* of the last instance, which
-	would confuse people).
-	(update_item): Set the VCALENDAR's METHOD.
-	(ok_clicked_cb): Use update_item, not remove_item, to process a
-	cancelation. Part of #33875.
-
-	* pcs/cal-backend-file.c (cal_backend_file_cancel_object): New,
-	handle an ICAL_METHOD_CANCEL update.
-	(cal_backend_file_update_objects): Call
-	cal_backend_file_update_object or cal_backend_file_cancel_object
-	as appropriate.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw):
-	Rename to e_meeting_time_selector_on_invite_others_button_expose()
-	and handle "expose-event" instead of "draw".
-	(e_meeting_time_selector_construct): The "draw" signal doesn't exist
-	anymore - connect to "expose-event" instead.
-
-	* gui/dialogs/event-page.c (clear_widgets): Clear the GtkTextBuffer
-	for the description.
-	(event_page_fill_widgets): Use the GtkTextBuffer.
-	(event_page_fill_component): Use the GtkTextBuffer.
-	(init_widgets): Create a GtkTextBuffer for the GtkTextView. Set word
-	wrap. Connect to the "changed" signal of the model instead of the view.
-
-2003-02-04  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): Use PangoLayout to
-	draw text.
-
-2003-02-02  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_set_event_font_cb): Skip setting the
-	"font_gdk" arg for now.
-	(e_day_view_update_main_canvas_drag): Ditto.
-
-	* gui/e-week-view.c (e_week_view_style_set): Ditto.
-
-	* gui/weekday-picker.c (configure_items): Ditto.
-
-	* gui/dialogs/event-page.c (get_widgets): Show custom widgets
-	manually, since the visibility specified in the Glade XML appears
-	to not have any effect.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-2003-01-30 Ronald Kuetemeier <ronald@kuetemeier.com>
-
-	Fixes #35572
-
-	* gui/alarm-notify/alarm-queue.c: set saved_notification_time to last
-	notification time when we update the config to last notification, so
-	alarms will not get trigged again if a new calendar window is opened.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/todo/todo-conduit.c: CalClient and CalComponent are
-	GObjects.
-
-	* conduits/calendar/calendar-conduit.c: same.
-
-2003-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server):
-	fix warning.
-	(get_default_timezone): BonoboConfigDatabase -> e_config_listener.
-	(accept_all_cookies): remove.
-	(conduit_get_gpilot_conduit): remove the oaf initialization stuff.
-
-	* Makefile.am (CONDUIT_DIR): uncomment the conduit stuff.
-
-2003-01-26  Hans Petter Jansson  <hpj@ximian.com>
-
-	Make clicks, drags and resizes work, and pangoize remaining strings.
-	Fix EText placement.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	Use Pango.
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press):
-	Don't add scroll offset, it's already factored in.
-	(e_day_view_on_main_canvas_button_press): Ditto.
-	(e_day_view_on_top_canvas_motion): Ditto.
-	(e_day_view_on_main_canvas_motion): Ditto.
-	(e_day_view_reshape_long_event): Don't set the "font_gdk" property.
-	Its non-existence will prevent the other properties from being set as
-	well.
-	(e_day_view_reshape_day_event): Ditto.
-	(e_day_view_update_top_canvas_drag): Ditto.
-	(e_day_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-	(e_day_view_check_auto_scroll): Factor out scroll offset before
-	checking the pointer's position relative to widget.
-	(e_day_view_auto_scroll_handler): Don't freeze the canvas when
-	scrolling - it will fail to update the canvas. If this is not
-	intended behaviour, it's a bug in the canvas, I think.
-	(e_day_view_on_main_canvas_drag_motion): Factor in the scroll offset
-	before checking for auto-scroll, since the function requires this.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span): Don't set the
-	"font_gdk" property. Its non-existence will prevent the other
-	properties from being set as well.
-	(e_week_view_start_editing_event): ETextEventProcessor is a GObject
-	now. So use g_signal_stuff.
-
-2003-01-25  Hans Petter Jansson  <hpj@ximian.com>
-
-	Mainly making all views use PangoLayouts for text. When drawing a
-	PangoLayout, the draw offset is the top left corner of the layout,
-	not the text's baseline. Keep this in mind when viewing the
-	changes. I'll be brief about the exact changes, since they speak
-	better for themselves.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Use Pango.
-	(e_day_view_time_item_draw): Use Pango.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): Use Pango.
-	(e_day_view_top_item_draw_long_event): Add some FIXME text so we can
-	see when this is being used. Is it in use at all?
-
-	* gui/e-day-view.c: No longer specify an explicit X font string for
-	the large font. Use the main font, and change the point size.
-	(e_day_view_init): Use Pango.
-	(e_day_view_style_set): Use Pango. Comment out the gdk_font setting
-	for the drag text items for now.
-
-	* gui/e-day-view.h: Use Pango.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): Use Pango.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	Use Pango.
-
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_draw):
-	Use Pango.
-
-	* gui/e-week-view.c: No longer specify an explicit X font string for
-	the small font. Use the main font, and change the point size.
-	(e_week_view_init): Use Pango.
-	(e_week_view_destroy): Use Pango.
-	(get_string_width): Implemented for convenience.
-	(get_digit_width): Implemented for convenience.
-	(e_week_view_style_set): Use Pango.
-	(e_week_view_recalc_cell_sizes): Use Pango.
-	(e_week_view_get_time_string_width): Use Pango.
-
-	* gui/e-week-view.h: Use Pango.
-
-	Following are some random UTF-8 fixes and a crash fix.
-
-	* gui/itip-utils.c (comp_description): Use g_locale_to_utf8 ().
-
-	* gui/dialogs/comp-editor.c (make_title_from_comp): Return a
-	UTF-8 string.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_summary): Pass UTF-8
-	directly to GTK.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Ditto.
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): Ditto.
-	(meeting_page_construct): Ditto.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_summary): Ditto.
-
-	* gui/dialogs/event-editor.c (event_editor_finalize): Fix crash caused
-	by gtk_object_destroy()-ing a non-GtkObject.
-
-2003-01-24  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Don't insist
-	appointment is updated if both old and new summary are blank.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Ditto.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Timezone dialog is now
-	a GtkDialog. Treat it as such.
-
-	* gui/goto.c (ecal_event): Goto dialog is now a GtkDialog. Treat it
-	as such.
-	(goto_dialog): Ditto.
-
-	* gui/goto-dialog.glade: Set the return IDs from the dialog buttons.
-
-	* gui/dialogs/meeting-page.c (popup_delegate_cb): Enable the delegate
-	dialog. It's now a GtkDialog, so treat it like one.
-	(right_click_cb): Use GTK stock item, not GNOME (that doesn't work
-	anymore).
-
-	* gui/e-delegate-dialog.glade: Set the return IDs from dialog buttons.
-
-	* gui/print.c (print_calendar): Correct the print dialog init. Code
-	is still not enabled, though.
-
-	* gui/tasks-control.c (print_tasks): Add a warning about printing
-	being disabled.
-
-2003-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (iconsdir): Remove, this is now defined
-	in configure.in.
-
-	* gui/Makefile.am (iconsdir): Remove; this is now defined in
-	configure.in.
-
-	* gui/alarm-notify/Makefile.am (iconsdir): Remove; this is now
-	defined in configure.in.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/dialogs/event-page.c (get_widgets): GTK_OBJECT -> G_OBJECT cast.
-	
-	* gui/dialogs/alarm-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
-
-	* gui/dialogs/schedule-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-details-page.c (get_widget): Ditto.
-
-	* gui/dialogs/task-page.c (get_widget): Ditto.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): Add a
-	FIXME comment to think about.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Add a terminating
-	NULL to the concatenation.
-
-2003-01-23  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes some trivial, but distracting, warnings.
-
-	* gui/calendar-config.c (on_timezone_set): Fix constness.
-
-	* gui/e-timezone-entry.c (on_button_clicked): Fix constness.
-
-	* gui/dialogs/event-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/dialogs/task-page.c (contacts_changed_cb): Fix constness.
-
-	* gui/e-itip-control.c (start_default_server): Cast callback with
-	G_CALLBACK ().
-
-	* gui/dialogs/schedule-page.c (init_widgets): Cast callback with
-	G_CALLBACK ().
-
-	* gui/calendar-offline-handler.c (impl_dispose): Takes GObject,
-	not GtkObject.
-	(impl_finalize): Ditto.
-
-	* gui/calendar-view.c (calendar_view_edit): Now takes parent window
-	as second arg.
-
-	* gui/e-meeting-model.c (select_names_ok_cb): Fix constness.
-	(get_select_name_dialog): Cast callback to BonoboListenerCallbackFn.
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_options_menu_position_callback): Add the
-	push_in arg to arg list. This was crash-prone before.
-	(e_meeting_time_selector_autopick_menu_position_callback): Ditto.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Include e-unicode.h.
-
-2003-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (componentdir): Removed definition; this is now
-	defined in configure.in.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_ref_categories): Do not put the
-	category in both the changed_categories and the categories hashes;
-	fixes a double-free when finalizing the CalBackend.
-
-2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus): Use
-	EVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install libcal-util.la in $(privlibdir)
-	instead of $(libdir).
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Get
-	evolution-comp-editor.xml from EVOLUTION_UIDIR.
-	(comp_editor_merge_ui): Get the file in EVOLUTION_UIDIR.
-
-	* gui/tasks-control.c (tasks_control_activate): Get
-	evolution-tasks.xml from EVOLUTION_UI_DIRECTORY.
-
-	* gui/calendar-commands.c (calendar_control_activate): Get
-	evolution-calendar.xml from EVOLUTION_UI_DIRECTORY.
-
-	* pcs/Makefile.am (pcsincludedir): Version using $(BASE_VERSION).
-
-	* importers/Makefile.am: Install evolution-calendar-importer in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-	(sounddir): Remove.
-
-	* gui/dialogs/Makefile.am (iconsdir): Version using
-	$(BASE_VERSION).
-	(gladedir): Likewise.
-	(etspecdir): Likewise.
-
-	* gui/Makefile.am (help_base): Remove.
-	(install-data-local): Do not make the $(help_base)/C directory.
-	(etspecdir): Version using $(BASE_VERSION).
-	(gladedir): Likewise.
-	(iconsdir): Likewise.
-	(INCLUDES): Update the EVOLUTION_IMAGESDIR define to be versioned,
-	and add a -DEVOLUTION_GALVIEWSDIR.
-
-	* cal-util/Makefile.am: Install evolution-alarm-notify in
-	$(libexecdir)/evolution/$(BASE_VERSION).
-
-	* cal-util/Makefile.am (libcal_utilincludedir): Version using
-	$(BASE_VERSION).
-	* gui/alarm-notify/Makefile.am (iconsdir): Likewise.
-	(gladedir): Likewise.
-
-	* cal-client/Makefile.am: Install libcal-client.la in privlibdir
-	instead of libdir.
-	(libcal_clientincludedir): Version using $(BASE_VERSION).
-
-2003-01-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/print.c (print_calendar): Create a GnomePrintDialog,
-	not a GnomePrinterDialog. They're different things. Patch from
-	Chema.
-
-2003-01-17  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal-backend.c: Move some non-file-backend-specific stuff
-	from cal-backend-file here so it can be shared with other
-	backends.
-	(CalBackendPrivate): add this, containing the categories hashes
-	and the (formerly public) clients list.
-	(cal_backend_init, cal_backend_finalize): Handle backend->priv.
-	(cal_destroy_cb): Simplify this (and redo it as a weak notify
-	func)
-	(cal_backend_add_cal): Keep a weak ref on the cal rather than
-	connecting to its "destroy" signal. Call notify_categories_changed
-	to let the new cal know about them.
-	(get_object): Default implementation of cal_backend_get_object.
-	that calls cal_component_get_as_string on the return value of
-	cal_backend_get_object_component.
-	(cal_backend_notify_mode, cal_backend_notify_update,
-	cal_backend_notify_remove, cal_backend_notify_error): Notify each
-	Cal about something.
-	(cal_backend_ref_categories, cal_backend_unref_categories):
-	Maintain a list of categories that are used by components in the
-	backend, and trigger categories_changed notifications as needed.
-
-	* pcs/cal-backend-file.c: Remove stuff that was moved to
-	CalBackend (notify funcs, category handling, get_object
-	implementation)
-
-2003-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-alarm-list.[ch]: Implement EAlarmList as CalComponentAlarm
-	list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-alarm-list.[ch].
-
-	* gui/dialogs/alarm-page.[ch]: Use GtkTreeView with the new
-	EAlarmList as model for the alarm list. Update copyright.
-
-	* gui/dialogs/recurrence-page.[ch]: Update copyright.
-	(free_exception_date_time): Removed.
-	(fill_exception_widgets): Kill a lingering clist operation.
-
-2003-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	Create accel groups for popup menus. Fixes crash.
-
-	* gui/e-date-time-list.[ch]: Implement EDateTimeList as
-	CalComponentDateTime list with a GtkTreeModel interface.
-
-	* gui/Makefile.am: Add e-date-time-list.[ch]. 
-
-	* gui/dialogs/recurrence-page.c: Use GtkTreeView with the new
-	EDateTimeList as model for the exception list.
-
-	* gui/e-day-view.c: Silence warnings caused by missing casts.
-
-	* gui/e-week-view.c: Silence warnings caused by missing casts.
-
-2003-01-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/Makefile.am: Added libevolution_calendar_la_LDFLAGS, and
-	avoid versioning the shlib component
-	
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-client/Makefile.am (CORBA_SOURCES_GENERATED): Renamed from
-	CORBA_GENERATED.
-	(CORBA_GENERATED): New, put both $(CORBA_SOURCES_GENERATED) and
-	$(CORBA_HEADERS_GENERATED) in it.
-	(BUILT_SOURCES): Put $(CORBA_GENERATED) in here.
-
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-calendar-table.c (tasks_popup_menu): Cast signal handlers
-	to GtkSignalFunc, avoid warnings.
-
-	* gui/gnome-cal.c (set_view): Only set view ID if we have an instance.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* cal-util/Makefile.am (EXTRA_DIST): cal-util-marshal.list.
-
-	* Makefile.am: Comment out the CONDUIT_DIR stuff for now.
-
-2003-01-14  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/gnome-cal.c: Use GtkPaned instead of EPaned
-	
-2003-01-14  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): Work around canvas crashes
-	by ensuring rectangles have an initial width.
-
-2003-01-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/config-control-factory.h: Removed.
-	* gui/config-control-factory.c: Removed.
-
-	* gui/itip-bonobo-control.c: Renamed from itip-control-factory.c.
-	(itip_bonobo_control_new): New.
-	(itip_control_factory_init): Removed.
-
-	* gui/itip-bonobo-control.h: Renamed from itip-control-factory.h.
-
-	* gui/tasks-control-factory.c: Removed.
-	* gui/tasks-control-factory.h: Removed.
-
-	* gui/control-factory.c (control_factory_init): Removed.
-
-	* gui/Makefile.am: Updated to build everything as
-	libevolution-calendar.so and install in the COMPONENTDIR.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Updated to build the
-	component as a shared library.
-
-	* gui/main.c (main): Removed.
-
-	* gui/calendar-component.c (calendar_component_get_object): New.
-	(owner_set_cb): Do not store the shell pointer in shells.
-	(owner_unset_cb): Do not remove the shell pointer from shells;
-	instead, just set global_shell_client to NULL.
-
-	* gui/calendar-component.h: Renamed from component-factory.h.
-	* gui/calendar-component.c: Renamed from component-factory.c.
-
-2003-01-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/icalendar-importer.c (connect_to_shell):
-	CORBA_Object_release() the CORBA shell.
-
-2003-01-09  Dan Winship  <danw@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
-	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
-	the new cal_recur_nth[] array. The way this was done before didn't
-	localize properly.
-
-	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
-	day names ("1st" - "31st")
-
-	* cal-util/cal-component.c (cal_component_set_recurid): Allow
-	recur_id to be NULL to clear the recurrence id. (Based on a story
-	by JP on evolution-1-2-recurid-branch)
-
-	* gui/print.c: Remove unused gnome-print-copies.h #include
-
-	* pcs/query.c (query_new): Use g_object_weak_ref rather than
-	connecting to "destroy" (which doesn't actually exist on a
-	CalBackend)
-	(backend_destroyed_cb): Update prototype.
-
-2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am: Icons are now in
-	$(datadir)/evolution/images instead of
-	$(datadir)/images/evolution.
-	* gui/Makefile.am: Likewise.
-	* gui/dialogs/Makefile.am: Likewise.
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* idl/Makefile.am: remove idldir definition. (It's defined in
-	configure.in now)
-
-2002-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate):
-	Replace gtk_signal_disconnect_by_data() with
-	g_signal_handlers_disconnect_matched(). Former takes GtkObject,
-	latter takes GObject.
-
-	* gui/calendar-model.c (calendar_model_destroy): Ditto.
-	(update_query): Ditto.
-	(calendar_model_set_cal_client): Ditto.
-
-	* gui/e-day-view.c (e_day_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_day_view_set_cal_client): Ditto.
-
-	* gui/e-tasks.c (query_eval_error_cb): Ditto.
-	(query_query_done_cb): Ditto.
-
-	* gui/e-week-view.c (e_week_view_destroy): Ditto.
-	(update_query): Ditto.
-	(e_week_view_set_cal_client): Ditto.
-
-	* gui/gnome-cal.c (update_query): Ditto.
-	(gnome_calendar_destroy): Ditto.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Ditto.
-
-	* gui/e-comp-editor-registry.c (foreach_close_cb): Replace
-	gtk_signal_handler_(un)block_by_data() with
-	g_signal_handlers_(un)block_matched(). Former takes GtkObject, latter
-	takes GObject.
-
-	* gui/dialogs/alarm-page.c (alarm_page_get_type): Replace with
-	E_MAKE_TYPE().
-	(alarm_page_class_init): Use GObject as base class instead of
-	GtkObject, and set up finalization instead of destroy handler.
-	(alarm_page_destroy): Change to alarm_page_finalize() and assume
-	parent is GObject, not GtkObject.
-	(alarm_page_new): Use g_object_new(), not gtk_type_new().
-
-	* gui/dialogs/event-page.c: Same general changes as above file.
-	(update_time): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(clear_widgets): Ditto.
-	(times_updated): Ditto.
-
-	* gui/dialogs/recurrence-page.c: Same general changes as above file.
-	(clear_widgets): Replace gtk_signal_handler_(un)block_by_data()
-	with g_signal_handlers_(un)block_matched().
-	(append_exception): Ditto.
-	(fill_ending_date): Ditto.
-	(recurrence_page_fill_widgets): Ditto.
-
-	* gui/dialogs/comp-editor.c: Same general changes as above file.
-	(comp_editor_finalize): Replace gtk_signal_disconnect_by_data()
-	with g_signal_handlers_disconnect_matched().
-	(comp_editor_remove_page): Ditto.
-
-	* gui/dialogs/event-editor.c: Same general changes as above file.
-	* gui/dialogs/meeting-page.c: Same general changes as above file.
-	* gui/dialogs/schedule-page.c: Same general changes as above file.
-	* gui/dialogs/task-details-page.c: Same general changes.
-	* gui/dialogs/task-editor.c: Same general changes as above file.
-	* gui/dialogs/task-page.c: Same general changes as above file.
-	* gui/dialogs/e-delegate-dialog.c: Same general changes.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Use camel_text_to_html()
-	instead.
-
-2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-itip-control.c (write_html): Correctly convert text.value
-	into HTML here (ie, don't pass "<i>None</i>" into e_text_to_html()
-	if text.value is NULL).
-
-2002-12-06  Rodrigo Moya <rodrigo@ximian.com>
-                                                                                                
-        Fixes #35003
-
-	* gui/misc.[ch] (get_uri_without_password): new function for
-	removing the password from the CalClient's uris.
-
-	* gui/gnome-cal.c (client_cal_opened_cb): use the URI returned by
-	get_uri_without_password for messages.
-	(backend_error_cb): likewise.
-	(backend_died_cb): likewise.
-	(gnome_calendar_open): likewise.
-	(open_error, method_error, permission_error): likewise.
-
-	* gui/e-tasks.c (e_tasks_open): hide the password from the URI
-	being displayed in messages.
-	(backend_error_cb): likewise.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_done_status_enum_get_type):
-	Implement GType for this enumeration.
-	(cal_query_class_init): Use the enumeration instead of the
-	abstract one.
-
-	* cal-client/cal-query.h: Add type macro and proto for enum.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component-factory.c (create_view): Pass the env argument to
-	bonobo_control_set_property ().
-
-	* gui/e-meeting-model.c (class_init): We're no longer derived from
-	GtkObject, so use GObject class methods instead. destroy->finalize.
-	(destroy): Zapped.
-	(finalize): Implement based on old destroy ().
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_open_status_enum_get_type):
-	Create a non-abstract enumeration type derived from GEnum.
-	(cal_client_set_mode_status_enum_get_type): Ditto.
-	(cal_mode_enum_get_type): Ditto.
-	(cal_client_class_init): Use our enumerations and not the abstract
-	one.
-	(cal_client_finalize): Don't destroy factories, since the CalClient
-	doesn't own them anymore. They're shared between CalClients now.
-	(get_factories): Implement. Move the factory setup code here from
-	cal_client_construct (), and cache the factories. This is hopefully
-	temporary, until wombat goes away or is fixed.
-	(cal_client_construct): Most of the code moved to get_factories ().
-
-	* cal-client/cal-client.h: Add enumeration type macros and protos.
-
-	* gui/cal-search-bar.c (cal_search_bar_get_type): Removed in favour
-	of E_MAKE_TYPE, which uses GObject calls.
-	(cal_search_bar_class_init): Use g_type_class_peek_parent ().
-
-	* gui/calendar-model.c (calendar_model_get_type):
-	(calendar_model_class_init): Ditto, like above file.
-	* gui/calendar-view.c (calendar_view_get_type):
-	(calendar_view_class_init): Ditto.
-	* gui/e-calendar-table.c (e_calendar_table_get_type):
-	(e_calendar_table_class_init): Ditto.
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_get_type):
-	(class_init): Ditto.
-	* gui/e-day-view-main-item.c (e_day_view_main_item_get_type):
-	(e_day_view_main_item_class_init): Ditto.
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_type):
-	(e_day_view_time_item_class_init): Ditto.
-	* gui/e-day-view-top-item.c (e_day_view_top_item_get_type):
-	(e_day_view_top_item_class_init): Ditto.
-	* gui/e-day-view.c (e_day_view_get_type):
-	(e_day_view_class_init): Ditto.
-	* gui/e-itip-control.c (e_itip_control_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-model.c (e_meeting_model_get_type):
-	(class_init): Ditto.
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_get_type):
-	(e_meeting_time_selector_item_class_init): Ditto.
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_get_type):
-	(e_meeting_time_selector_class_init): Ditto.
-	* gui/e-timezone-entry.c (e_timezone_entry_get_type):
-	(e_timezone_entry_class_init): Ditto.
-	* gui/e-week-view-event-item.c (e_week_view_event_item_get_type):
-	(e_week_view_event_item_class_init): Ditto.
-	* gui/e-week-view-main-item.c (e_week_view_main_item_get_type):
-	(e_week_view_main_item_class_init): Ditto.
-	* gui/e-week-view-titles-item.c (e_week_view_titles_item_get_type):
-	(e_week_view_titles_item_class_init): Ditto.
-	* gui/gnome-cal.c (gnome_calendar_get_type):
-	(gnome_calendar_class_init): Ditto.
-	* gui/weekday-picker.c (weekday_picker_get_type):
-	(weekday_picker_class_init): Ditto.
-
-	* gui/e-week-view.c (e_week_view_get_type):
-	(e_week_view_class_init): Ditto, but parent_class init was moved
-	from get_type() to class_init().
-
-	* gui/calendar-view-factory.c (calendar_view_factory_get_type):
-	(calendar_view_factory_class_init): Ditto, and set up finalize
-	callback instead of destroy.
-	(calendar_view_factory_finalize): It's a GObject, so implement this.
-	(celendar_view_factory_destroy): Move code to _finalize() and remove.
-
-	* gui/main.c (init_bonobo): Remove extraneous bonobo_activation_init().
-
-2002-11-27  Not Zed  <NotZed@Ximian.com>
-
-	* gui/itip-utils.[ch]: run fix.sh over this.
-
-	* gui/dialogs/*.[ch]: run fix.sh over all of this.
-
-2002-11-26  Richard Li <Richard.Li@Sun.COM>
-
-	* cal-client/cal-client.c (cal_client_construct): removed extra call
-	to CORBA_exception_init.
-
-2002-11-22  Not Zed  <NotZed@Ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Changed
-	e_messagebox -> gtk_messagedialog.
-
-2002-11-21  Not Zed  <NotZed@Ximian.com>
-
-	* gui/component-factory.c (create_view): pass type to
-	bonobo_control_set_property.
-
-2002-11-20  Not Zed  <NotZed@Ximian.com>
-
-	* gui/Makefile.am (EXTRA_DIST): fix typo, servers_in_files ->
-	server_in_files.
-
-2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Added rule to generate
-	GNOME_Evolution_Calendar.server.in from
-	GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@.
-	Also, install evolution-calendar in $libexecdir instead of
-	$bindir.
-
-	* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
-	GNOME_Evolution_Calendar.server.in.  Prepended the executable name
-	with @LIBEXECDIR@.
-
-2002-11-19  Not Zed  <NotZed@Ximian.com>
-
-	* gui/e-meeting-model.c (get_select_name_dialog): pass type to
-	bonobo_widget::set_property.
-	(select_names_ok_cb): ", for get_property.
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	pass type to bonobo_widget::set_property & plug small leak.
-	(e_delegate_dialog_get_delegate): ", for get_property.
-	(e_delegate_dialog_get_delegate_name): "
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget):
-	pass type to bonobo_widget::set_property.
-	(comp_editor_contacts_to_component): ", for get_property
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
-	use new e_table_header_compute_height signature.
-
-2002-11-15  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component-factory.c: Use bonobo_main_quit instead of gtk
-	
-2002-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-query.c: #include <string.h>
-	(obj_removed_cb): Fixed prototype.
-
-	* cal-client/cal-client.c (get_objects_atomically): Fix use of
-	g_signal_handler_disconnect().
-
-	* cal-client/client-test.c (create_client): Add G_CALLBACK casts.
-
-2002-11-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-util.c: #include <string.h>
-
-	* pcs/cal.c: Fixed prototypes of the CORBA method implementations.
-
-	* pcs/cal-backend-file.c (cal_backend_file_dispose): Added a
-	dispose method.
-	(cal_backend_file_get_free_busy): Converted to use EConfigListener
-	rather than BonoboConfigDatabase.
-
-	* gui/alarm-notify/alarm-notify.c: #include <string.h>, fix use of
-	g_hash_table_lookup_extended().
-
-	* gui/alarm-notify/alarm-notify-dialog.c: Substitute deprecated
-	GTK+ functions for new ones.
-
-	* gui/alarm-notify/alarm-queue.c: Likewise.
-
-	* gui/alarm-notify/notify-main.c: #include <string.h>,
-	<gtk/gtkmain.h>.
-
-	* gui/alarm-notify/save.c: #include <string.h>.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_deactivate): Use
-	g_object_set_data(..., NULL) instead of gtk_object_remove_data().
-
-	* gui/calendar-commands.c: Use g_object_{set,get}_* functions
-	instead of gtk_object_{set,get}_*.
-	* gui/calendar-commands.c: Likewise.
-	* gui/calendar-config.c: Likewise.
-	* gui/control-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view-main-item.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view-top-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel-item.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-week-view-event-item.c: Likewise.
-	* gui/e-week-view-layout.c: Likewise.
-	* gui/e-week-view-main-item.c: Likewise.
-	* gui/e-week-view-titles-item.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/print.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_object_ref()/g_object_unref()
-	instead of gtk_object_ref/gtk_object_unref().
-	* gui/calendar-config.c: Likewise.
-	* gui/calendar-model.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/comp-util.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-	* gui/cal-search-bar.c: Use g_object_new() instead of
-	gtk_type_new().
-	* gui/calendar-model.c: Likewise.
-	* gui/calendar-view-factory.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/calendar-view.c: Likewise.
-	* gui/comp-editor-factory.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-cell-date-edit-text.c: Likewise.
-	* gui/e-comp-editor-registry.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-attendee.c: Likewise.
-	* gui/e-meeting-model.c: Likewise.
-	* gui/e-meeting-time-sel.c: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-timezone-entry.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/weekday-picker.c: Likewise.
-
-	* gui/e-itip-control.c (get_servers): g_object_unref the
-	shell_client instead of using bonobo_object_unref().
-
-	* gui/component-factory.c (owner_set_cb): Use
-	evolution_shell_client_corba_objref() instead of
-	bonobo_object_corba_objref().
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c: Use g_signal_connect() instead of
-	gtk_signal_connect().
-	* calendar-commands.c: Likewise.
-	* calendar-config.c: Likewise.
-	* calendar-model.c: Likewise.
-	* comp-editor-factory.c: Likewise.
-	* component-factory.c: Likewise.
-	* control-factory.c: Likewise.
-	* e-calendar-table.c: Likewise.
-	* e-comp-editor-registry.c: Likewise.
-	* e-day-view-time-item.c: Likewise.
-	* e-day-view.c: Likewise.
-	* e-itip-control.c: Likewise.
-	* e-meeting-model.c: Likewise.
-	* e-meeting-time-sel.c: Likewise.
-	* e-tasks.c: Likewise.
-	* e-timezone-entry.c: Likewise.
-	* e-week-view.c: Likewise.
-	* gnome-cal.c: Likewise.
-	* goto.c: Likewise.
-	* tasks-control.c: Likewise.
-	* tasks-migrate.c: Likewise.
-	* weekday-picker.c: Likewise.
-
-2002-11-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-offline-handler.c
-	(calendar_offline_handler_class_init): GObjectified.
-	(impl_finalize): Finalize impl.
-	(impl_dispose): Dispose impl.
-	(calendar_offline_handler_new): Use g_object_new().
-	(backend_cal_opened): use g_signal_connect() instead of
-	gtk_signal_connect().
-	(backend_go_offline): Likewise.
-	(backend_cal_opened): g_object_unref() instead of
-	gtk_object_unref().
-	(backend_go_offline): Likewise.
-
-2002-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/evolution-calendar-importer.h: use GLib macros.
-
-	* importers/main.c (init_importer): use bonobo_generic_factory_new,
-	not bonobo_generic_factory_new_multi.
-	(main): don't use libgnome functions.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c: don't use GTK, we don't need it.
-
-2002-11-07  JP Rosevear  <jpr@ximian.com>
-
-	* Initial port of gui/ subdir to GNOME 2
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c: removed non-existant headers.
-
-	* importers/Makefile.am: changes for BonoboActivation.
-
-	* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
-	$datadir.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/query-listener.[ch]: converted to BonoboObject.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): use glib's
-	g_utf8_strchr.
-
-	* gui/dialogs/delete-comp.c: removed non-existant headers. Use
-	GtkStock instead of GnomeStock.
-
-	* gui/dialogs/e-delegate-dialog.c: converted to BonoboActivation.
-	(e_delegate_dialog_construct): adapted to changes in glade_xml_new.
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch]: converted to BonoboObject.
-	(impl_Cal_get_query): bonobo_object_unref the query returned by
-	cal_backend_get_query if we can't duplicate it.
-
-	* pcs/query.[ch]:
-	* pcs/cal-factory.[ch]: converted to BonoboObject.
-
-	* pcs/query-backend.[ch]:
-	* pcs/cal-backend-file.[ch]:
-	* pcs/cal-backend.[ch]: GObjectify.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/cal-prefs-dialog.c: #include gtkoptionmenu.h.
-	(cal_prefs_dialog_new): adapted to changes in glade_xml_new.
-
-	* gui/dialogs/event-page.h:
-	* gui/dialogs/meeting-page.h:
-	* gui/dialogs/recurrence-page.h:
-	* gui/dialogs/schedule-page.h:
-	* gui/dialogs/task-details-page.h:
-	* gui/dialogs/task-page.h:
-	* gui/cal-prefs-dialog.h: use correctly the macros.
-
-	* gui/dialogs/cancel-comp.c:
-	* gui/dialogs/changed-comp.c:
-	* gui/dialogs/comp-editor-page.c:
-	* gui/gnome-cal.h: removed non-existent headers.
-
-	* gui/dialogs/comp-editor.c: remove non-existent headers.
-	(close_dialog): gtk_widget_destroy the widget.
-	(setup_widgets, comp_editor_merge_ui): use BonoboWindow correctly.
-	(comp_editor_set_cal_client, comp_editor_send_comp,
-	 comp_editor_edit_comp): use G_OBJECT_GET_CLASS for
-	getting the class of an object.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init):
-	use g_signal_* functions.
-
-	* gui/dialogs/comp-editor-util.c: converted to BonoboActivation.
-
-	* gui/dialogs/comp-editor.h: #include bonobo-window.h, not
-	bonobo-win.h.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
-	* gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/Makefile.am: fixed rules for .server files.
-
-2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor-util.[ch]
-	(comp_editor_connect_contacts_changed): don't return a
-	Bonobo_EventSource_ListenerId, since it does not exist anymore,
-	and was not even being used.
-
-	* gui/e-timezone-entry.h: use GLib macros.
-
-	* gui/dialogs/*.glade:
-	* gui/alarm-notify/*.glade:
-	* gui/*.glade: converted to Glade2 format.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): adapted to
-	to new glade_xml_new signature.
-
-	* gui/calendar-model.h:
-	* gui/dialogs/comp-editor-page.h:
-	* gui/dialogs/alarm-page.[ch]: removed non-existant header files.
-
-	* gui/dialogs/comp-editor-util.h: added missing headers.
-
-2002-11-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.c: use libxml2 headers.
-
-	* gui/alarm-notify/Makefile.am:
-	* gui/dialogs/Makefile.am:
-	* gui/Makefile.am: s/XML_I18N/INTLTOOL. Fixed execution of
-	$(ORBIT_IDL).
-
-	* gui/alarm-notify/alarm-notify.[ch]: converted to BonoboObject.
-
-	* gui/alarm-notify/alarm-notify-dialog.c: compilation fixes.
-	(alarm_notify_dialog): adapted to new glade_xml_new signature.
-
-	* gui/alarm-notify/alarm-queue.c: ported to BonoboActivation and
-	GtkStock and GtkDialog.
-
-	* gui/alarm-notify/notify-main.c: ported to BonoboActivation and
-	use GObject functions instead of GtkObject ones.
-
-	* gui/alarm-notify/save.h: removed BonoboConfig related functions.
-
-	* gui/alarm-notify/config-data.c: use GObject functions instead of
-	GtkObject ones.
-
-	* TODO.port: added file for keeping track of disabled things while we
-	port.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util-marshal.list: added new marshallers.
-
-	* cal-client/cal-client.c (get_objects_atomically): fixed calls to
-	g_signal_handler_disconnect_by_func.
-	(cal_client_class_init): fixed typos.
-
-	* cal-client/cal-client-multi.[ch]:
-	* cal-client/cal-client-types.c:
-	* cal-client/cal-query.[ch]: ported to GObject.
-
-	* cal-client/cal-listener.[ch]: converted to BonoboObject.
-
-	* cal-client/Makefile.am:
-	* pcs/Makefile.am: fixed flags for orbit-idl
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/Makefile.am:
-	* cal-util/cal-util-marshal.list: added marshallers.
-
-	* cal-client/cal-client.[ch]: ported to GObject.
-
-2002-11-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]: ported to GObject.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp): use
-	g_object_* instead of gtk_object_*.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): use EConfigListener
-	instead of BonoboConfig.
-
-	* cal-client/cal-client.c:
-	* cal-client/cal-listener.[ch]:
-	* cal-client/query-listener.c: warning free.
-
-2002-11-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: don't use BonoboConfig, but
-	EConfigListener.
-
-	* gui/calendar-config.c: use /apps/Evolution prefix for all
-	configuration keys.
-
-2002-10-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch]:
-	* cal-util/cal-recur.h:
-	* cal-util/cal-util.[ch]:
-	* cal-client/cal-client.h:
-	* cal-client/cal-client-multi.h:
-	* cal-client/cal-client-types.[ch]:
-	* cal-client/cal-listener.h
-	* cal-client/cal-query.[ch]:
-	* cal-client/query-listener.h:
-	* pcs/cal.h:
-	* pcs/cal-backend.[ch]:
-	* pcs/cal-backend-file.h:
-	* pcs/cal-backend-util.h:
-	* pcs/cal-common.h:
-	* pcs/cal-factory.h:
-	* pcs/query.[ch]:
-	* pcs/query-backend.[ch]: started GNOME 2 porting.
-	cal-util, cal-client and pcs compiled ok.
-
-	* cal-client/cal-client.c (cal_client_construct):
-	* pcs/cal-factory.c: use b-a instead of OAF and bonobo-config
-	instead of bonobo-conf.
-
-2002-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (backend_died_cb): cleaned up the status bar
-	messages for all widgets.
-
-2002-10-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (init): initialize new values
-	(clean_up): free new values
-	(find_my_address): if we have a delegator address, use it instead
-	(write_html): display delegator info to user
-	(show_current_event): if we have a calendar uri, use that and
-	describe the event differently
-	(show_current_todo): ditto
-	(show_current): search for delegator X properties
-	(e_itip_control_set_delegator_address): accessor
-	(e_itip_control_get_delegator_address): ditto
-	(e_itip_control_set_delegator_name): ditto
-	(e_itip_control_get_delegator_name): ditto
-	(e_itip_control_set_calendar_uri): ditto
-	(e_itip_control_get_calendar_uri): ditto
-
-	* gui/e-itip-control.h: add protos
-
-	* gui/itip-utils.c (comp_from): use the first attendee as the from
-	address for things other than request, cancel and add (use
-	organizer) and publish (use default address)
-
-2002-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32613
-
-	* gui/component-factory.c (sc_user_create_new_item_cb): use the
-	default calendar/tasks folder to activate the component editor.
-	(get_data_uri): deal correctly with the URIs being used.
-
-2002-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (show_current): fix warning
-
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #32371
-
-	* pcs/query.c (start_cached_query_cb): CORBA_exception_init the
-	CORBA_Environment before using it.
-	
-2002-10-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): use NULL for pointer instead of
-	FALSE.
-
-2002-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): use e_config_listener_* to get
-	values
-	(itip_addresses_get): ditto
-	(itip_addresses_get_default): ditto
-
-	* gui/calendar-model.c (calendar_model_value_to_string): don't
-	send back a null string (affects if it is the group header)
-	(calendar_model_init): pre load config database info so we don't
-	do corba calls during draws
-
-	Fixes #32276
-	
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): fix c/p type
-
-2002-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/recurrence-page.c (fill_ending_date): if the value
-	is a datetime, convert it to a date
-
-	* gui/itip-utils.c (comp_compliant): convert an UNTIL date value
-	to a datetime value
-
-	* cal-util/cal-component.c (cal_component_has_simple_recurrence):
-	check to see if the component recurrences meet our definition of
-	"simple"
-
-	* cal-util/cal-component.h: new proto
-
-2002-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (fill_component): changed to have a
-	gboolean return type, which is what it's supposed to do.
-	(recurrence_page_fill_component): return the result from
-	fill_component.
-
-	* gui/dialogs/comp-editor-page.h: fixed typo in function prototype.
-
-2002-10-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): try to
-	preserve the work week view setting if it makes sense
-	(set_view): don't update the info again based on our view change
-	call
-
-	Fixes #16036
-	
-2002-10-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #11434
-	
-	* gui/dialogs/comp-editor-page.[ch]
-	(comp_editor_page_display_validation_error): new function.
-	
-	* gui/dialogs/event-page.c (event_page_fill_component):
-	* gui/dialogs/recurrence-page.c (fill_component):
-	* gui/dialogs/task-details-page.c (task_details_page_fill_component):
-	* gui/dialogs/task-page.c (task_page_fill_component): added
-	checks for all date values, and return FALSE if we find
-	some invalid date/times.
-	
-	* gui/dialogs/comp-editor.c (save_comp): activate the page that
-	returns error in fill_component.
-
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_create_time_edit): set the 24 hour format
-	initially
-
-	Fixes #31812
-	
-2002-10-08  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c: remove pilot settings from contextual menu
-
-	* gui/e-day-view.c: ditto
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #31774
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): use correct pointer in loop.
-
-2002-10-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (setup_changes): cast the correct
-	item
-
-2002-10-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (lookup_queued_alarm): don't crash if
-	we don't find the queued alarm in the internal list.
-	(alarm_trigger_cb, create_snooze, display_notification,
-	 audio_notification, procedure_notification, remove_queued_alarm):
-	check return value from lookup_queued_alarm.
-
-2002-10-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15892
-
-	* idl/evolution-calendar.idl: added notifyErrorOccurred method to
-	the Listener interface, so that backends can notify clients of errors
-	that can't be reported otherwise.
-
-	* pcs/cal.[ch] (cal_notify_error): new function.
-
-	* pcs/cal-backend-file.c (save): made to save to temporary file and
-	then moved to the correct file, so that we don't lose any data if
-	there's a problem while saving.
-	(notify_error): new function for notifying error messages to clients.
-
-	* cal-client/cal-listener.[ch]: added new callback function for getting
-	error messages from backends.
-	(impl_notifyErrorOccurred): new method implementation.
-	(cal_listener_class_init): initialize new epv member.
-	(cal_listener_init, cal_listener_destroy, cal_listener_construct,
-	 cal_listener_new): initialize new function pointer.
-
-	* cal-client/cal-client.[ch]: adapted to changes in CalListener class.
-	(cal_client_class_init): added "backend_error" signal to CalClient class.
-	(backend_error_cb): callback for "error_occurred" signal on the CalListener,
-	which just emits the "backend_error" signal of CalClient.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): connect to "backend_error"
-	signal on the CalClient's we create.
-	(backend_error_cb): display error message on error from backend.
-
-	* gui/e-tasks.c: likewise.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (alarm_notify_factory_fn): removed
-	unneeded g_assert which was preventing the alarm daemon to
-	start correctly in some cases.
-
-2002-10-02  Rodrigo Moya <rodrigo@ximian.com>
-	
-	Fixes #30057
-	
-	* cal-client/cal-client.c (cal_client_is_read_only): added check
-	of the status of the client before trying to make CORBA calls.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands,
-	  sensitize_taskpad_commands):
-	* gui/tasks-control.c (sensitize_commands):
-	* gui/dialogs/event-editor.c (set_menu_sens):
-	* gui/dialogs/task-editor.c (set_menu_sens):
-	* gui/e-calendar-table.c (e_calendar_table_on_right_click):
-	* gui/e-day-view.c (e_day_view_on_event_right_click):
-	* gui/e-week-view.c (e_week_view_show_popup_menu): take into account
-	the read-onlyness of clients to disable/enable menu items.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added isReadOnly method to Cal
-	interface.
-
-	* pcs/cal.c (impl_Cal_is_read_only): new method implementation.
-
-	* pcs/cal-backend.[ch]: added is_read_only method to CalBackend class.
-	(cal_backend_is_read_only): new function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_is_read_only): new method.
-	(cal_backend_file_class_init): set new signal's virtual method.
-
-	* cal-client/cal-client.[ch] (cal_client_is_read_only): new function.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* gui/dialogs/alarm-page.c (alarm_page_init): added a
-	X-EVOLUTION-NEEDS-DESCRIPTION property, so that we later set it
-	correctly if it hasn't been set in the meanwhile (editing options for
-	the alarm).
-
-	* gui/dialogs/alarm-options.c (dalarm_widgets_to_alarm,
-	palarm_widgets_to_alarm): removed X-EVOLUTION-NEEDS-DESCRIPTION
-	property from alarms every time we set the description of the alarm.
-
-2002-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #30290
-
-	* importers/icalendar-importer.c (process_item_fn): return a status of
-	BUSY rather than NOT_READY, to avoid the display of the error message.
-	
-2002-09-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c
-	(calconduit_load_configuration): load multi_day_split
-	(calconduit_save_configuration): save it
-	(calconduit_dupe_configuration): copy it
-	(e_cal_gui_new): create gui for it
-	(e_cal_gui_fill_widgets): fill gui with value
-	(e_cal_gui_fill_config): get value from gui and store in config
-	(e_calendar_context_destroy): destroy new_cfg and gui properly
-	(process_multi_day): skip item if its multi-day and we don't want
-	to split
-	(fill_widgets): fill local config widgets
-	(create_settings_window): create local config widgets
-	(save_settings): fill config from local widgets
-
-	Fixes #23763
-	
-2002-09-30  Aaron Weber  <aaron@ximian.com>
-
-	* gui/e-itip-control.c (update_item): adjust string on line 1609
-	and 1517.
-
-	* gui/dialogs/alarm-options.glade: rephrase string on line 270
-
-2002-09-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Remove "/Toolbar/New" and
-	"/Toolbar/NewTask" since they're not there any more. Kills some
-	bonobo-ui spewage.
-
-2002-09-26  Dan Winship  <danw@ximian.com>
-
-	Non-Connector part of #29334 (meeting created by a delegate in the
-	delegator's calendar should have the delegator as Organizer).
-
-	* idl/evolution-calendar.idl: add Cal_getEmailAddress, to return
-	the email address associated with a backend (if any).
-
-	* pcs/cal-backend.c (cal_backend_get_email_address): New.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_email_address):
-	Return NULL (for now).
-
-	* pcs/cal.c (impl_Cal_get_email_address): Implement this by
-	calling cal_backend_get_email_address and returning a NotFound
-	exception if it returns NULL.
-
-	* cal-client/cal-client.c (cal_client_get_email_address): New.
-	(cal_client_init, cal_client_destroy, etc): initialize/free
-	email_address
-
-	* gui/dialogs/event-editor.c (event_editor_construct): Split this
-	out of event_editor_init. Take and set a CalClient.
-	(event_editor_new): Take a CalClient.
-
-	* gui/dialogs/task-editor.c (task_editor_construct,
-	task_editor_new): Likewise.
-
-	* gui/dialogs/meeting-page.c (meeting_page_new,
-	meeting_page_construct): Take a CalClient and call
-	cal_client_get_email_address to find the default organizer
-	address. (Also fix a bug if the default account's name has
-	non-ASCII characters.)
-
-	* gui/itip-utils.c (comp_from): New. When sending a REQUEST or
-	CANCEL, use the Organizer as the From address.
-	(itip_send_comp): Call comp_from and pass the result to
-	Composer_setHeaders.
-
-	* gui/comp-editor-factory.c (edit_existing, edit_new): Pass the
-	CalClient to event_editor_new/task_editor_new
-
-	* gui/e-calendar-table.c (open_task): Likewise.
-
-	* gui/e-tasks.c (e_tasks_new_task): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object,
-	gnome_calendar_new_task): Likewise.
-
-2002-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (set_value_at): only change the attendee
-	value if it isn't empty
-
-2002-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix once for all #24210
-
-	* idl/evolution-calendar.idl: changed the notifyObjUpdated method
-	of the QueryListener interface accept a list of UIDs.
-
-	* cal-client/query-listener.[ch] (impl_notifyObjUpdated): likewise for
-	the QueryListener class.
-
-	* cal-client/cal-query.c (obj_updated_cb): changed to adapt the
-	multiple-id's received in the QueryListener class' signal to the
-	one-by-one update notification of the public CalQuery class, thus
-	keeping the changes needed for this minimal.
-
-	* pcs/query.c (add_component, start_cached_query_cb): changed to
-	send sequences of UIDs.
-
-2002-09-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (folder_types): Add "calendar/public"
-	and "tasks/public".
-	(type_is_calendar, type_is_tasks): New utility functions
-	(create_view, create_folder, remove_folder, xfer_folder,
-	sc_user_create_new_item_cb): Use type_is_calendar/type_is_tasks
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): allow
-	importing into public calendar/task folders too.
-
-	* gui/e-itip-control.c: Note that it's intentional that we use
-	"calendar" and "tasks" here instead of "calendar/*" and "tasks/*".
-	(31032)
-
-2002-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): if the item being sent is not
-	a meeting, send it as a mixed item with a description and the
-	calendar text in an attachment
-
-	Fixes #30638
-
-2002-09-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #27961
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_object): set the
-	LAST-MODIFIED time of the components when we save them.
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object,
-	cal_backend_file_get_timezone): return a builtin timezone if we
-	don't find the timezone in our component.
-
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	make sure the start/end for no time palm events are DATE values,
-	tidy code slightly
-
-	Fixes #21631
-	
-2002-09-24  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	convert to date values if the original start and end were both
-	dates
-
-2002-09-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_destroy): unref the query
-	since now the query object on the server keeps a copy of it and
-	must know when the listener is no longer valid.
-
-	* pcs/query.c (listener_died_cb): unref the QueryListener object.
-	(query_construct): create an EComponentListener for the non-cached
-	queries' listeners also.
-
-2002-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: add libeutil to the link
-
-	* conduits/calendar/Makefile.am: ditto
-
-2002-09-23  Dan Winship  <danw@ximian.com>
-
-	* pcs/cal.c (imple_Cal_update_objects, impl_Cal_remove_object):
-	fix non-ANSI switch statements.
-
-	* gui/e-meeting-model.c (is_cell_editable, value_is_empty,
-	process_free_busy_comp): Likewise
-
-	* gui/itip-utils.c (comp_compliant): Likewise.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): install an idle callback that will
-	start the alarm daemon.
-	(launch_alarm_daemon_cb): actually activate the alarm daemon here.
-
-	* pcs/query.c (start_cached_query_cb): remove timeout function always
-	and re-add it if the query is in progress.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (start_cached_query_cb): move success notification code
-	to its own code block, since it was being run for parse errors also.
-	Also, remove all traces of the query from the cache if there is an
-	error. Also, use GINT_TO_POINTER instead of GPOINTER_TO_INT.
-
-2002-09-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #28310
-
-	* gui/alarm-notify/save.c (save_notification_time): only save the
-	new notification time if it is bigger than the already saved one.
-	This should avoid some reminders showing up twice.
-
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-util.c (cal_comp_is_on_server): check to see if the
-	component is already on the server or not
-
-	* gui/comp-util.h: change proto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only delete
-	the event if the summary is empty and the component is not already
-	on the server
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): same
-
-	Fixes #14111
-	
-2002-09-20  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): set the
-	deleted attendees array to size 0 after we clean it up
-
-	Fixes #30479
-	
-2002-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (parse_sexp): remove the query from the cache if it
-	failed.
-	(start_cached_query_cb): notify of errors in the query.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: added a list of EComponentListener's to control the
-	lifetime of the listeners.
-	(query_init): initialize new member.
-	(query_destroy): free new member.
-	(start_cached_query_cb): create a EComponentListener for the new
-	listener being added.
-
-2002-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	More fixes for #24210
-
-	* pcs/query.c: added list of cached queries and changed the Query
-	class to work with several listeners, not only one.
-	(query_init): initialize new members.
-	(query_destroy): free new members.
-	(add_component, remove_component, parse_sexp, match_component,
-	 process_components_cb): notify all listeners.
-	(notify_uid_cb, start_cached_query_cb): implemented integration of
-	cached queries.
-	(query_new): search the query in the cache before creating a new
-	one. And if we create a new one, store it in the cache.
-
-2002-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): bump the
-	month_num by 1 because it indexs at 0
-	(recurrence_page_fill_widgets): lower the month_num by one as above
-
-	Fixes #30381
-	
-2002-09-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #26362
-
-	* gui/e-itip-control.c (show current): add a default reminder if
-	default reminders are set in the configuration.
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): keep
-	the selection if we right click in it (but not on an appointment)
-	(e_day_view_on_main_canvas_button_press): ditto
-
-	* gui/e-week-view.c (e_week_view_on_button_press): same
-
-2002-09-11  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (e_week_view_new_appointment): create a new
-	appointment based on the selection
-	(e_week_view_on_button_press): use above
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_new_meeting): ditto
-
-	Fixes #18162
-	
-2002-09-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_event): duh, don't
-	blindly increment the hour without adjusting for the day
-	boundaries
-
-	Fixes #29983
-	
-2002-09-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #24032
-
-	* gui/e-itip-control.c (init): don't get servers here, since we don't
-	know the type of the component(s) to be loaded.
-	(show_current): get servers here.
-	(destroy): only free stuff that needs to be freed.
-
-2002-09-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): display status messages for
-	all operations we make, so that when using remote slow backends, so
-	that users have always indication of what's happening.
-
-2002-09-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): kill warning
-
-	* gui/e-week-view.h: new proto
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range_visible):
-	select a range of time in the currently visible area, if out side
-	the visible area, select as much as possible
-	(e_week_view_on_text_item_event): call above
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): call above
-
-	* gui/e-day-view.c
-	(e_day_view_set_selected_time_range_in_top_visible): select a
-	range of time in the currently visible area, if out side the
-	visible area, select as much as possible
-	(e_day_view_set_selected_time_range_visible): the same for the
-	main canvas
-	(e_day_view_on_long_event_button_press): call above
-	(e_day_view_on_event_button_press): ditto
-
-2002-09-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): don't try to send via the
-	server if we are publishing; don't bail out on a 0 length to list
-	if we are publishing
-
-2002-09-05  Anna Marie Dirks <anna@ximian.com>	
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Changed the description of
-	the calendar/tasks page of the settings dialog, to be hopefully
-	more descriptive and less awkwardly worded.
-
-
-2002-09-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_drag_data_get): added support for
-	text/x-calendar targets, in which case a VCALENDAR component, with
-	full timezone information is returned.
-
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): don't listen to client
-	signals after we get destroyed
-
-	Fixes #17036
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/event-editor.c (event_editor_send_comp): bail out if
-	we couldn't send the cancel
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): ditto
-
-	* gui/dialogs/comp-editor.c (save_comp_with_send): indicate send
-	status
-	(real_send_comp): return success/fail, only resave the component a
-	if we successfully sent
-	(comp_editor_send_comp): return success/fail
-
-	* gui/itip-utils.h: update proto
-
-	* gui/itip-utils.c (itip_send_comp): return true if we sent the
-	message
-	
-2002-09-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_server_send): provide error message
-	param, give a dialog with the message if we get a busy result;
-	return TRUE if we succeed
-	(itip_send_comp): bail out if we had a problem sending via the
-	server
-
-	* cal-client/cal-client.c (cal_client_send_object): pass back
-	error message if we get the busy exception in the new param
-
-	* cal-client/cal-client.h: update proto
-
-	* pcs/cal.c (impl_Cal_send_object): dump backend error message
-	into Busy exception
-
-	* pcs/cal-backend.h: update proto
-
-	* pcs/cal-backend.c (cal_backend_send_object): take/pass new error
-	message parameter
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): take new param
-
-	* idl/evolution-calendar.idl: add errorMsg to Busy exception
-
-2002-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@unpopulate_folder_context_menu_fn to
-	evolution_shell_component_new().
-
-2002-09-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): don't make the reply
-	component minimal
-
-	Fixes #28956
-	
-2002-08-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): make the sure to list is 0
-	length before sending via imip
-
-	Fixes #29624
-	
-2002-08-30  Mike Kestner  <mkestner@ximian.com>
-
-	* gui/dialogs/event-page.c:
-	* gui/dialogs/task-page.c: use bonobo_object_release_unref to release
-	the remote SelectNames component, not CORBA_Object_release.
-
-2002-08-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_press): select
-	the top canvas if the user right-clicks on it
-	(e_day_view_on_main_canvas_button_press): select the row the user
-	is right-clicking on
-	(e_day_view_on_long_event_button_press): select the top canvas if
-	the user right-clicks on an event there
-	(e_day_view_on_event_button_press): select the relevant rows if
-	the user right-clicks on an event
-	(e_day_view_set_selected_time_range_in_top): select a number of
-	days in the top canvas
-
-	* gui/e-week-view.c (e_week_view_on_button_press): select the day
-	the user is right-clicking on
-	(e_week_view_on_text_item_event): select the corresponding time
-	range when showing the contextual menu for an event
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): select the corresponding
-	time range when showing the contextual menu for an event
-
-	Fixes #14660
-	
-2002-08-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: added missing header file.
-
-2002-08-28  Dan Winship  <danw@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	evolution:shell_component_launch_order and rename
-	evolution:shell_component_icon.
-
-2002-08-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c: use EConfigListener instead of direct access
-	to the bonobo-conf database.
-	(calendar_config_init): create the EConfigListener here, and install
-	an atexit function to unref the config listener object.
-	(config_read, property_change_cb, calendar_config_write,
-	 calendar_config_write_on_exit): removed unneeded functions.
-	(calendar_config_get_*, calendar_config_set_*): changed to make use of
-	EConfigListener directly.
-
-	* gui/main.c (main): removed call to calendar_config_write_on_exit.
-
-	* gui/dialogs/cal-prefs-dialog.c (update_config): removed call to
-	calendar_config_write.
-
-2002-08-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #12326
-
-	* gui/alarm-notify/config-data.c (ensure_inited): create a
-	EConfigListener for configuration access.
-	(do_cleanup): g_atexit installed function, to clean up configuration
-	database resources.
-	(config_data_get_timezone): retrieve the configuration for the
-	EConfigListener object.
-	(config_data_get_listener): new function.
-
-	* gui/alarm-notify/save.c (get_config_db, discard_config_db): removed.
-	Use EConfigListener instead.
-	(save_notification_time, get_saved_notification_time,
-	 save_calendars_to_load, get_calendars_to_load, save_blessed_program,
-	 is_blessed_program): use EConfigListener.
-
-	* gui/alarm-notify/notify-main.c (init_alarm_notify_service): removed.
-	(alarm_notify_factory_fn): create here the alarm_notify_service if it
-	hasn't been created yet.
-	(load_calendars): likewise.
-	(main): don't call init_alarm_notify_service.
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (process_section): if its a
-	non-participant, add it as a resource to match dialog label
-	(set_value_at): if the type is set to be a resource, switch the
-	role to non-participant by default
-
-2002-08-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/calendar-model.c (set_completed): if the value given is a
-	date, convert to a time in the current zone
-
-2002-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): don't set the
-	tasks ui component until the container is set, remove unused
-	pixmaps
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (destroy): disconnect destroy signal
-	callbacks on tables
-
-	Fixes #28231
-
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_toplevel_with_zones): clone the ical
-	component before adding it
-
-	Fixes #29061
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (get_default_event): make sure to get
-	the date in the current zone, not at UTC
-
-	Fixes #17692
-	
-2002-08-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): stop adding redundant
-	information for start/end/due/complete times
-	(write_html): convert newlines properly and escape characters for
-	summary, location, description; put text information on separate
-	line from bolded title to make it look nicer when there are line
-	breaks
-
-	Fixes #26964
-	
-2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]: added internal EComponentListener
-	object, to listen for the activated Cal.
-	(cal_client_class_init): added "backend_died" signal.
-	(cal_client_destroy): clean up component listener.
-	(backend_died_cb): new callback for getting signals from the
-	EComponentListener.
-	(cal_opened_cb): setup component listener.
-	
-	* cal-client/Makefile.am: added libetuil to needed LIBS.
-
-	* gui/gnome-cal.c (backend_died_cb): new callback.
-	(gnome_calendar_construct): connect to "backend_died" signal
-	on all CalClient's we create.
-	
-2002-08-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c (init_widgets): listen for the
-	time editors to change
-	(cal_prefs_dialog_start_of_day_changed): make sure the start is
-	never after the end
-	(cal_prefs_dialog_end_of_day_changed): make sure the end is never
-	after the start
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_set_working_hours): make sure to show a
-	minimum of 1 hour for work day
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	calculate the work/not working color boxes to the nearest pixel,
-	rather the the nearest time division
-
-	Fixes #10286, #26285
-	
-2002-08-13  Dan Winship  <danw@ximian.com>
-
-	* gui/e-itip-control.c: Remove a bunch of old #if 0 code.
-	(update_item): Set X-MICROSOFT-CDO-REPLYTIME here.
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): Don't set it here.
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Use
-	icaltime_current_time_with_zone rather than rolling our own.
-	(cal_component_strip_errors): Remove unused variable.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message on
-	ECalendarTable when opening the tasks.
-	(client_cal_opened_cb): set ECalendarTable status message to NULL
-	when we open the tasks folder. Also, clear up calendar status message
-	in all cases, not only if the folder was opened successfully.
-
-2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): set status message to NULL
-	if there is an error opening the calendar.
-	(client_cal_opened_cb): set status message to NULL only when we have
-	successfully opened the main CalClient.
-
-2002-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_send_comp): set the editor to
-	changed so the item actually gets saved
-
-2002-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (users_has_attendee): check for an attendee in
-	the list
-	(comp_to_list): only add the user if they aren't on the list
-	(comp_server_send): don't remove the users, pass back the list
-	(itip_send_comp): send to server before doing comp_minimal
-
-	* gui/dialogs/comp-editor.c (real_send_comp): edit and save the
-	updated comp
-
-	* pcs/cal.c (impl_Cal_send_object): copy the correct item to pass
-	back
-
-2002-08-08  Dan Winship  <danw@ximian.com>
-
-	* pcs/query-backend.c (query_backend_new): Initialize
-	loaded_backends before using it. (Just kills off a harmless
-	g_warning.)
-
-2002-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #15710
-
-	* cal-util/cal-component.[ch]
-	(cal_component_alarm_get_icalcomponent): new function for getting
-	the icalcomponent from a CalComponentAlarm.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): added
-	X-EVOLUTION-NEEDS-DESCRIPTION property to the default reminder
-	alarm, so that we can identify it when saving the component.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): if the
-	alarm has the X-EVOLUTION-NEEDS-DESCRIPTION property, set the
-	description to be the same as of the component.
-
-2002-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_send_object): just
-	return the object untouched since we don't send anything
-
-	* pcs/cal-backend.c (cal_backend_remove_object): call virtual method
-
-	* pcs/cal-backend.h: add send result codes, new proto
-
-	* pcs/cal.c (impl_Cal_send_object): implement sendObject corba call
-	(cal_class_init): add to epv
-
-	* gui/itip-utils.c (comp_toplevel_with_zones): utility function to
-	create icalcomponent with necessary timezone info
-	(comp_has_attendee): see if attendee is in the attendee list
-	(comp_server_send): use above and remove attendees if the server
-	sends them
-
-	* gui/e-itip-control.c (show_current_todo): remove unused var
-
-	* idl/evolution-calendar.idl: add Busy exception and
-
-	* cal-client/cal-client.c (cal_client_send_object): send object
-	via the server (if the server can)
-
-	* cal-client/cal-client.h: add send results and new proto
-
-2002-08-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch] (query_backend_get_object_component): new
-	function.
-	(query_backend_get_uids): new function.
-	(query_backend_new): create the static GHashTable if it hasn't been
-	created yet.
-	(query_backend_destroy): destroy the static GHashTable if empty.
-	(foreach_uid_cb): call object_updated_cb, which does everything.
-
-	* pcs/query.c: make use of the new QueryBackend class.
-	(query_init): initialize new private structure member.
-	(query_destroy): clean up new member, without freeing it, since it is
-	managed internally in query-backend.c.
-	(query_construct): create a QueryBackend for the query.
-	
-2002-08-04  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes the crash in #19159
-
-	* gui/alarm-notify/alarm-queue.c (create_snooze): check for NULL
-	pointers before using them.
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_init): don't warn if we can't use
-	the small font, just set use_small_font to FALSE
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-itip-control.c (adjust_item): new util function to add
-	information to an itip message that might not already be there for
-	display purposes (summary, location, etc)
-	(show_current_event): use above
-	(show_current_todo): ditto
-
-2002-08-02  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (init): initialize value to corba nil
-
-2002-08-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Use
-	meeting-request-16.png instead of meeting-request.png.
-
-	* gui/calendar-commands.c (pixmaps): Remove pixmaps in
-	/menu/File/New/NewFirstItem/.
-
-2002-08-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (is_overdue): use get_due_status
-	(get_color): ditto
-	(get_due_status): utility function to reduce replicated code,
-	handle the case where the due date is just a date
-
-2002-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query-backend.[ch]: new class for implementing a backend cache
-	for the calendar queries.
-
-	* pcs/Makefile.am: added new files.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Change the order of the
-	user creatable items a bit so that "New Appointment" and "New
-	Meeting" are at the top when in a calendar folder.
-
-2002-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg
-	@folder_type, pass it to
-	evolution_shell_component_add_user_creatable_item().
-	(create_object): Set the right folder types for the various
-	user-creatable items.
-
-2002-07-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_destroy): we no longer need to manually
-	save the state
-	(e_tasks_open): we no longer need to manually load the state
-	(display_view_cb): attach the gal view to the table
-
-	Fixes #27894
-	
-2002-07-29  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): make sure
-	that the work week view goes to the current work week if the day
-	selected is before the start of the work week
-
-	Fixes #20317
-	
-2002-07-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-details-page.c: fixed mapping of popdown menu
-	to ICAL_STATUS_ values.
-	(task_details_page_fill_widgets): when we can't set the status,
-	default to ICAL_STATUS_NONE, which maps to 'Not started'. Fixed
-	use of 'percent' variable, which was being used after being freed.
-	(percent_complete_changed): default to ICAL_STATUS_NONE (Not Started).
-
-	* gui/dialogs/task-details-page.glade: added 'Needs Action' to
-	popdown menu values.
-
-2002-07-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_add_timezones_from_component):
-	new function for adding VTIMEZONE components to a VCALENDAR
-	component.
-
-	* gui/e-calendar-table.c (copy_row_cb): added VTIMEZONE components
-	to resulting VCALENDAR top-level component.
-
-	* gui/e-week-view.c (e_week_view_copy_clipboard): copy to the
-	clipboard a top-level VCALENDAR component, with all the needed
-	VTIMEZONE components.
-	(e_week_view_on_copy): likewise.
-
-	* gui/e-day-view.c (e_day_view_copy_clipboard): likewise.
-	(e_day_view_on_copy): likewise.
-
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): remove useless
-	debug statement
-
-	Probably fixes #19333
-	
-2002-07-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/comp-editor-factory.c (impl_editExisting): focus the editor
-	if it does exist, create a new one if it doesn't (not vice-versa)
-
-	Fixes #23468
-	
-2002-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_init): set large_font to NULL
-	(e_day_view_style_set): calculate large font, fall back to the
-	style->font if necessary
-
-	Fixes #11773
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): display the location in the
-	itip information
-
-	Fixes #24690
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (set_percent): set status to in progress if
-	the percent is between 0 and 100
-	(set_status): if the value is set to in process, change the
-	percent to 50
-
-	Fixes #1590
-	
-2002-07-24  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (time_day_of_year): add a day for the leap
-	year only if we are currently counting Feb., not if the month
-	passed in is Feb.  Fixes #23446.
-
-2002-07-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_realize): use proper meeting icon
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am: Split pcs-backend-file out of libpcs and build
-	it as a separate (noinst) library libpcsfile.a. This gets the db3
-	dependencies out of libpcs, and people trying to create a calendar
-	backend shouldn't be calling functions from the existing backends
-	anyway so there's no reason to install them.
-
-	* cal-util/timeutil.c: Replace a bunch of old gnomecal functions
-	with the functionally identical ones from Connector.
-
-2002-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (get_uri_from_folder_path): if
-	there's an exception, continue with the next item.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* cal-util/Makefile.am: Install libcal-util-static.la
-	and fix the -all-static flag to make it install statically.
-	
-	* pcs/Makefile.am: Install libpcs.a and its headers.
-
-	* pcs/cal-backend-util.h: Same sort of include namespacing fix,
-	but for pcs.
-
-	* pcs/cal.h:
-	* pcs/query.h:
-	* pcs/cal-factory.h:
-	* pcs/cal-backend.h:
-	* pcs/cal-backend-file.h: Same.
-
-2002-07-17    <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use util
-	function to see if the user is the organizer
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): add
-	deleting proto to indicate whether cancelling or deleting is the
-	primary operation
-
-	* gui/dialogs/cancel-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c (delete_cmd): offer to cancel
-
-	* gui/dialogs/task-editor.c (cancel_task_cmd): call
-	cancel_component_dialog with new param
-
-	* gui/dialogs/event-editor.c (cancel_meeting_cmd): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): only update
-	request if user is organizer
-	(e_week_view_show_popup_menu): disable the meeting and meeting
-	organizer mask if appropriate
-	(e_week_view_delete_event_internal): offer to cancel the meeting
-	(e_week_view_on_cut): ditto
-	(selection_received): send request if its a meeting
-
-	* gui/e-day-view.h: add meeting icon/mask
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): disable the
-	meeting and meeting organizer mask if appropriate
-	(e_day_view_delete_event_internal): offer to cancel meeting
-	(e_day_view_on_cut): ditto
-	(e_day_view_finish_long_event_resize): only update request if user
-	is organizer
-	(e_day_view_reshape_long_event): add meeting icon to count
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_on_top_canvas_drag_data_received): only update request
-	if user is organizer
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-	(selection_received): offer to send meeting info
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw meeting icon if
-	appropriate (using dummy icon atm)
-
-2002-07-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #8001
-
-	* importers/icalendar-importer.c (connect_to_shell): new function for
-	connecting the importers (both iCal and vCal) to the shell, needed for
-	some information retrieval about the folders we're importing to.
-	(ical_importer_new, vcal_importer_new): call connect_to_shell.
-	(importer_destroy_cb): unref the shell client object.
-	(get_uri_from_folder_path): retrieve the uri from the storage
-	registry.
-	(check_folder_type): removed.
-
-	* importers/Makefile.am: included libeshell to LIBS.
-
-2002-07-12  Peter Williams  <peterw@ximian.com>
-
-	* pcs/cal.c: Sigh, fix for the wombat.idl -> Evolution-Wombat.idl
-	rename here too. At least grep indicates that's all that needs to
-	be fixed.
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Change the -I flags to get
-	it to play nicely with the new Ebook header paradigm.
-
-	* gui/dialogs/Makefile.am: Same.
-	
-	* gui/e-meeting-model.c: More of the same.
-
-	* gui/dialogs/e-delegate-dialog.c:
-	* gui/dialogs/e-meeting-model.c:
-	* gui/dialogs/comp-editor-util.c: Fix include lines to get
-	ebook headers.
-
-	* pcs/Makefile.am: Same.
-
-2002-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #16034
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* 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):
-	Don't assume all categories have icons when allocating space for
-	the icons.
-
-2002-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New arg @tooltip.
-	Pass it to evolution_shell_component_add_user_creatable_item(),
-	which now has a @tooltip arg.
-	(create_object): Added tooltips.
-
-2002-07-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-config.c (config_read): listen for timezone config
-	change
-	(property_change_cb): set the timezone if it changed elsewhere
-
-	* gui/main.c (init_bonobo): call bonobo_activate because we make
-	bonobo related calls before the bonobo_main call
-
-2002-06-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes #25410
-
-	* gui/alarm-notify.c (AlarmNotify_removeCalendar): do proper
-	cleanup on removal of clients.
-	(alarm_notify_add_calendar): ditto.
-
-2002-06-27  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/itip-utils.c (comp_compliant): plug leak and actually use
-	the minimal comp we create
-	
-2002-06-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.h: add back proto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): add page needs_send signal
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_draw): check to
-	see if the button should be sensitive when drawing
-	(e_meeting_time_selector_construct): listen for the button draw
-	signal
-
-	* cal-util/cal-component.c (cal_component_strip_errors): remove
-	X-LIC-ERROR x properties
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/dialogs/meeting-page.c (change_clicked_cb): set needs_send
-	to true
-	(meeting_page_fill_widgets): set up gui based on if the user or
-	someone else is the organizer
-	(meeting_page_construct): read the addresses here for the combo
-	box
-	(get_widgets): explicitly set the value in list values
-	
-	* gui/dialogs/event-editor.c (set_menu_sens): base this on the
-	exist org and user org values of the comp editor
-	(event_editor_edit_comp): set up editable row restrictions on the
-	meeting model if the user is not an organizer, and don't set needs
-	send if we aren't the organizer initially
-	(model_row_changed_cb): set needs_send to true
-	(row_count_changed_cb): ditto
-
-	* gui/dialogs/meeting-page.glade: update gui
-	
-	* gui/dialogs/comp-editor.c (save_comp_with_send): if the user is
-	not the organizer, REPLY rather than REQUEST
-	(comp_editor_set_existing_org): accessor
-	(comp_editor_get_existing_org): ditto
-	(comp_editor_set_user_org): ditto
-	(comp_editor_get_user_org): ditto
-	(real_edit_comp): determine if there is an existing organizer and
-	if the organizers is a user
-	(page_changed_cb): warn the user that changes may be discarded
-	(page_summary_changed_cb): ditto
-	(page_dates_changed_cb): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_organizer_is_user): determine if the
-	organizer of a component is a user
-	(itip_sentby_is_user): same for sentby field of organizer
-	(comp_sentby): use above routines instead
-	(comp_compliant): strip all X-LIC-ERROR fields generated by
-	libical
-
-	* gui/e-meeting-model.c (is_cell_editable): if there is a list of
-	editable rows, allow only the status column of those rows to be
-	edited
-	(init): init edit_rows
-	(e_meeting_model_restricted_add): add an editable row to the model
-	(e_meeting_model_restricted_remove): remove an editable row
-	(e_meeting_model_restricted_clear): clear all editable rows
-	(e_meeting_model_etable_click_to_add): set the click to add arg on
-	all tables
-	(e_meeting_model_etable_from_model): track the tables
-	(table_destroy_list_cb): remove the table being destroyed from the
-	list
-	(table_destroy_state_cb): remove the table being destroyed from
-	the list
-	
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-itip-control.c (update_attendee_status): kill warning
-	
-2002-06-18  JP Rosevear  <jpr@ximian.com>
-	
-	* zones.h: update for new zones
-
-2002-06-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	Fixes wombat crash (for JP and myself)
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't call add_alarms here,
-	since the client is not yet attached to the backend, and the alarm
-	daemon does unref the client before creating a new one.
-	(client_cal_opened_cb): call add_alarms here.
-
-2002-06-12  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/alarm-notify.c: added timeout_id to LoadedClient structure, to
-	keep track of the timeout function.
-	(retry_timeout_cb): don't use RetryData, but the LoadedClient.
-	(cal_opened_cb): ditto, and assigned lc->timeout_id to the return
-	value of g_timeout_add().
-	(alarm_notify_add_calendar): destroy the timeout callback when
-	destroying the LoadedClient structure.
-
-2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* pcs/cal-factory.c (open_fn): Free the uri_string once we're done
-	with it.
-
-2002-06-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Fix a typo.
-	
-2002-06-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): removed
-	already loaded client when asked to be opened again, and *really*
-	re-open it again.
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus):
-	gal_view_menus_set_show_define_views (..., FALSE);
-
-2002-06-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Set the title of our
-	GalViewCollection.
-
-2002-06-03  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In an attempt to clean up the 
-	config dialog (and to reduce its overall girth), I have re-laid-out the
-	calendar preferences dialog. It now conforms to standard Evolution 
-	spacing and padding guidelines, and exhibits proper alignment, etc.
-
-2002-06-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: keep a reference to the Query object, to avoid
-	crashes when the queries are destroyed before finishing processing.
-	Fixes #25056.
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_comp): new function
-	to get base comp
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_add): get
-	the base comp, not the current comp, don't unref it
-	(foreach_close_cb): block the signal, unblock it if the editor
-	could not be closed
-	(e_comp_editor_registry_close_all): fix preconditions
-	(editor_destroy_cb): get the base comp, not the current comp,
-	don't unref it
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-comp-editor-registry.c (e_comp_editor_registry_close_all):
-	if there are remaining items, return false
-	(foreach_close_cb): don't remove the item if it couldn't be closed
-
-	* gui/e-comp-editor-registry.h: update proto
-
-	* gui/component-factory.c (request_quit): return a boolean
-	indicating if everything was closed
-
-	* gui/dialogs/comp-editor.h: update proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): return true if
-	the editor was closed, false otherwise
-
-2002-05-26  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-comp-editor-registry.[hc]: a registry of comp editors so
-	we can close them all centrally
-
-	* gui/gnome-cal.c (gnome_calendar_init): there is no editor hash
-	now
-	(gnome_calendar_destroy): ditto
-	(gnome_calendar_edit_object): look for the event editor in the
-	registry, if it isn't there, create it and add it to the registry
-
-	* gui/e-calendar-table.c (open_task): look for the task editor in
-	the registry, if it isn't there, create it and add it to the
-	registry
-
-	* gui/component-factory.c (request_quit): close all open editors
-	(create_object): add a request_quit function to the shell
-	component
-
-	* gui/comp-editor-factory.c (free_client): there is no
-	uid_comp_hash to free any more
-	(editor_destroy_cb): we get an OpenClient as callback data now,
-	reduce the editor count and destroy it if it is 0
-	(edit_existing): don't create the Component, add the new editor to
-	the registry, increase the editor count
-	(edit_new): ditto
-	(open_client): set the editor count to 0
-	(impl_editExisting): look in the registry for the editor
-
-	* gui/Makefile.am: Build new sources
-
-	* gui/main.c (main): create the registry
-
-	* gui/dialogs/comp-editor.c (comp_editor_close): prompt to save
-	and then close dialog
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: remove dead summary stuff
-
-2002-05-24  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c (save): check the value returned by
-	gnome_vfs_uri_to_string before using it.
-	(cal_backend_file_open): ditto.
-
-2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_init): Pass the
-	@component_pixmaps in so we give the new "Meeting" button an icon.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): New arg
-	@component_pixmaps to pass in custom pixmaps.
-
-2002-05-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c:
-	* gui/alarm-notify/notify-main.c: ported changes from evolution-1-0
-	to make it work with reminders on remote backends.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): check the string
-	returned by gnome_vfs_uri_to_string, which can be empty. If so,
-	return an error.
-
-2002-05-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_setup_view_menus): set the view
-	to the current view
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (client_cal_opened_cb): added support for
-	CAL_CLIENT_OPEN_PERMISSION_DENIED error code.
-	(permission_error): new function to display 'Permission Denied'
-	error message when opening the calendar.
-
-	* gui/e-tasks.c: likewise.
-
-	* idl/evolution-calendar.idl: added PERMISSION_DENIED to Listener's
-	OpenStatus enumeration.
-
-	* cal-client/cal-client.c (cal_opened_cb): added code for retrieving
-	'Permission Denied' errors, and convert it to CalClientOpenStatus
-	values.
-
-	* pcs/cal-factory.c (open_backend): added code for informing of
-	'Permission Denied' errors.
-
-2002-05-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added PermissionDenied exception and
-	make it be raised in open, updateObjects and removeObject.
-
-	* pcs/cal-backend.h: added CAL_BACKEND_OPEN_PERMISSION_DENIED to
-	CalBackendOpenStatus enumeration, added CalBackendResult enumeration.
-
-	* pcs/cal.c:
-	* pcs/cal-backend.c:
-	* pcs/cal-backend-file.c: adapted to changes in update_objects and
-	remove_object methods.
-
-	* cal-client/cal-client.[ch]: added CalClientResult enumeration.
-	(cal_client_update_object, cal_client_update_objects,
-	 cal_client_remove_object): changed to return a CalClientResult.
-
-	* conduits/calendar/calendar-conduit.c:
-	* calendar/conduits/todo/todo-conduit.c:
-	* importers/icalendar-importer.c:
-	* gui/dialogs/comp-editor.c:
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view.c:
-	* gui/e-itip-control.c:
-	* gui/e-week-view.c:
-	* gui/comp-util.c:
-	* gui/e-tasks.c:
-	* gui/tasks-migrate.c: adapted to changes in cal_client_update_object(s)
-	and cal_client_remove_object.
-	
-2002-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass NULL as
-	@request_quit_fn.
-
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (schedule_page_construct): set the
-	working hours for the meeting time selector
-	
-2002-05-14  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: make the range datetime member a
-	struct not a pointer
-
-	* cal-util/cal-component.c (cal_component_get_recurid): take a
-	pointer to a range
-	(cal_component_set_recurid): ditto
-
-	* gui/itip-utils.c (comp_minimal): get/set the recurrence id
-	properly
-	
-2002-05-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (get_servers): use
-	GNOME_Evolution_Storage__get_folderList instead of
-	GNOME_Evolution_Storage_getFolderList since I have now changed
-	that to be an attribute instead of a method.
-
-2002-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (start_calendar_server): start a server a
-	uri
-	(start_default_server): start a default server
-	(get_servers): get all clients for all folders of the given
-	type(s)
-	(find_server): locate a server for a particular uid
-	(init): get_servers, listen for object_requested signal
-	(destroy): destroy all clients
-	(write_html): put options is there own cell
-	(get_publish_options): place selector in if param is true
-	(get_request_options): ditto
-	(get_real_item): only try and look up the item if we know its in
-	the server
-	(show_current_event): find the server (if any) for the current
-	comp
-	(show_current_todo): ditto
-	(update_attendee_status): if there is no server for the comp, it
-	doesn't exist
-	(remove_item): ditto
-	(button_selected_cb): get a client for the selected folder
-	(object_requested_cb): draw the folder button in
-
-	* gui/calendar-config.h: new protos
-
-	* gui/calendar-config.c (calendar_config_default_tasks_folder):
-	get default tasks uri
-	(calendar_config_default_calendar_folder): get default calendar
-	uri
-
-	* cal-client/cal-client.c (get_default_uri): use
-	cal_util_expand_uri
-
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_expand_uri): tack on the file name
-	if its a file uri
-
-2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_delete_selected):
-	(e_tasks_complete_selected): show progress messages
-	on the status bar.
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: #include <gtk/gtkmain.h> to avoid warnings.
-
-2002-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (free_view_popup): only discard the popup if
-	we created one
-
-2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c: refactored a bit, to not do things in idle loops.
-
-2002-05-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c (print_day_details): modify the start and end hours
-	to accomodate all the events in the day
-
-	* gui/e-day-view.c (free_view_popup): only discard the popup if we
-	created one
-
-2002-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): remove setup_widgets
-	from here
-	(gnome_calendar_init): move setup_widgets back here
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Don't link to libibex anymore!!
-
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_pilot_settings): launch pilot
-	settings capplet
-
-	* gui/e-week-view.c (e_week_view_on_pilot_settings): ditto
-	
-2002-04-24  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view.c (free_view_popup): free the view popup
-	(e_week_view_show_popup_menu): add the view popup to the
-	"main_item" menu and listen for destruction
-
-	* gui/e-day-view.c (free_view_popup): as above
-	(e_day_view_on_event_right_click): as above
-
-	* gui/e-week-view.h: add class member
-
-	* gui/e-day-view.h: add a class member
-
-	* gui/gnome-cal.h: new protos
-
-	* gui/gnome-cal.c (set_view): set the instance view id properly
-	when switching views
-	(gnome_calendar_setup_view_popup): generate a view popup
-	(gnome_calendar_discard_view_popup): destroy a view popup
-
-2002-04-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.c (impl_Cal_get_alarms_in_range): raise an exception if the
-	backend's method returns NULL, since we can't send a NULL pointer to
-	ORBit.
-
-2002-04-19  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages
-	and added accelerators for everything, as part of my config dialog
-	polishing project
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly
-	handle -ve recurrence values
-	(month_num_submenu_selection_done_cb): track the current date in
-	use
-	(make_recur_month_num_submenu): make a submenu of dates
-	(make_recur_month_num_menu): make the date/relation option menu
-	(month_num_menu_selection_done_cb): update the date properly and
-	keep both option menus consistent
-	(month_day_menu_selection_done_cb): keep both option menus
-	consistent
-	(make_monthly_special): listen for selection done signal
-	(make_recurrence_special): destroy old month_num_menu
-	(recurrence_page_fill_widgets): properly handle -ve recurrence
-	values
-
-2002-04-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-day-view.c (e_day_view_on_settings): show the settings
-
-	* gui/e-week-view.c (e_week_view_on_settings): ditto
-
-	* gui/calendar-commands.c (control_util_show_settings): show the
-	settings dialog
-
-	* gui/calendar-commands.h: new proto
-
-	* gui/control-factory.c (control_factory_new_control): set the
-	control as object data on the calendar
-
-2002-04-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/dialogs/meeting-page.c: Updated these to match the new
-	EPopupMenu.
-
-2002-04-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_query): new method.
-
-	* pcs/cal.c (impl_Cal_get_query): call the CalBackend's implementation
-	instead of calling query_new directly.
-
-	* pcs/query.[ch]: fixed headers.
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch
-	used one of the functions I just removed. :)
-
-2002-04-10  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): use the default uri for
-	tasks (as stored in the configuration) when the calendar URI is not
-	a local one (connector, etc).
-
-2002-04-10  Dan Winship  <danw@ximian.com>
-
-	* cal-client/cal-client.c (get_default_uri): Use new-and-improved
-	default folder URI config paths.
-
-	* gui/calendar-config.c (calendar_config_{get,set}_default_uri,
-	calendar_config_{get,set}_default_tasks_uri): Remove these. The
-	shell owns this information now. (Weren't being used anyway.)
-
-	* gui/component-factory.c (get_data_uri): Fix another place that
-	hardcoded tacking foo.ics on to the end of URLs.
-
-2002-04-08  Dan Winship  <danw@ximian.com>
-
-	* gui/component-factory.c (create_view): Add view_info arg. If the
-	view_info is non-empty and this is a calendar folder, set the
-	"view" property on the control's propertybag.
-
-	* gui/control-factory.c (calendar_properties_init): Set up the
-	"view" property.
-	(get_prop, set_prop): handle the "view" property by
-	getting/setting the GnomeCalendar's view. Unfortunately, this
-	doesn't actually work. See #23208.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set the UI
-	component's container before calling
-	gnome_calendar_set_ui_component so that the search bar
-	initialization will work.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-db.[hc]: Remove dead files.
-
-2002-04-06  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/GNOME_Evolution_Calendar.oaf.in: add config_item:type
-
-2002-04-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.c: Fix a string.
-	
-2002-04-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: simple fix for DB3 header inclusion in
-	Mac OS X, by Max Horn <max@quendi.de>
-
-2002-03-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free the my_address member
-	(find_my_address): fall back on a CN match if possible
-	(change_status): handle changing the status of a non-existent
-	address by adding a new attendee
-	(update_attendee_status): if the attendee response is not from a
-	user on the list of attendees, ask the user if they want to add
-	the attendee any how (as an optional participant)
-	(ok_clicked_cb): if we are suppose to rsvp and the status was ok,
-	but the attendee address is not known, find it
-	
-2002-03-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Set a priority for the
-	config item.  Rename to "Calendar and Tasks".
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: s/libversit.la/libversit.a/
-
-	* conduits/todo/Makefile.am: ditto
-
-2002-03-29  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-calendar-table.c: implement new pop up menu items for
-	"Save as", "Print", "Assign Task", "Forward as iCalendar"
-
-	* gui/e-day-view.c: similarly, also "Publish Free/Busy
-	Information" and "New Meeting" and "New Task"
-
-	* gui/e-week-view.c: ditto
-
-	* gui/dialogs/task-editor.c (show_assignment): move the assignment
-	page stuff here
-	(task_editor_show_assignment): use it
-	(assign_task_cmd): ditto
-
-	* gui/dialogs/task-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (save_as_cmd): use new e-util file
-	selector function
-
-	* meeting-mockup.glade: Remove old file
-
-	* topic.dat
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* cal-util/Makefile.am: s/libversit.la/libversit.a/
-
-	* cal-client/Makefile.am: Likewise
-
-	* gui/Makefile.am: Likewise
-
-2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/cal-search-bar.c: Removed `search_menu_items'.
-	(cal_search_bar_menu_activated): Removed.
-	(cal_search_bar_class_init): Don't install.
-	(cal_search_bar_construct): No menu items here.
-
-2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/e-day-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-week-view.c: Updated to use new EPopupMenu API.
-
-	* gui/e-calendar-table.c: Updated to use new EPopupMenu API.
-
-2002-03-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	`e_tasks_set_ui_component()' here to give it the
-	BonoboUIComponent.
-	(tasks_control_deactivate): Likewise, call it here to unset the
-	BonoboUIComponent.
-
-	* gui/e-tasks.c (e_tasks_set_ui_component): New.
-
-	* gui/calendar-commands.c (calendar_control_activate): Call
-	gnome_calendar_set_ui_component() here.
-	(calendar_control_deactivate): ...And here, with a NULL
-	BonoboUIComponent.
-
-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.
-
-2002-03-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c: use bonobo exception macros to tidy
-
-	* gui/itip-control-factory.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/comp-editor-factory.c: ditto
-
-	* gui/calendar-commands.c: ditto
-
-2002-03-14  JP Rosevear  <jpr@ximian.com>
-
-	* idl/evolution-calendar.idl: add all day event editor mode
-
-	* gui/component-factory.c: clean up exception handling
-	(sc_user_create_new_item_cb): support the all day event id
-	(create_object): add a user creatable all day appointment item
-
-	* gui/comp-editor-factory.c (get_default_event): get a default
-	event either all day or starting at the top of the hour
-	(get_default_task): get a default task
-	(edit_new): support the all day event mode
-
-	* gui/calendar-commands.c: remove unused functions/verbs
-
-2002-03-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an
-	"evolution:config_item:icon_path" attribute so we get an icon for
-	the calendar preferences.
-
-2002-03-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: Add <visible>False</visible>
-	to cal-prefs-dialog so it doesn't get shown when we load the Glade
-	file with libglade.
-
-	* gui/component-factory.c (owner_set_cb): Register the
-	ConfigControl factory.
-
-	* gui/tasks-control.c: Removed verb "TaskSettings".
-	(tasks_control_settings_cmd): Removed.
-
-	* gui/calendar-commands.c: Removed verb "CalendarSettings".
-	(settings_cmd): Removed.
-
-	* gui/dialogs/cal-prefs-dialog.c: Renamed `CalPrefsDialogPrivate'
-	to `DialogData'.  Replace `dialog' member with a `page' member.
-	Remove `toplevel_notebook' member.
-	(init_widgets): Renamed from `cal_prefs_dialog_init_widgets'.
-	Just get a DialogData.
-	(get_widgets): Get a DialogData pointer.
-	(cal_prefs_dialog_destroy): Removed.
-	(config_control_destroy_callback): New, signal handler for
-	::destroy for ConfigControl.
-	(cal_prefs_dialog_new): Create a new DialogData, connect all the
-	signal handlers.
-	(create_time_edit): Renamed from
-	`cal_prefs_dialog_create_time_edit'.
-	(cal_prefs_dialog_show): Removed.
-	(cal_prefs_dialog_button_clicked): Removed.
-	(show_task_list_config): Get a DialogData.
-	(show_config): Renamed from `cal_prefs_dialog_show_config'.
-	Likewise.
-	(update_task_list_config): Likewise.
-	(update_config): Renamed from
-	`cal_prefs_dialog_update_config'. Likewise.
-	(color_set_callback): New callback, makes the dialog report
-	changes when the setting in any of the color widgets is changed.
-	(widget_changed_callback): New callback, makes the dialog report
-	changes when any of the widgets changes status.
-	(connect_changed): New utility function to connect this callback
-	to all the widgets.
-	(setup_widgets): Connect all the widgets.
-	(cal_prefs_dialog_new): Call `setup_widgets'.
-
-	* gui/config-control-factory.c: New.
-	* gui/config-control-factory.h: New.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Add
-	OAFIID:GNOME_Evolution_Calendar_ConfigControl and
-	OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory.
-
-2002-03-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	Should fix #21240
-
-	* gui/alarm-notify/alarm-notify.c: replaced use of GnomeVFSURI
-	with EUri, to allow non-registered methods.
-
-2002-03-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): reverted my last
-	change of adding the METHOD property to the incoming request.
-
-	* gui/itip-utils.c (comp_string): added extra
-	X-MICROSOFT-CDO-REPLYTIME property for broken Outlook. Should fix
-	#20783.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_compliant): Reset the DTSTAMP of the new
-	component. (RFC2245 says DTSTAMP corresponds to the time the
-	particular iCalendar representation of the object was created.)
-	Fixes #21198.
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/print.c: remove unneeded parameter from print_text_size
-	everywhere
-	(get_font_for_size): calculate a font size based on the available
-	height
-	(print_text): calculate the top of where the font should be drawn
-	(print_text_size): use get_font_for_size
-	(print_day_background): use get_font_for_size
-
-2002-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): pass the real table
-	to e_meeting_model_etable_view_to_model_row
-	(e_meeting_time_selector_item_paint_busy_periods): ditto
-
-	* gui/dialogs/meeting-page.c (right_click_cb): ditto
-	
-	* gui/e-meeting-model.h: update protos
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): take in to account the
-	fact the table used the without model
-	(e_meeting_model_etable_view_to_model_row): ditto
-
-2002-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added support for printing the Tasks table.
-	I hacked it a bit so the user could choose portrait or landscape mode.
-	This is bug #9677. ETable printing has a few issues, though, and it
-	isn't very pretty.
-
-2002-03-04  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (comp_subject): Prefix the subject with an
-	indicator like "Accepted" or "Cancelled" explaining what the
-	action is, since Outlook doesn't display any of that information
-	inline like we do. (20780)
-
-2002-02-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/gui/e-itip-control.c (e_itip_control_set_data): added the
-	METHOD property to the top level component we create.
-
-2002-02-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/control-factory.c (set_prop):
-	* gui/tasks-control.c (tasks_control_set_property): display an error
-	message if the call to gnome_calendar_open or e_tasks_open does not
-	return TRUE. Fixes #20346.
-
-2002-02-25  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): use
-	GNOME_Evolution_Composer_setBody rather than _setMultipartType and
-	_attachData now, to send a message containing just a text/calendar
-	part. Fixes 14705. Mostly.
-	(comp_content_type): Include the filename here since we can't add
-	a Content-Disposition now.
-
-2002-02-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_class_init): change
-	query_changed to search_activated.
-	(cal_search_bar_search_activated): rename
-	cal_search_bar_query_changed to this.
-
-2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (add_creatable_item): New helper
-	function.
-	(create_object): Add icons for the various user creatable items.
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): pass extra itip_send_comp
-	params
- 	(send_freebusy): ditto
- 	(ok_clicked_cb): ditto, including the timezones culled from the
-	component
- 
- 	* gui/e-week-view.c: pass extra itip_send_comp params
- 
- 	* gui/calendar-commands.c: ditto
- 
- 	* gui/e-day-view.c: ditto
- 
- 	* gui/dialogs/task-editor.c: ditto
- 
- 	* gui/dialogs/event-editor.c: ditto
- 
- 	* gui/dialogs/comp-editor.c: ditto
- 	
- 	* gui/itip-utils.h (itip_send_comp): update proto
- 
- 	* gui/itip-utils.c (foreach_tzid_callback): check the passed in
- 	zones, then the builtin time zones then the client
-
-2002-02-19  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (find_my_address): strip the ical value and
- 	do a case insensitive compare
- 	(find_attendee): ditto
- 	(change_status): put the error message here
- 	(ok_clicked_cb): don't update the item or rsvp unless
- 	change_status was successful, trip the ical value and do a case
- 	insensitive compare
- 
- 	* gui/itip-utils.c (get_address): strip the incoming address
- 	(itip_strip_mailto): use g_strncasecmp
- 	(comp_limit_attendees): strip the ical value and do a case
- 	insensitive compare
-
-2002-02-14  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-meeting-model.c: use new column enums
- 	(set_value_at): emit pre-change/cell change signals
- 	(destroy): destroy refresh_queue and refresh_data
- 	(init): init new elements
- 	(refresh_queue_add): if the attendee is being refreshed already,
- 	possibly update the start/end times to look for and update the
- 	callback info, otherwise add it to the queue
- 	(refresh_queue_remove): remove a refreshing attende from the queue
- 	(process_callbacks): make all the callbacks and remove the
- 	attendee from the queue
- 	(process_free_busy): process the callbacks immediately if parsing
- 	fails or on successful completion of processing
- 	(async_close): process free busy
-	(cursor_cb): we're only looking for one at a time now
- 	(refresh_busy_periods): idle callback to start processing the queue
- 	(e_meeting_model_refresh_all_busy_periods): add every row to the queue
- 	(e_meeting_model_refresh_busy_periods): add a single row to the queue
- 
- 	* gui/e-meeting-model.h: new protos, enum the columns
- 
- 	* gui/e-meeting-time-sel.c: use new compare time function
- 	(e_meeting_time_selector_construct): listen for a cell changed
- 	signal and use separate callbacks for rows_inserted and
- 	rows_deleted
- 	(e_meeting_time_selector_refresh_free_busy): util function to
- 	refresh free busy info
- 	(e_meeting_time_selector_on_update_free_busy): use above
- 	(rows_inserted_cb): refresh free busy on the new rows
- 	(cell_changed_cb): refresh free busy on the row when the address
- 	changes
- 	(rows_deleted_cb): redraw
- 
- 	* gui/e-meeting-utils.[hc]: a holding spot for a meeting time
- 	comparison function
- 
- 	* gui/Makefile.am: compile new files
-	
-2002-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/control-factory.c (set_prop): don't append 'calendar.ics'
-	to the URI.
-	(get_prop): finished.
-
-	* gui/tasks-control.c (tasks_control_set_property): don't append
-	'tasks.ics' to the URI.
-	(tasks_control_get_property): finished.
-
-	* gui/gnome-cal.c (gnome_calendar_open):
-	* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be
-	opened if the uri is local. Leave intact in other cases.
-
-2002-02-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): check if
-	the CalComponentDateTime values are set before trying to use them.
-	Possibly fixes bug #18529.
-
-	* importers/icalendar-importer.c: added vCalendar importer and
-	intelligent GnomeCalendar importer code here, as it shares a lot of
-	code with the iCalendar importer.
-
-	NOTE: check_folder_type() needs to be finished at some point.
-	It needs a new shell Corba call so it can decide whether to import
-	events or tasks into the folder. Currently it just imports both.
-
-	* importers/main.c (importer_factory_fn): create vCalendar importer
-	or GnomeCalendar importer if required.
-
-	* importers/evolution-calendar-importer.h: added declarations for
-	creating a vCalendar importer and intelligent Gnome Calendar importer.
-
-	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer
-	knows what filename to use for audio alarms in vCalendar files.
-	Added libicalvcal-evolution to LDADD.
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar
-	importer and intelligent Gnome Calendar importer.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the event uses UTC. We don't want to flag all events from Outlook,
-	which use UTC.
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: change custom widget
-	creator to e_url_entry_new
-
-	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
-	and its entry
-
-2002-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: add a custom widget created
-	with e_url_button_new
-
-	* gui/dialogs/task-details-page.c (task_details_page_init): init
-	url_button member to NULL
-	(init_widgets): set the url button entry
-	(get_widgets): get the url button
-
-	* gui/calendar-commands.c (pixmaps): use new all day event icon
-
-2002-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-day-view.c: pass meeting boolean for
-	gnome_calendar_edit_object and gnome_calendar_new_appointment_for
-
-	* gui/e-week-view-event-item.c: ditto
-
-	* gui/e-week-view.c: ditto
-
-	* gui/tasks-control.c (confirm_expunge): kill warning
-
-	* gui/calendar-commands.c (new_meeting_cb): show a new meeting
-	dialog
-	(new_event_cb): pass new param
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting
-	boolean and show meeting page if true
-	(gnome_calendar_new_appointment_for): takeing meeting param and
-	pass to above
-	(gnome_calendar_new_appointment): add new param
-
-	* gui/gnome-cal.h: update proto
-
-	* gui/component-factory.c (create_component): take a comp editor
-	mode, determine vtype
-	(sc_user_create_new_item_cb): check for meeting user creatable
-	item
-	(create_object): add meeting as user creatable item
-
-	* gui/comp-editor-factory.c (edit_new): get a comp editor mode
-	now, determine vtype and show meeting page if required
-	(queue_edit_new): get comp editor mode
-	(impl_editNew): ditto, plus queue the mode directly instead of
-	determining the vtype
-
-	* gui/dialogs/event-editor.c (show_meeting): new internal util
-	function to show meeting page
-	(event_editor_show_meeting): show the meeting
-	(schedule_meeting_cmd): use show_meeting
-
-	* gui/dialogs/event-editor.h: new proto
-
-	* idl/evolution-calendar.idl: editNew takes a mode rather than a
-	type now
-
-	* cal-util/Makefile.am: fix includes
-
-2002-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c
-	(gnome_calendar_setup_view_menus): Made these use the new
-	GalViewMenus stuff.
-
-2002-02-06  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): convert months
-	from 1-12 to 0-11. Fixes bug #19235.
-
-2002-02-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (e_todo_gui_new): new gui routines
-	for conduit settings
-	(e_todo_gui_fill_config): ditto
-	(e_todo_gui_fill_widgets): ditto
-	(e_todo_gui_destroy): ditto
-	(e_todo_context_destroy): destroy new_cfg and gui properly
-	(local_record_from_comp): set the priority to the default setting
-	if none is set on the icalendar object
-	(fill_widgets): fill gui widgets
-	(create_settings_window): create gui
-
-2002-01-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): if this is a reply, print the
-	attendee status
-
-2002-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.glade: Use 1 instead of zero as the
-	minimum value for the repetitions spin button as we use a check
-	box to specify whether the alarm has repetitions or not.  Fixes
-	bug #19054.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD):
-	Ooops.  Forgot to use EVOLUTION_CALENDAR_LIBS here.
-
-2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* conduits/calendar/Makefile.am: Use
-	EVOLUTION_CALENDAR_CONDUIT_LIBS and
-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS.
-	* conduits/todo/Makefile.am: Likewise.
-
-	* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and
-	EVOLUTION_CALENDAR_CFLAGS.
-	* cal-util/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* gui/Makefile.am: Likewise.
-
-2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (create_object): Pass a NULL @icon to
-	`evolution_shell_component_add_user_creatable_item()'.
-
-2002-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):
-	return a new configuration struct, load default priority setting
-	(todoconduit_save_configuration): save default priority setting
-	(e_todo_context_new): dupe configuration
-
-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):
-	set ps to NULL
-
-2002-01-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string
-	in the correct variable (str), so it actually gets shown for alarms
-	with specific trigger times. Fixes bug #18801.
-
-2002-01-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): default component
-	classification to PUBLIC. Fixes internal bug #1066
-
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: move all functions here,
-	get rid of header files, use e-pilot-settings to display gui
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/gnome-cal.c (get_current_time): use icaltimetype_to_tm
-	
-2002-01-14  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	figure out when today is and highlight if it is not selected
-
-	* gui/e-week-view.h: enum the "today" color
-
-	* gui/e-week-view.c (e_week_view_realize): init the "today" color
-
-2002-01-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/alarm-notify/save.h: add protos
-
-	* gui/alarm-notify/save.c (save_blessed_program): records a
-	program as blessed
-	(is_blessed_program): checks to see if a program is blessed
-
-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):
-	popup a dialog notifying the user that is a program and let them
-	not see the dialog about this program again
-	(procedure_notification): use above
-
-2002-01-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.c: 
-	* gui/e-itip-control.c (write_label_piece): 
-	* gui/calendar-config.c (on_timezone_set): translate timezone names
-	when displayed. Fixes bug #6544.
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_complete_cmd): new verb
-	callback
-	(sensitize_commands): set sensitivity of mark complete command
-
-	* gui/e-tasks.h: new proto
-
-	* gui/e-tasks.c (e_tasks_complete_selected): mark selected tasks
-	in the table as complete
-
-	* gui/e-calendar-table.h: new proto
-
-	* gui/e-calendar-table.c (e_calendar_table_complete_selected):
-	mark selected rows as complete
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): only need one warning
-	message now
-
-	* gui/e-tasks.c (create_sexp): change the logic to expunge all
-	completed tasks not just hidden ones
-
-2002-01-03  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/tasks-control.c (confirm_expunge): confirm expunging of the
-	tasks
-	(tasks_control_expunge_cmd): verb callback
-
-	* gui/calendar-config.c (config_read): read confirm expunge value
-	(calendar_config_write): write confirm expunge value
-	(calendar_config_write_on_exit): ditto
-	(calendar_config_get_confirm_expunge): get value
-	(calendar_config_set_confirm_expunge): set value
-
-	* gui/calendar-config.h: new proto
-
-	* gui/e-itip-control.c (start_calendar_server): kill warning
-
-	* gui/e-tasks.c (e_tasks_init): init query member to NULL
-	(set_status_message): util function to set status message
-	(e_tasks_open): use above
-	(cal_opened_cb): ditto
-	(create_sexp): create sexp of items to be deleted
-	(query_obj_updated_cb): remove any items found
-	(query_eval_error_cb): bail out on error
-	(query_query_done_cb): tidy when done
-	(e_tasks_delete_completed): set up query
-
-	* gui/e-tasks.h: new proto
-
-	* gui/calendar-model.c (query_query_done_cb): use g_warning
-	instead of printing to stderr
-	(query_eval_error_cb): ditto
-	(update_query): clear the status message if we can't create the
-	query
-
-	* gui/tag-calendar.c (resolve_tzid_cb): make this static
-
-2001-12-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c: remove needs send signal related
-	cruft
-	(save_comp_with_send): with send_component_dialog, indicate if the
-	meeting info is newly created or not
-	(real_edit_comp): remember if the dialog initially needs a send
-
-	* gui/dialogs/send-comp.c (send_component_dialog): take a "new"
-	parameter indicating whether the dialog should intimate if the
-	component to be sent is a new meeting or not
-
-	* gui/dialogs/send-comp.h: update proto
-
-	* gui/dialogs/comp-editor.c: remove no longer used needs_send
-	notification and signal
-
-	* gui/dialogs/comp-editor.h: remove proto
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): add new
-	param to send_component_dialog
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): add new
-	param to send_component_dialog
-
-2001-12-21 JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/comp-editor.h: inherit from bonobo window	
-
-	* gui/dialogs/comp-editor.c: inherit from bonobo window
-	(comp_editor_key_press_event): Look for an escape key press and
-	close the window if found
-
-2001-12-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]
-
-	* gui/main.c (main): Push GdkRGB visual and colormap.
-
-2001-12-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	go slow and clear the map if the last uri and the current uri do
-	not match
-	(post_sync): save the last uri
-
-	* conduits/calendar/calendar-conduit-config.h: handle a last uri
-	config option
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-    	* conduits/calendar/calendar-conduit.c (start_calendar_server):
-    	use the open_default_calendar method
-    
-    	* conduits/todo/todo-conduit.c (start_calendar_server): same as above
-	
-    	* cal-client/Makefile.am: link with bonobo conf
-    
-    	* cal-client/cal-client.h: new protos
-    
-    	* idl/evolution-calendar.idl: make sure open method raises
-    	appropriate exceptions
-    
-     	* gui/e-itip-control.c (start_calendar_server): use
-     	cal_client_open_default_* calls
-     
-     	* cal-client/cal-client.c (real_open_calendar): do the real work
-     	of loading
-     	(cal_client_open_calendar): use above
-     	(get_fall_back_uri): get the basic local uri
-     	(get_default_uri): get the default uri from the config db
-     	(cal_client_open_default_calendar): open the default uri or the
-     	fallback if the method is unsupported
-     	(cal_client_open_default_tasks): same for tasks
-	
-2001-12-17  JP Rosevear  <jpr@ximian.com>
- 
- 	* gui/e-itip-control.c (send_item): use get_real_item
- 	(get_refresh_options): uncomment out
- 	(get_real_item): obtain the real object which has the uid of the
- 	item received
- 	(show_current_todo): use get_refresh_options for refresh method
- 	and provide the description and summary from the real component
- 	since its not in the reply
- 	(show_current_event): ditto
- 	(send_item): use get_real_item
-
-2001-12-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (comp_limit_attendees): can't remove properties
-	in an iteration loop, so remove them outside the loop
-	(comp_minimal): don't set a recurid if there isn't one, add the x
-	properties to the clone
-	(comp_compliant): unref the clone for DECLINECOUNTER
-
-	* gui/e-itip-control.c (get_refresh_options): make function
-	available again
-	(show_current_event): use it here
-	(ok_clicked_cb): can't remove properties in an iteration loop, so
-	remove them outside the loop
-
-	* cal-util/cal-component.c (free_icalcomponent): properly free the
-	attendee list
-	(cal_component_rescan): don't destroy the alarm hash
-
-2001-12-13  Damon Chaplin  <damon@ximian.com>
-
-	* zones.h: new file to contain all timezone names for translation.
-	We won't be using the translations in 1.0.1, but it gives translators
-	time before we do use them in 1.0.2.
-
-	* Makefile.am: added zones.h to EXTRA_DIST.
-
-2001-12-12  JP Rosevear  <jpr@ximian.com>
- 
-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_release):
- 	ungrab the pointer before calling
- 	e_day_view_finish_long_event_resize
- 	(e_day_view_on_main_canvas_button_release): ditto
- 	(e_day_view_finish_long_event_resize): ask if the meeting should
- 	be sent
- 	(e_day_view_finish_resize): ditto
- 	(e_day_view_on_editing_stopped): ditto
- 	(e_day_view_on_top_canvas_drag_data_received): ditto
- 	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2001-12-11  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-model.c (process_free_busy_comp): properly convert
- 	the dtstart and dtend times if they are UTC
- 	(cursor_cb): if we don't have anybody to get f/b info for, process
- 	the callbacks immediately
- 	(e_meeting_model_refresh_busy_periods): take start/end times,
- 	calculate the timet values with object timezone
- 	(e_meeting_model_etable_model_to_view_row): proper cast
- 	(e_meeting_model_etable_view_to_model_row): ditto
-	(async_open): bail out if we couldn't open properly
-
-	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_update_free_busy): use defines for
- 	determining the number of days before and after of free busy to
- 	request
- 	(e_meeting_time_selector_update_dates_shown): use defines for the
- 	number of days shown
- 
- 	* gui/e-meeting-model.h: update proto
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/control-factory.c (control_factory_new_control): removed code
-	that connects to GnomeCalendar's "dates_shown_changed" signal.
-
-	* gui/calendar-commands.c (gcal_calendar_dates_change_cb): 
-	(calendar_control_activate): moved it here, so it gets reconnected
-	whenever the control is activated. Fixes bug #15798.
-
-2001-12-10  Damon Chaplin  <damon@ximian.com>
-
-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable
-	name. Fixes bug #16880.
-
-2001-12-08  JP Rosevear  <jpr@ximian.com>
-  
-  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-  	if we have an alarm that can be represented on the pilot, set the
-  	appointment fields appropriately, if the duration has values for
-  	minutes and/or hours and/or days, use the lowest common
-  	denominator
-  	(comp_from_remote_record): if the appointment on the pilot has an
-  	alarm, find the first alarm an item currently had that is relative
-  	to the start and with a negative duration and update it (or create
-  	a new one if no valid ones exist)
-  
- 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build
-  	list in the order they appear in the component so we get
-  	consisting order for the gui and for the pilot
- 
-2001-12-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): s/%/%s
-
-2001-11-09  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed by Damon)
-
-	Fix bug #14699.
-
-	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND
-	to indicate that the query is not populated as we are waiting for
-	the backend to be opened.
-	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.
-	(query_destroy): Only disconnect from the backend if we are in a
-	state that implies that we are connected to its signals.
-	(query_construct): If the backend is already loaded, immediately
-	set the state to QUERY_START_PENDING.
-	(backend_opened_cb): Disconnect from the backend's "opened"
-	signal.  Set the state to QUERY_START_PENDING.
-	(match_component): We can now only match components if the query
-	is in progress or if it is done.  Assert to that effect, and do
-	not ensure_sexp().
-	(match_component): Do not check for a nonexistent component using
-	g_return_if_fail().  Also, there is no need to ref/unref the
-	component.
-	(backend_obj_updated_cb): Assert to the effect of our state.
-	(backend_obj_removed_cb): Likewise.
-	(parse_sexp): Renamed from ensure_sexp().  Assert that the query
-	has not started.  Do not disconnect from the backend's signals
-	here, since we have no connections.
-	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead
-	of in populate_query().
-
-2001-12-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_get_default_uri):
-	(calendar_config_get_default_tasks_uri): if the key in the config
-	database does not exist, just return the local URIs, but never
-	return NULL
-
-2001-12-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): default
-	component classification to PUBLIC
-
-2001-12-06  Jon Trowbridge  <trow@ximian.com>
-
-        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly
-	destroy the EMeetingModel.  This is a hack to work around problems
-	with the reference counting; we are still leaking the
-	EMeetingModels.
-
-        * gui/e-meeting-time-sel.c
-        (e_meeting_time_selector_construct): Ref our EMeetingModel.
-        (e_meeting_time_selector_destroy): Unref the model.
-
-        * gui/e-meeting-model.c (destroy): Properly destroy
-	corba_select_names with a call to bonobo_object_release_unref.
-        (Fixes 14002)
-
-2001-12-05  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/event-page.glade: added entry for the LOCATION field
-
-	* gui/dialogs/event-page.c: added support for the new LOCATION entry
-	added in the Event editor.
-
-2001-12-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/itip-utils.c (comp_subject, comp_description):
-	Marked strings for translation.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-meeting-model.c: 
-	* gui/calendar-model.c: make sure we call e_table_model_pre_change()
-	before changing the model.
-
-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table): 
-	removed call to e_table_model_changed(). calendar_model_refresh()
-	results in that anyway.
-
-2001-12-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.etspec: disabled 'Alarms', 'End Date' and
-	'Show Time As' fields, as these are not useful for tasks. We may want
-	to reenable them later if we add a table view of calendar events.
-
-2001-12-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-offline-handler.c (backend_cal_opened): connect to
-	"cal_set_mode" signal before calling cal_client_set_mode. Also,
-	s/cal_mode_set/cal_set_mode
-	(backend_go_offline): connect to "cal_opened" signal before calling
-	cal_client_open_calendar
-
-2001-11-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (remove_item): only show the dialog if we
-	created it. Hopefully fixes bug #15774.
-	Also ifdef'ed out a lot of code that isn't currently used, including
-	code to use a label which is never created. The unused code was there
-	to support handling multiple iTIP objects in a message, but was never
-	updated when we switched to use HTML for the control. Fixes bug #16232.
-
-2001-11-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): Set the category of
-	the new task to that of the search bar.  Fixes bug #15533.
-
-2001-11-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-itip-control.c (update_attendee_status):
-	* gui/itip-utils.c (comp_to_list): fixed typos in translatable
-	strings. Fixes Ximian #15456
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c: Substituted gnome_font_get_width_string() with
-	gnome_font_get_width_utf8() and gnome_font_get_width_string_n()
-	with gnome_font_get_width_utf8_sized(). Fixes calendar part of #15379.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (date_value_to_string): Convert the buffer
-	to UTF8.
-	(calendar_model_value_to_string): Do not convert the string fields
-	to UTF8 again; they are already in UTF8.  Fixes the UTF8-related
-	bits of bug #15304.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: 
-	* cal-util/cal-component.h: #ifdef'ed out the LOCATION field for now,
-	since it wasn't supported everywhere, or in the .etspec file.
-
-2001-11-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c: don't abort when e_table_selected_count()
-	returns odd values. There seems to be a bug in ETable. This is to
-	avoid bug #13843.
-
-2001-11-13  Federico Mena Quintero  <federico@ximian.com>
-
-	(committed to CVS by Damon)
-	Fixes bug #15137.
-	
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Do not try
-	to operate on the event if it gets deleted while stopping the
-	edition.
-	(e_day_view_on_event_double_click): Likewise.
-	(e_day_view_on_long_event_button_press): Likewise.
-	(e_day_view_on_event_button_press): Likewise.
-	(e_day_view_on_long_event_click): Likewise.
-	(e_day_view_on_event_click): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-2001-11-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): remove silly
-	debug warning
-
-2001-11-13  Damon Chaplin  <damon@ximian.com>
-
-	* gui/alarm-notify/config-data.c (ensure_inited): 
-	* gui/calendar-config.c (config_read): 
-	* conduits/todo/todo-conduit.c (get_default_timezone): 
-	* conduits/calendar/calendar-conduit.c (get_default_timezone): 
-	make the timezone default to UTC. Fixes bug #14362.
-
-2001-11-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view.c (selection_received): only change the day,
-	month and year for the start date, for not screwing up the start
-	time, which was being set to midnight always (Fixes Ximian #5287)
-	Also, deal correctly with VCALENDAR components
-	
-	* gui/e-day-view.c (selection_received): dela correctly with
-	VCALENDAR components being pasted
-
-2001-11-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/save.c (get_calendars_to_load): The last
-	argument to the bonobo_config_get_XXX_with_default() is a gboolean
-	*, not a CORBA_Environment *.  Fixes bug #14655.
-
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
- 	* pcs/cal-backend-file.c (free_busy_instance): recurrence
- 	expansion callback for free/busy
- 	(create_user_free_busy): expand recurrences and use date/time
- 	values for dtstart and dtend
- 
-2001-11-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.h: new protos
-
-	* gui/e-meeting-model.c (e_meeting_model_get_zone): accessor
-	(e_meeting_model_set_zone): ditto
-	(init): init to the calendar default zone
-	(process_free_busy_comp): take the zone to convert to as a param
-	(e_meeting_model_refresh_busy_periods): redraw properly
-
-	* gui/dialogs/schedule-page.c (update_time): set the zone of the
-	model
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): don't subtract a day
-	from DTEND. For DATE values we don't include the entire day now.
-	Fixes bug #14842.
-
-2001-11-09  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.c (e_week_view_layout_events): fix buffer
-	overflow. Fixes bug #10285 (the printing of lines & dates in the
-	printout of the month view).
-
-2001-11-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/meeting-page.c
-	(meeting_page_fill_widgets): Convert strings to GTK+ encoding.
-	(meeting_page_destroy): Free allocated strings before freeing the list
-	itself.
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_timeout_handler): don't let an empty
-	event occur for all days when auto scrolling
-
-2001-11-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c 
-	(cal_backend_file_compute_changes_foreach_key): don't leak the
-	string returned by cal_component_get_as_string nor the temporary
-	CalComponent we create
-
-2001-11-08  JP Rosevear  <jpr@ximian.com>
-	
- 	* gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove
- 	it if declining (in case it was added before)
- 	(remove_item): Since we can't discern between an item not found
- 	and another error, always say the removal is complete
-
-2001-11-07  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text):
-	Convert generated string to UTF-8.
-
-2001-11-07  JP Rosevear  <jpr@ximian.com>
-
- 	* gui/e-meeting-time-sel.c
- 	(e_meeting_time_selector_on_start_time_changed): emit changed
- 	signal
- 	(e_meeting_time_selector_on_end_time_changed): emit changed
- 	signal, if end time is now before start time and all day event,
- 	make sure a whole day is still selected
- 	(e_meeting_time_selector_drag_meeting_time): calculate the first
- 	and last_time's in whole days for all day events
- 	(e_meeting_time_selector_timeout_handler): calculate the drag time
- 	to be whole days for all day events and scroll the canvas even if
- 	we don't update the time so the user can see where they're headed
-
-2001-11-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): make sure
-	to remove all attendees from the model when we edit a new comp,
-	append the pages if they are needed and we weren't showing them
-	before
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same as above
-
- 	* gui/dialogs/comp-editor.c (comp_editor_remove_page): check for a
- 	return value indicating the page was not found and return if so
- 
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c: #include
-	"Evolution-Addressbook-SelectNames.h", not
-	"../Evolution-Addressbook-SelectNames.h".  Grrr.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_class_init):
-	add a changed signal
-	(e_meeting_time_selector_construct): emit changed signal
-	(e_meeting_time_selector_set_meeting_time): ditto
-	(e_meeting_time_selector_set_all_day): set the all day setting
-	(e_meeting_time_selector_autopick): emit changed signal
-	(e_meeting_time_selector_find_nearest_interval): find proper
-	interval when in all day mode
-	(e_meeting_time_selector_find_nearest_interval_backward): ditto
-	(e_meeting_time_selector_drag_meeting_time): for all day events,
-	move the time when past the 12 hour mark, and and always make sure
-	1 full day is selected, emit changed signal when appropriate
-	(e_meeting_time_selector_update_start_date_edit): set date and
-	time of day together
-	(e_meeting_time_selector_update_end_date_edit): ditto, and adjust
-	display time if all day event
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_draw): remove unused variable
-	(e_meeting_time_selector_item_button_press): for all day mode,
-	make the interval a whole day
-
-	* gui/dialogs/schedule-page.c (update_time): set the meeting time
-	selector setting instead of manual mucking with the e-date-edit
-	widgets
-	(init_widgets): listen to the changed signal of the meeting time
-	selector instead of propagating multiple events as it updates
-
-	* gui/dialogs/event-page.c (update_time): block time zone change
-	signals
-
-2001-11-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): removed ';' in the wrong
-	place. Fixes bug #14421.
-
-2001-11-05  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDFLAGS):
-	-export-dynamic for libglade custom widget.
-
-2001-11-04  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-editor-factory.c (get_default_component): use TZID from the
-	builtin timezone, instead of using the location name.
-
-2001-11-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-util.c (compute_alarm_range): Short-circuit the
-	calculation of the repeat time if there are zero repetitions.
-	(compute_alarm_range): I'm a moron.  De-reference alarm_start when
-	subtracting stuff from it!  Fixes bug #14209.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am: Added rules to generate
-	`Evolution-Addressbook-SelectNames.h'.
-
-	* gui/dialogs/comp-editor-util.h: #include
-	"Evolution-Addressbook-SelectNames.h" from this directory.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c: #include <string.h>
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): If a query is not in
-	progress, just retag the whole thing.  An event may change dates
-	and tag_calendar_by_comp() would not know how to untag the old
-	dates.  Fixes bug #10220.
-
-	* pcs/query.c (start_query_cb): Connect to the backend's
-	"obj_updated" and "obj_removed" signals here instead of in
-	query_construct().  If a query is started while another one is
-	notifying of an update, these signal connections would get appened
-	to the running signal (the one that triggered the notification
-	about an update) and the new signal handlers would also get
-	called.  We are really not interested in updates before we
-	populate the query, because we'll catch the changes anyways.
-
-2001-10-31  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13723.
-
-	* gui/gnome-cal.h (GnomeCalendarClass): New signals
-	"calendar_focus_change", "taskpad_focus_change", and
-	"taskpad_selection_changed".  Renamed "selection_changed" to
-	"calendar_selection_changed".
-
-	* gui/gnome-cal.c (gnome_calendar_get_num_tasks_selected): New
-	function.
-	(setup_widgets): Connect to the focus event signals of the task
-	pad and the calendar view widgets.
-	(gnome_calendar_delete_selection): Renamed from
-	gnome_calendar_delete_event().
-	(gnome_calendar_cut_clipboard): Handle the current focus location.
-	(gnome_calendar_copy_clipboard): Likewise.
-	(gnome_calendar_paste_clipboard): Likewise.
-	(gnome_calendar_delete_selection): Likewise.
-	(table_selection_change_cb): New callback.
-
-	* gui/calendar-commands.c (sensitize_calendar_commands): Take in
-	whether we should unconditionally disable everything.
-	(sensitize_taskpad_commands): Analogous function to the above.
-	(gcal_calendar_focus_change_cb): New callback, used for calendar
-	views.
-	(gcal_taskpad_focus_change_cb): New callback, used for the
-	taskpad.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use a better test for
-	keys that should start editing.  Fixes bug #6447.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c: Make the pre_changes and changes match
-	here.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send as mixed rather than
-	alternative
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/save.c (KEY_CALENDARS_TO_LOAD):
-	Removed.
-	(KEY_NUM_CALENDARS_TO_LOAD): New key, containing the number of
-	calendars to load.
-	(BASE_KEY_CALENDAR_TO_LOAD): New base key name for the URIs of the
-	calendars to load.
-	(save_calendars_to_load): Rewrote to not use a sequence, to work
-	around an ORBit bug that causes bonobo-moniker-xmldb to crash.
-	(get_calendars_to_load): Likewise.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): disconnect
-	signals added in append_page(). Fixes Gtk-Critical warning about
-	GtkAccelGroup being added twice to a window.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): set a body for the message
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): call
-	GNOME_Evolution_Composer_setMultipartType to get a
-	multipart/alternative.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): don't overwrite
-	memory
-	(e_meeting_time_selector_on_end_time_changed): ditto
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c (dup_date_edit_value): return NULL if passed
-	NULL. Should fix bug #14048.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (config_read): Do not ignore the
-	exceptions of the cases that do not have defaults.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_drag_meeting_time): if we are doing all
-	day stuff, make the drag increment 1 day at a time
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_component): Add
-	_() to a string that was missing it.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/meeting-page.c (table_canvas_focus_out_cb): Commit
-	the ETable click-to-add for if the dialog is being destroyed.
-	Should fix bug #13959.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Allocate enough space for the
-	string!  (was missing the null terminator) Possibly fixes #13924.
-	Thanks a *LOT* to Michael Zucchi for running this through Purify.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_button_press): move in whole day
-	increments if we are in all day mode
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_start_time_changed): get rid of
-	localtime call
-	(e_meeting_time_selector_on_end_time_changed): ditto
-	(e_meeting_time_selector_update_start_date_edit): set the date
-	editor using the meeting time fields directly
-	(e_meeting_time_selector_update_end_date_edit): ditto
-
-	* gui/dialogs/schedule-page.c (update_time): do the set_show_time
-	stuff first
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day): don't
-	adjust the time, set the default timezone for date values
-
-2001-10-30  Dan Winship  <danw@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (INCLUDES):
-	s/BONOBO_HTML_GNOME_LIBS/BONOBO_HTML_GNOME_CFLAGS/
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (e_meeting_model_count_actual_attendees):
-	count the actual attendees (doesn't include people delegating
-
-	* gui/e-meeting-time-sel.c: use
-	e_meeting_model_count_actual_attendees (renamed)
-
-	* gui/e-meeting-time-sel-item.c: use
-	e_meeting_model_etable_view_to_model_row calls instead of calling
-	on the model directly, use e_meeting_model_count_actual_attendees
-
-	* gui/e-meeting-model.c
-	(e_meeting_model_etable_model_to_view_row): get the real mapping
-	(e_meeting_model_etable_view_to_model_row): ditto
-	(get_key): e-table-without callback
-	(duplicate_key): ditto
-	(free_gotten_key): ditto
-	(free_duplicated_key): ditto
-	(init): create without model
-	(e_meeting_model_etable_from_model): build etable from without
-	model
-
-	* gui/e-meeting-model.h: update protos
-
-	* gui/dialogs/meeting-page.c (right_click_cb): convert row from
-	view to model row
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): set to the default
-	timezone for DATE values, in case the user switches to a DATE-TIME.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: handle DATE values for Start and Due dates.
-
-2001-10-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/schedule-page.c: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/comp-editor-util.c: updated code to handle DATE values.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): 
-	* gui/e-day-view.c (e_day_view_key_press): updated DATE code.
-
-	* gui/e-cell-date-edit-text.c: 
-	* gui/calendar-model.c: updated to support DATE values.
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): updated
-	to use DATE values in same way as Outlook - i.e. the DTEND date is
-	not included entirely. Though I did make it so that if the DTSTART
-	and DTEND used the same DATE value, it includes the entire day.
-	So 1-day events should be the same. Long All-Day events will be
-	1 day shorter.
-
-	* cal-util/cal-component.c (cal_component_get_start_plus_duration): 
-	don't subtract a day from the end date.
-
-	* gui/tasks-control.c: updated the EPixmap paths for Cut/Copy etc.
-	Removed Print & Print Preview paths, since we don't have menu commands
-	for these any more.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #10016.
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Use
-	bonobo_ui_util_set_ui() instead of doing things by hand.  Hmmm, if
-	only that function had a way of telling us whether it failed so
-	that we could avoid setting the verb list...
-
-	* gui/dialogs/event-editor.c (event_editor_init): Do not pass the
-	filename with the full path so that Bonobo can find it in a smart
-	way.
-
-	* gui/dialogs/task-editor.c (task_editor_init): Likewise.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use an
-	EMessageBox instead of a gnome_dialog_question so that the label
-	gets line breaking.  Fixes bug #11260.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #13649.
-
-	* gui/calendar-config.c
-	(calendar_config_get_use_default_reminder): New function.
-	(calendar_config_set_use_default_reminder): New function.
-	(calendar_config_get_default_reminder_interval): New function.
-	(calendar_config_set_default_reminder_interval): New function.
-	(calendar_config_get_default_reminder_units): New function.
-	(calendar_config_set_default_reminder_units): New function.
-	(config_read): Get the options for default reminders.
-	(calendar_config_write): Set the options for default reminders.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Set the default reminder widgets from the config values.
-	(cal_prefs_dialog_update_config): Set the config values from the
-	widgets.
-
-	* gui/comp-util.c (cal_comp_event_new_with_defaults): New
-	function; creates a VEVENT component with the default alarm.
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	cal_comp_event_new_with_defaults ();
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	* gui/calendar-model.c (calendar_model_append_row): Likewise.
-	* gui/comp-editor-factory.c (get_default_component): Likewise.
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): Likewise.
-
-	* cal-util/cal-component.c (ensure_alarm_properties_cb): Ensure we
-	have a DESCRIPTION property.
-	(cal_component_commit_sequence): Ensure we have the mandatory
-	alarm properties.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_section): process an individual
-	section here
-	(select_names_ok_cb): call above
-	(get_select_name_dialog): listen for ok:dialog signal
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* importers/Makefile.am (evolution_calendar_importer_LDADD): 
-	* gui/Makefile.am (evolution_calendar_LDADD): 
-	* cal-util/Makefile.am (test_recur_LDADD): 
-	* cal-client/Makefile.am (client_test_LDADD): use libical-evolution.la
-
-	* gui/dialogs/schedule-page.c: save the timezone passed in for the
-	start time, so if our times are changed we use this. Also, if the
-	end time was passed in in a different timezone, convert it.
-	Also hide the time fields for DATE values. Note that DATE values still
-	do not work.
-
-	* gui/dialogs/meeting-page.glade: changed "Invite Others" to
-	"Invite Others..." to be consistent with the other page.
-
-	* gui/dialogs/event-page.c (times_updated):
-	(all_day_event_toggled_cb): set is_date if appropriate.
-
-	* gui/e-itip-control.c (write_label_piece): convert all UTC times to
-	the current timezone. Outlook sends simple, non-recurring, events as
-	UTC times, which isn't very useful.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/main.c (launch_alarm_daemon): Launch the alarm daemon as
-	soon as the calendar component is started.  Fixes bug #13867;
-	we can't really do much better than this.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control.c (pixmaps): Fix the verb names for the
-	pixmaps in the Edit menu; they were out of synch with the XML
-	UI description.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_dump_active_backends): new
-	function.
-	(dump_backend): new function.
-
-	* pcs/cal-factory.h: add prototype for
-	cal_factory_dump_active_backends.
-
-2001-10-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #12163.
-
-	* cal-util/cal-util.c (compute_alarm_range): Take alarm
-	repetitions into account.
-	(add_alarm_occurrences_cb): Add alarm repetitions.
-	(generate_absolute_triggers): Likewise.
-	(generate_absolute_triggers): Oops, absolute triggers are in UTC,
-	so convert them as such.  Also, pay attention to the timezones of
-	the dtstart and dtend properties.
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* importers/Makefile.am: include the header as a source so it gets
-	dist'ed.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* importers/Makefile.am (INCLUDES):
-	s/BONOBO_CFLAGS/BONOBO_GNOME_CFLAGS/.
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/icalendar-importer.c (load_file_fn): fixed URI
-	construction, which was preventing importing into the root
-	calendar (~/evo/local/Calendar/)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): handle date
-	values
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* importers/: added evolution-calendar-importer binary, starting
-	with an iCalendar file importer
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit-config.h
-	(todoconduit_load_configuration): get the management object by id
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): ditto
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-config.[ch] (calendar_config_get_default_uri):
-	(calendar_config_set_default_uri):
-	(calendar_config_get_default_tasks_uri):
-	(calendar_config_set_default_tasks_uri): new functions for setting
-	and retrieving the default calendar URIs
-
-	* gui/e-itip-control.c (init): don't use
-	hard-coded URI, but use the default calendar URI, as returned
-	by calendar_config_get_default_uri
-	(start_calendar_server): added a "gboolean tasks" parameter, so
-	that the local tasks.ics file is used if the calendar to be
-	started is for tasks when no default tasks URI is found in
-	the configuration
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (add_record): unref the
-	comp when finished
-
-	* conduits/todo/todo-conduit.c (add_record): ditto
-	
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): added break
-	statements after each case, when setting the classification.
-	Fixes bug #13772.
-
-2001-10-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): removed this
-	function, as we don't need to unref at all the WombatClient
-	object, since it is aggregated to the CalListener object, which
-	will take care of unrefing it (Fixes Ximian #12001)
-	(cal_client_open_calendar): create the WombatClient here
-
-2001-10-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_todo_details): get the tasks directly from the
-	CalendarModel, so we get the filtering & sorting for free. Fixes
-	bug #10280. Hmm. This seems too easy. It isn't going to work is it...
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad): new function to get
-	the TaskPad ECalendarTable, for printing.
-
-	* gui/calendar-model.c: 
-	* gui/calendar-config.c (calendar_config_get_hide_completed_tasks_sexp): 
-	split this out from calendar-model.c so we could use it for printing,
-	but ended up doing that a different way.
-
-	* gui/dialogs/task-page.c (init_widgets): removed a duplicated signal
-	connected to field_changed_cb().
-
-2001-10-27  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_week_view): 
-	(range_selector_new): when the week start day is set to Sunday, we
-	have to be careful to make sure we print the correct week, since
-	the previous Saturday is actually printed first. Fixes bug #13687.
-	(print_week_summary): always set compress_weekend to true if
-	multi_week_view is FALSE (i.e. we are printing the week view).
-	Fixes bug #13688.
-
-	* gui/e-itip-control.c (send_freebusy): use the timezones from the
-	DTSTART and DTEND.
-	(write_label_piece): output the date-time and the timezone after it.
-	Note that we may want to convert it to the current timezone and display
-	that as well. Also converted COMPLETED to the current timezone.
-	And fixed all uses of old timezone functions.
-
-	* gui/dialogs/comp-editor.c (commit_all_fields): added function to
-	set the focus in the window to NULL, so all fields lose their focus,
-	so they emit "changed" signals and update their values if needed.
-	We call this when most menu commands are used, e.g. 'Save and Close',
-	'Print' etc. Fixes bug #11434. In future we should also check fields
-	are valid and show dialogs if they are not.
-
-	* gui/calendar-model.c (get_completed): use the completed value
-	properly. Fixes bug #13694.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): don't check
-	from_zone and to_zone != NULL. A NULL zone is valid, it is for
-	floating times.
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing
-	if the user presses Escape.
-
-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.
-
-	* gui/cal-search-bar.c: #include <string.h>
-
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Delete
-	appointments with empty summaries.  Fixes Ximian bug #780.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Added an
-	argument to specify whether we unconditionally want single
-	components to be considered as not having a summary.
-
-	* gui/comp-util.c (cal_comp_confirm_delete_empty_comp): New
-	function.
-
-	* gui/misc.[ch]: New files with miscellaneous utility functions;
-	moved string_is_empty() over from calendar-model.c.
-
-	* gui/calendar-model.c: Use the string_is_empty()
-	function from misc.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added misc.[ch] to
-	the list of sources.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): touch on
-	lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(match): touch on lookup
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	touch the record on lookup
-	(check_for_slow_setting): write touched only if slow sync
-	(pre_sync): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove the merges as
-	valid sync types
-
-	* conduits/todo/e-todo.conduit.in: as above
-
-	* conduits/calendar/calendar-conduit.c (pre_sync): write out only
-	the touched records if we are doing copies
-
-	* conduits/todo/todo-conduit.c: as above
-	
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_load_configuration): get the sync type
-
-	* conduits/todo/todo-conduit-config.h: as above
-	
-2001-10-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (write_label_piece): convert the formatted
-	date to UTF-8.
-
-	* cal-util/cal-recur.c (CAL_OBJ_DEBUG): turn off debug functions.
-
-	* gui/dialogs/comp-editor-util.c (parse_contact_string): handle UTF8
-	correctly. Bug #4450. Good enough for 1.0.
-
-	* gui/e-week-view-event-item.c (e_week_view_draw_time): set the gc
-	color before drawing. Should fix bug #11469.
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show or hide the
-	meeting page as appropriate. Note this may be called more than once,
-	if the task gets updated somewhere else and the user clicks 'Update
-	the object'. Hopefully fixes bug #12930.
-
-	* gui/print.c (print_comp_item): printed more fields and made a little
-	prettier. Fixes bug #9352.
-	(print_date_label): used the correct timezones for each date field.
-
-	* *.c: removed several debug messages.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	make debug output more accurate
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/todo/todo-conduit.c (pre_sync): remove the uid from the
-	map if was archived and is now deleted
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2001-10-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar_table.c (delete_selected_components):
-	(selection_received): added status bar messages
-
-	* gui/e-day-view.c (e_day_view_cut_clipboard):
-	(selection_received): likewise
-
-	* gui/e-week-view.c (e_week_view_cut_clipboard):
-	(selection_received): likewise
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.h: modify fields
-
-	* conduits/todo/todo-conduit.h: as above
-
-	* conduits/calendar/calendar-conduit.c (print_remote): free the
-	struct after use
-	(e_calendar_context_new): explicitly init context fields
-	(e_calendar_context_destroy): free local records and properly free
-	changed hash elements
-	(start_calendar_server_cb): tidy
-	(start_calendar_server): ditto
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer to avoid leaks
-	(local_record_from_comp): only copy over alarm stuff from the
-	original record, we sync everything else
-	(local_record_from_uid): unref the comp when we are done
-	(pre_sync): free change_id
-	(post_sync): ditto
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-	* conduits/todo/todo-conduit.c: as above
-	
-2001-10-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for
-	every CORBA call.  Hopefully will fix #11978, but I'm not sure
-	about what else could be happening.
-	(cal_get_password): Free the exception.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,
-	so we can translate them.
-
-2001-10-25  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from
-	any positive BYSETPOS value, since our array is 0-based.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): 
-	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly
-	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.
-	So to be compatable with it we now do the same, although we still
-	accept and convert the old format.
-
-	* cal-client/cal-client.c (cal_client_get_component_as_string): new
-	function to return a complete VCALENDAR string containing a VEVENT
-	or VTODO with all the VTIMEZONEs it uses.
-
-	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we
-	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #8626.
-	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will
-	not import it otherwise.
-
-	* gui/dialogs/comp-editor.c (page_mapped_cb): 
-	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.
-	(comp_editor_append_page): connect to the map/unmap signals to
-	install/uninstall the accelerators. (This is all for bug #11609,
-	though of course it doesn't work too well in GTK+ 1.2 anyway.)
-
-	* gui/dialogs/task-page.c (get_widgets): 
-	* gui/dialogs/task-details-page.c (get_widgets): 
-	* gui/dialogs/schedule-page.c (get_widgets): 
-	* gui/dialogs/recurrence-page.c (get_widgets): 
-	* gui/dialogs/meeting-page.c (get_widgets): 
-	* gui/dialogs/event-page.c (get_widgets): 
-	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from
-	the original window, ref'ed it and placed it in the CompEditorPage
-	struct.
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
-	any GtkAccelGroup for the page.
-
-	* gui/dialogs/task-page.glade: changed '_Confidential' to
-	'Con_fidential' as it clashed with '_Contacts'. It now matches the
-	event editor as well.
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom
-	EDateEdit widgets, and set them as the accel targets of the labels.
-
-2001-10-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): show an error message when
-	we can't update the object on the calendar server
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/control-factory.c: Ifdef-ed out the PersistFile bits.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: The tasks folder does not
-	support the PersistFile interface; removed it.  Removed it as well
-	from the calendar folder since it is aggregated but not actually
-	implemented.
-
-2001-10-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Handle tasks folders as
-	well; was always using "calendar.ics" as the filename.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: added sections for Tasks
-	factory and control. I hope someone checks these!
-
-2001-10-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (xfer_folder): Fixed to only copy the
-	`calendar.ics' and `calendar.ics~' files.
-
-2001-10-24  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): when
-	iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'.
-	That meant it wasn't working at all well when an entire VCALENDAR
-	was passed in.
-
-	* cal-util/cal-component.c: handle DURATION property used instead of
-	DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART
-	+ DURATION if necessary. In set_dtend/due we remove any DURATION
-	property. Fixes bug #11262.
-
-	* gui/e-meeting-model.c (build_etable): 
-	* gui/e-calendar-table.c (e_calendar_table_init): use U_ for the
-	ECellCombo popdown strings, as it expects UTF-8 strings.
-
-2001-10-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
-	track the spacer vbox
-	(e_meeting_time_selector_style_set): make sure the rows are the
-	correct size for the style
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): slight adjustments
-	to where the text is drawn
-
-	* gui/e-meeting-time-sel.h: new member
-
-	* gui/e-meeting-model.c (build_etable): ensure uniform row height
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): mark
-	status as completed in appropriate places and don't overwrite
-	legitimate percentages and such
-
-2001-10-24  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5282.
-
-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): New function
-	to avoid copying the same code all over the place.
-	(icaltimetype_to_tm): Also set the tm.tm_wday.
-
-	* gui/alarm-notify/alarm-queue.c (queue_midnight_refresh): Use
-	time_day_end_with_zone().
-	(load_alarms_for_today): Likewise.  And oops, we were only
-	computing the times and not loading the alarms.
-	(obj_updated_cb): Likewise.
-	(load_alarms): Removed assertion that is no longer valid because
-	we may load the alarms for a client in two stages.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Convert absolute
-	trigger times to the local timezone.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):
-	Convert the times to the local timezone.
-	(alarm_notify_dialog): Likewise, for the window title.
-	(alarm_notify_dialog): Set the window layer to WIN_LAYER_ONTOP.
-
-	* gui/e-cell-date-edit-text.c (ecd_get_text): Use
-	icaltimetype_to_tm_with_zone().
-
-	* gui/alarm-notify/save.c (get_config_db): Made public.
-	(discard_config_db): Made public.
-
-	* gui/alarm-notify/config-data.[ch]: New files with functions to
-	fetch the calendar configuration data used by the alarm daemon.
-
-2001-10-23  Damon Chaplin  <damon@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_event_dates_match): make sure
-	we free all the CalComponentDateTime's when we are finished.
-
-	* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just
-	return if no time range is set.
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_table_vadjustment_changed): adjust the
-	display canvas when the table scrolls
-	(e_meeting_time_selector_construct): listen for table scrolling
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (build_etable): no longer set the
-	scrollbar policy here
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_update_main_canvas_scroll_region): add an
-	extra row to the height so the click to add row can be properly
-	seen
-	(e_meeting_time_selector_construct): set the scrollbar policy for
-	the etable scrolled
-
-2001-10-23  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/timeutil.c (icaltimetype_to_tm): convert an
-	icaltimetype to a tm
-	(tm_to_icaltimetype): vice versa
-
-	* cal-util/timeutil.h: new protos
-
-	* conduits/calendar/calendar-conduit.c: replace all mktime and
-	localtime calls (except for debugging calls)
-
-	* conduits/todo/todo-conduit.c: ditto
-	(comp_from_remote_record): make sure the completed time is in UTC
-	
-2001-10-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-query.c (cal_query_construct) set priv->corba_query
-	to CORBA_OBJECT_NIL if there was an error
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: added setDefaultTimezone() method.
-
-	* pcs/cal-backend.c (cal_backend_get_default_timezone): 
-	(cal_backend_set_default_timezone): new functions to call class
-	methods.
-
-	* pcs/cal-backend-file.c: lots of changes to handle the default
-	timezone and use it.
-
-	* pcs/query.c: use the default timezone.
-
-	* gui/dialogs/task-details-page.c (date_changed_cb): initialized
-	completed_tt.
-
-	* gui/dialogs/event-page.c: changed it to handle DATE values. The
-	'All Day Event' checkbox is only set now when the DTSTART and DTEND
-	are DATE values.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_free_dates): free the
-	CalComponentDateTime structs as well.
-
-	* gui/e-tasks.c: set the default timezone on the server.
-
-	* gui/tag-calendar.c: 
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: updates to handle DATE values.
-
-	* gui/e-calendar-table.c (date_compare_cb): updated to use the new
-	ECellDateEditValue values, so it now works.
-	(percent_compare_cb): updated to use GPOINTER_TO_INT values.
-	(e_calendar_table_init): use an ECellPercent for the percent field
-	and an ECellDateEditText for the date fields.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
-	if the DTSTART or DTEND is a DATE value. We don't want to show the
-	timezone icons for DATE values.
-
-	* gui/comp-editor-factory.c (resolve_pending_requests): set the default
-	timezone on the server.
-
-	* gui/calendar-model.c: major changes to support sorting properly.
-	For date and percent fields we now use subclasses of ECellText, so
-	we don't use a char* as the model value. For the percent field we now
-	use a GINT_TO_POINTER. For the date fields we now use a
-	ECellDateEditValue* as the value.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	set the timezone and use_24_hour flags of the new ECellDateEditText.
-
-	* conduits/todo/todo-conduit.c (pre_sync): 
-	* conduits/calendar/calendar-conduit.c (pre_sync): set the default
-	timezone on the server.
-
-	* cal-util/timeutil.c (time_days_in_month): removed debug message.
-
-	* cal-util/test-recur.c: try to handle timezones in the iCalendar
-	file properly, and updated to pass default timezone.
-
-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp):
-	(cal_util_generate_alarms_for_list): added default timezone argument.
-
-	* cal-util/cal-recur.c: changed many of the functions to take a default
-	timezone, to use to resolve DATE and floating DATE-TIME values.
-
-	* cal-client/cal-client.c (cal_client_set_default_timezone): new
-	function to set the default timezone.
-	(cal_client_ensure_timezone_on_server): new function to ensure that
-	a given timezone is on the server.
-
-	* gui/e-cell-date-edit-text.c: new subclass of ECellText to display
-	and edit a date value.
-
-	* cal-util/cal-recur.c (cal_obj_byday_expand_monthly): changed week_num
-	to -week_num when calculating the weeks to go back from the end of the
-	month for things like BYDAY=-2WE. Fixes bug #11525.
-	(cal_recur_generate_instances_of_rule): only go up to MAX_YEAR (2037).
-	We can't really handle anything past that anyway.
-	(cal_recur_ensure_rule_end_date): initialize cb_date.end_date to 0,
-	so if the RULE doesn't generate COUNT instances we save 0 as the
-	time_t.
-
-2001-10-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-control-factory.c (tasks_control_factory_fn): Put up a
-	warning dialog box if we failed to create the tasks control.
-	Fixes bug #13033.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): write out the correct
-	time in the control
-
-	* pcs/cal.c (build_fb_seq): utility function to build sequences of
-	f/b data
-	(impl_Cal_get_free_busy): use above so we never return a NULL
-
-	* conduits/calendar/calendar-conduit-config.h
-	(calconduit_save_configuration): fix c/p error
-	(calconduit_load_configuration): ditto
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/dialogs/meeting-page.c (meeting_page_destroy): we don't need
-	to save the state
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
-	ditto
-
-	* gui/e-meeting-model.c (build_etable): listen for the etable
-	being destroyed
-	(table_destroy_cb): save the state when the etable is destroyed
-
-2001-10-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.c (init_widgets): listen for changes
-	in the date editors
-	(schedule_page_set_dates): update the times when they change
-	elsewhere
-	(update_time): set the time in the dialog
-	(time_changed_cb): notify of changed times
-	
-	* gui/dialogs/comp-editor.c (page_dates_changed_cb): don't call
-	the set dates function on the page that noted the change
-	(page_summary_changed_cb): same for set summary function
-	
-	* gui/dialogs/event-page.c (update_time): move time setting stuff
-	to util function
-	(event_page_set_dates): use it
-	(event_page_fill_component): ditto
-
-	* gui/e-meeting-time-sel.h: fix comment
-
-2001-10-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert
-	if we fail to load the URI list.  This would of course have been a
-	bonobo-conf activation problem.
-	(remove_uri_to_load): Likewise.
-
-	* gui/alarm-notify/notify-main.c (load_calendars): Likewise.
-
-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the
-	time range half-open so that we do not display the last alarm
-	twice.
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_set_status_message): make
-	it a public function
-
-	* gui/e-tasks.c (e_tasks_open): display progress messages
-	(cal_opened_cb): clean up status bar messages
-
-	* gui/gnome-cal.c (gnome_calendar_open): display progress messages
-	(client_cal_opened_cb): clean up status bar messages
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* gui/calendar-model.c (set_status_message): new function
-	(update_query): call set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-	(get_location, set_location): new functions for setting and
-	retrieving the location in the calendar model
-
-2001-10-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): keep a reference to the
-	EvolutionShellClient component
-
-	* gui/e-week-view.c (e_week_view_set_status_message): new function
-	(update_query): call e_week_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/e-day-view.c (e_day_view_set_status_message): new function
-	(update_query): call e_day_view_set_status_message
-	(query_query_done_cb):
-	(query_eval_error_cb): clean up status bar messages
-
-	* gui/Makefile.am: added EVOLUTION_IMAGESDIR to CFLAGS
-	
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-	(e_meeting_time_selector_on_invite_others_button_clicked): call
-	the invite others dialog in the model
-
-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick
-	attendee type based on role and cutype
-
-	* gui/e-meeting-attendee.h: remove proto
-
-	* gui/Makefile.am: compile select names idl
-
-	* gui/e-meeting-model.h: new proto
-
-	* gui/dialogs/meeting-page.c: remove invite others dialogs bits
-	from here
-
-	* gui/e-meeting-model.c (e_meeting_model_invite_others_dialog):
-	and put them here
-	
-	* gui/dialogs/Makefile.am: compile corba bits in parent dir
-
-	* gui/dialogs/comp-editor-util.h: reflect above in includes
-
-	* gui/dialogs/e-delegate-dialog.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto and clean includes
-	
-2001-10-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c: add html widget
-	(url_requested_cb): add function to load images from file as they
-	are requested.
-	(write_html_heading): convert to using html.
-	(alarm_notify_dialog): convert to use html display.
-	(make_html_display): this is the function the custom widget in the
-	galde file uses to create the html widget.
-
-	* gui/alarm-notify/alarm-notify.glade: add placeholder for the
-	custom html widget.
-
-	* gui/alarm-notify/Makefile.am: add flags for gtkhtml and gal.
-	
-2001-10-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Adds session management for the alarm daemon.  Also makes it store
-	a list of calendars to be monitored.  Those calendars will all be
-	loaded when the alarm daemon starts up.
-
-	* idl/evolution-calendar.idl (AlarmNotify): Removed the ::die()
-	method.  The alarm daemon now handles termination via the session
-	manager's commands.
-
-	* gui/alarm-notify/notify-main.c (set_session_parameters): New
-	function, sets some parameters so that the session manager can
-	restart the daemon via the evolution-alarm-client program.  Also,
-	sets up the "die" signal so that the daemon can terminate when the
-	session ends.
-	(load_calendars): New function to load the calendars on startup.
-	(main): Set the session parameters.  Load the calendars on startup.
-
-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): New
-	function, moved over from the impl_ function.  Added a
-	load_afterwards argument to indicate whether the calendar should
-	just be loaded or if it should also be added to the list of
-	calendars to load on startup.
-	(AlarmNotify_addCalendar): Use alarm_notify_add_calendar().
-	(AlarmNotify_removeCalendar): Remove the calendar from the list of
-	calendars to load on startup.
-
-	* gui/alarm-notify/save.c (save_calendars_to_load): New function,
-	saves a sequence of the URIs to load.
-	(get_calendars_to_load): New function, loads a sequence of
-	calendars to load.
-
-	* gui/alarm-notify/alarm.h: Removed stale prototype for alarm_init().
-
-	* gui/component-factory.c (remove_folder): Ask the alarm daemon to
-	stop monitoring alarms for the folder that is being deleted.
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-time-sel.c
-
-	* gui/e-meeting-time-sel-item.c
-	(e_meeting_time_selector_item_paint_day_top): use 12 or 24 hour
-	settings
-
-	* gui/e-meeting-time-sel.c: strings for 12 hour setting
-	(e_meeting_time_selector_construct): increase width slightly
-	
-	* gui/e-meeting-time-sel.h: extern the new char array
-
-2001-10-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-component.[ch] (cal_component_get_location):
-	(cal_component_set_location): new functions
-
-2001-10-18  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/e-meeting-model.c (process_callbacks): util routine to
-	handle calling back
-	(async_close): use above
-	(e_meeting_model_refresh_busy_periods): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): translate
-	1-5 priorites to 1-9 priorities better
-	(comp_from_remote_record): ditto
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-	
-	* idl/evolution-calendar.idl: allow some decent exceptions
-
-2001-10-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/query.c (match_component): there may be cases when the backend
-	will return an invalid component from a valid UID (an UID returned
-	by the get_uids method), so don't abort if that's the case
-
-2001-10-15  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have
-	any others?
-
-2001-10-15  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (set_icon_from_comp): remove warnings.
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (process_multi_day):
-	function to break up multi day events into single events for both
-	evo and the pilot and create new CalClientChange structures
-	(pre_sync): call above function, and adjust changed list if
-	necessary
-
-2001-10-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (is_all_day): util function
-	to determine if event is all day
-	(local_record_from_comp): use new util function
-	(comp_from_remote_record): kill use of deprecated time functions
-
-2001-10-13  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): call
-	set_icon_from_comp.
-	(set_icon_from_comp): set the window icon from the comp.
-	(make_icon_from_comp): get the icon path based on comp type.
-	
-	* gui/dialogs/Makefile.am (iconsdir): EVOLUTION_ICONSDIR bits.
-
-2001-10-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_send_comp): send
-	cancellation comp if necessary
-
-2001-10-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/alarm-page.c: return fill_component success
-
-	* gui/dialogs/task-page.c: ditto
-
-	* gui/dialogs/task-details-page.c: ditto
-
-	* gui/dialogs/schedule-page.c: ditto
-
-	* gui/dialogs/recurrence-page.c: ditto
-
-	* gui/dialogs/event-page.c: ditto
-
-	* gui/dialogs/meeting-page.c: use e_notice instead of
-	duplicate_error
-	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array
-	now
-	(meeting_page_fill_component): spew gui errors if there is no
-	organizer or no attendees, return success
-
-	* gui/dialogs/event-editor.c (event_editor_send_comp): always call
-	parent method and don't send the cancellation comp if the method
-	is publish
-	(refresh_meeting_cmd): use the orginal comp to refresh
-	(forward_cmd): prompt the user for the version they want to send
-	(current, original)
-
-	* gui/dialogs/task-editor.c (forward_cmd): as above
-	(refresh_task_cmd): ditto
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_fill_component): return boolean of whether the
-	component could be filled or not
-
-	* gui/dialogs/comp-editor-page.h: update proto
-
-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param
-	on whether to try and send or not
-	(comp_editor_get_current_comp): only fill component if its changed
-	(comp_editor_save_comp): prompt user as well
-
-	* gui/dialogs/comp-editor.h: change proto
-
-	* gui/itip-utils.c: replace error_dialog with e_notice
-	(comp_content_type): specify charset
-
-2001-10-11  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c: large reworking of i18n tagging and now
-	uses gtk_html_stream write and U_ where appropriate.  More to
-	come.
-
-2001-10-10  Larry Ewing  <lewing@ximian.com>
-
-	* gui/e-itip-control.c (init): set the default character set to
-	utf-8.
-
-2001-10-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend): Return the original key in
-	the hash table if requested.
-	(backend_last_client_gone_cb): Use lookup_backend() so that we
-	have the URI mangling done for us.
-	(impl_CalFactory_open): The type should be GtkType *, not GtkType!
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-client.c (cal_set_mode_cb): remove unneeded
-	assertions
-
-2001-10-10  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-factory.c (add_uri): fix logic checks
-
-	* gui/dialogs/event-editor.c (event_editor_init): init the
-	exisiting_org boolean
-	(set_menu_sens): base sensitivity on existing_org boolean
-	(event_editor_edit_comp): set exisiting_org boolean
-
-	* gui/dialogs/task-editor.c: same as above
-
-	* gui/calendar-offline-handler.c (add_connection): handle the
-	protocol or host being unknown
-
-	* cal-util/cal-component.c (cal_component_has_organizer):
-	implement
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #884.
-
-	* gui/alarm-notify/save.[ch]: New files with functions to
-	save/load the last notification time.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Save the last
-	notification time.
-	(alarm_queue_init): Load the last notification time when the
-	daemon is inited.
-	(alarm_queue_add_client): Load the alarms that we missed while the
-	alarm daemon was not running.
-	(cal_opened_cb): Likewise.
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Added save.[ch] to the list of sources.
-
-2001-10-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (get_address): util function to get address
-	(itip_addresses_get_default): get only the default address
-	(itip_address_free): free single address
-	(itip_addresses_free): use above
-	(comp_limit_attendees): limit the number of attendees to one, the
-	user
-	(comp_sentby): set the sentby parameter if the user is not the
-	organizer
-	(comp_minimal): remove extraneous info for send (for refresh and
-	declinecounter)
-	(comp_compliant): remove all alarms, do various things to make the
-	components comply with itip spec based on method
-	(itip_send_comp): use comp_compliant method
-
-	* gui/itip-utils.h: new protos
-
-	* gui/e-itip-control.c: rescan the component when necessary
-	(get_next): don't get stuck in infinite loop if there are no
-	viewable components
-	(e_itip_control_set_data): if there are no viewable components,
-	spit an error message
-
-	* gui/dialogs/meeting-page.h: tidy
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use
-	organizer's cn if possible
-	(other_clicked_cb): no longer doing the sent by stuff directly,
-	hide more widgets
-
-	* pcs/query.c: use bonobo exception stuff
-
-	* cal-util/cal-component.c (cal_component_rescan): have the comp
-	rescan its libical component (for when you change things directly)
-	(free_icalcomponent): take a param on whether to free the
-	component or just clean up the mappings
-	(cal_component_has_attendees): util function
-
-	* cal-util/cal-component.h: new protos
-	
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (lookup_backend, add_backend): deal correctly with
-	URIs to be inserted into the hash table, so that we don't add the same
-	backend over and over because the URI strings were different (although
-	refering to the same backend)
-
-	* pcs/cal-backend-file.c (mail_account_*): moved to a common place
-	(cal_backend_file_open): check if "uristr != NULL" and not
-	"uri != NULL"
-
-	* pcs/cal-backend-util.c: moved to here
-
-	* gui/e-day-view.c: add missing header file
-
-2001-10-09  Dan Winship  <danw@ximian.com>
-
-	* gui/e-meeting-model.c (process_free_busy_comp): Fix incorrect
-	variable name check.
-
-2001-10-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): refactor functionality into
-	several function
-	(comp_string): if we are publishing, empty the attendee list
-
-	* gui/dialogs/event-editor.c (schedule_meeting_cmd): when we
-	schedule a new meeting, mark the event editor as changed
-
-	* pcs/cal.c (cal_class_init): get correct parent class
-
-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): use the
-	generated ui component name
-
-2001-10-03  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c:
-	* gui/calendar-offline-handler.c:
-	* gui/comp-editor-factory.c: replace use of gnome_vfs_uri with e_uri
-
-	* gui/e-meeting-model.c (start_addressbook_server): make it return void,
-	since the return value does not mind
-
-	* pcs/cal.c:
-	* pcs/cal-factory.c:
-	* pcs/cal-backend.[ch]: don't use GnomeVFS for URI management
-	
-	* pcs/cal-backend-file.c: ditto, only use GnomeVFS for internal
-	operations
-
-	* cal-client/cal-client.c (cal_client_open_calendar): don't CORBA_exception_free
-	before checking for exceptions
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/e-calendar-table.etspec: Added priorities to a bunch of
-	these columns.  Fixes Ximian bug #7158.
-
-2001-10-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a
-	DATE-TIME value, since we know the exact time. Fixes bug #11278.
-	(Before we were setting is_date, but icaltime_from_timet_with_zone()
-	didn't convert it properly. We need to figure out how to handle DATEs
-	when using time_t's.)
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): use
-	e_time_format_date_and_time() so we show the time as well, if the
-	exception is a DATE-TIME value.
-
-	* cal-util/timeutil.c: removed time_add_month(), time_year_begin(),
-	time_month_begin() & time_week_begin() - old pre-timezone functions
-	which we no longer use.
-
-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): set
-	ir.until.is_date to FALSE before converting to a time_t.
-	Hopefully fixes bug #5034.
-
-2001-10-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/comp-editor.c (setup_widgets): Use
-	`bonobo_ui_component_new_default()', not
-	`bonobo_ui_component_new()'.
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-
-	* cal-client/cal-query.c: use bonobo-exception to tidy
-
-2001-10-02  JP Rosevear  <jpr@ximian.com>
-	
-	* conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as
-	well
-	(comp_from_remote_record): fix monthly by day recurrences and
-	handle "last" day type
-
-2001-10-01  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): unref the page
-	objects here, instead of in close_dialog(). (This was fixed a while
-	ago, but accidentally reverted.) Fixes bug #7543.
-
-2001-10-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Set the window state to sticky.  Thanks to Peter Teichman for the
-	suggestion.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert the comp exceptions to the pilot record
-	(comp_from_remote_record): record exceptions on the desktop and
-	use time zone stuff on recurrence end date
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	strdup the uid to avoid double free, write out only after
-	everything is done
-
-2001-10-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): don't use
-	gnome_vfs_uri_is_local on URIs created with
-	gnome_vfs_uri_new_private
-
-2001-09-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/print.c (print_comp_item): use bound_text to print the summary,
-	so it wraps instead of being clipped to 1 line. Fixes part 3 of bug
-	#10285, I think.
-
-	* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.
-	Also set the width of the Summary & Date/Time labels to 10, and set
-	expand to TRUE, to make sure that the dialog doesn't keep getting
-	wider as the summary text on the main page gets longer. Could possibly
-	use an EClippedLabel here instead, so we get a '...' at the end if it
-	is clipped.
-
-	* gui/dialogs/recurrence-page.glade: changed Summary & Date/Time
-	widths as above.
-
-	* gui/print.c (print_calendar): use landscape mode for the month
-	preview.
-	(print_border_with_triangles): use EPSILON to account for floating
-	point errors. Hopefully fixes part 2b of bug #10285.
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Handle the fields and category we don't sync by making sure we
-	don't overwrite them
-	(local_record_to_pilot_record): use local record category
-	(pre_sync): track db info
-
-	* conduits/calendar/calendar-conduit.h: db info field
-
-	* conduits/todo/todo-conduit.[hc]: same as above
-
-	* pcs/cal-backend-file.c
-	(cal_backend_file_compute_changes_foreach_key): create a dummy
-	component of the right type and strdup the uid
-	(cal_backend_file_compute_changes): sync the db hash after each
-	change and free the uid
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-client/cal-client.c (cal_client_open_calendar): init the
-	execption rather than freeing it
-
-2001-09-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
-	for exceptions
-	(cal_client_open_calendar): likewise
-
-2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;
-	/menu/ComponentToolsPlaceholder/Tools ->
-	/menu/Tools/ComponentPlaceholder .
-	* gui/tasks-control.c: Likewise.
-
-2001-09-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added InvalidURI and UnsupportedMethod
-	exceptions to the CalFactory interface
-
-	* pcs/cal-factory.c (impl_CalFactory_open): raise InvalidURI exception on
-	URI errors and UnsupportedMethod when we don't support the method for
-	a given URI
-	
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c: added support for using multiple calendar
-	factories
-	(cal_client_uri_list): use the list of factories loaded for this
-	CalClient
-
-2001-09-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-calendar-table.c (date_compare_cb): 
-	(percent_compare_cb): 
-	(priority_compare_cb): added comparison functions for these special
-	cell types. But the date and percent ones don't work yet due to the
-	use of static text buffers for return cell values.
-	(e_calendar_table_init): added the comparison functions to the
-	ETableExtras. NOTE: task_compare_cb() never seems to be called.
-	I'm not sure why it is there.
-
-	* gui/e-calendar-table.etspec: set the comparison function names for
-	the date/percent/priority fields.
-
-	* cal-util/cal-util.c (cal_util_priority_to_string): 
-	(cal_util_priority_from_string): new utility functions.
-
-	* gui/calendar-model.c (get_priority): 
-	(set_priority): used above utility functions, and removed the warning
-	dialog which isn't useful now that the field isn't editable.
-
-	* gui/dialogs/event-page.c (times_updated): handle timezones and for
-	all-day events make sure it stays an all-day event after adjusting.
-	Fixes bugs #5945 and #10222.
-
-	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the
-	edit items were moved beneath 'EditPlaceholder'. This gets rid of
-	those long Bonobo warnings! (and we get the icons back)
-
-	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar
-	icon, since it doesn't appear in the xml file. Gets rid of warning.
-
-	* gui/dialogs/event-page.c (notify_dates_changed): new function to
-	emit the notification signal when the dates are changed. It also
-	handles timezones now.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used
-	CalComponentDateTime for start/end/due so we have the timezone as well
-	as the time.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get
-	the timezones as well as the times.
-	(comp_editor_free_dates): new function needed to free all the structs.
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call
-	to preview_recur() to make sure the preview gets updated.
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the
-	CompEditorPageDates struct after use.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'
-	argument. If FALSE, we try to use builtin timezones first. This is
-	needed for the recurrence page of the event editor, because the
-	timezones may not have been added to the server yet. This and the
-	changes to the notification stuff should fix bug #5034.
-
-	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above
-	tag_calendar_by_comp() with TRUE since the events will be on the
-	server in this case.
-
-	* gui/e-day-view-layout.c:
-	* gui/e-day-view.c: made sure an event always takes up at least one
-	row, even when the start & end times are the same. Fixes bug #5944.
-	I don't know if we should try to also handle events with the end time
-	before the start time.
-
-	* gui/e-week-view.c (e_week_view_style_set): check that the small font
-	is actually smaller than the normal font. If it isn't, don't use it.
-	Hopefully fixes bug #6876.
-	(e_week_view_on_new_appointment): if only one day is selected, then
-	we set the initial time of the event to 1/2-hour from the start of the
-	working day, to differentiate 'New Appointment' from 'New All Day
-	Event'. Fixes bug #8892.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the
-	above.
-
-2001-09-26  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes the GUI part of bug #7892.
-
-	* gui/dialogs/alarm-page.c (get_alarm_duration_string): Return
-	NULL if the duration is zero.
-	(get_alarm_string): Handle duration of zero.  Also, hopefully
-	make the strings be more l10n-friendly.
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): I am a moron.  Fix
-	reversed test.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): disconnect
-	signals first thing
-
-2001-09-26  Dan Winship  <danw@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDFLAGS): Add
-	-export-dynamic to make glade custom widgets work on non-Linux.
-
-2001-09-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.h: added CAL_MODE_INVALID to CalMode enum
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.h: new proto
-
-	* pcs/cal.c (impl_Cal_set_mode): implement set mode method
-	(cal_class_init): set setMode function in epv
-	(cal_notify_mode): notify listener of mode change
-
-	* pcs/cal-factory.c (add_uri): deal with UriType renaming
-
-	* pcs/cal-backend.h: add new virtual methods and protos
-
-	* pcs/cal-backend.c (cal_backend_class_init): init new virtual
-	methods to null
-	(cal_backend_set_mode): sets mode
-	(cal_backend_get_mode): gets mode
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide
-	get_mode and set_mode methods
-	(cal_backend_file_get_mode): return mode
-	(notify_mode): have listeners notified of the set mode call
-	(cal_backend_file_set_mode): set the mode by indicating not
-	supported
-
-	* cal-client/cal-listener.h: update proto
-
-	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set
-	mode callback
-	(cal_listener_construct): take set mode callback
-	(cal_listener_new): ditto
-
-	* cal-client/cal-client.h: update protos, add signal proto
-
-	* cal-client/cal-client.c (cal_client_class_init): add
-	cal_set_mode signal
-	(cal_set_mode_cb): handle set mode callback from listener
-	(cal_client_open_calendar): pass additional param to cal_listener_new
-	(cal_client_set_mode): wrapper to set the calendar mode
-
-	* idl/evolution-calendar.idl: make UriType into CalMode, add
-	SetModeStatus enum and notifyCalSetMode method to the listener
-
-	* gui/calendar-offline-handler.c (create_connection_list): fetch
-	the uri list ourselves
-	(impl_prepareForOffline): reflect param change of
-	create_connect_list
-	(update_offline): ditto
-	(backend_cal_set_mode): set mode call back
-	(backend_cal_opened): cal opened call back, set mode to local
-	(impl_goOffline): reflect UriType renaming
-
-	* cal-util/cal-util.h: rename UriType to CalMode
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	Warning fixes courtesy of Chris Lahey <clahey@ximian.com>.
-
-	* gui/e-itip-control.c (write_html): Warning fixes.  Also, don't
-	strdup() more than necessary.
-
-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):
-	Warning fixes.
-
-	* gui/itip-utils.c (itip_addresses_get): Warning fixes.
-
-	* gui/print.c (print_day_background): Warning fixes.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Warning
-	fixes.
-	(alarm_to_palarm_widgets): Likewise.
-
-	* gui/dialogs/delete-comp.c: #include "../calendar-config.h"
-
-2001-09-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (alarm_ready_cb): Check that the
-	timeout is not set up before we create a new one; the alarm_fn
-	callback may cause the alarm system to re-enter and add a new
-	alarm.  Fixes bug #10840.
-	(pop_alarm): Assert that there is at least one alarm in the queue.
-
-2001-09-25  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal.c: use bonobo-exception stuff to clean code
-
-	* pcs/cal-factory.c (add_uri): add uri to the list if the type
-	matches
-	(impl_CalFactory_uriList): implement uriList method
-
-	* pcs/cal-backend.h: new virtual function member
-
-	* pcs/cal-backend.c (cal_backend_is_remote): call virtual function
-
-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override
-	virtual function
-	(cal_backend_file_is_remote): new virtual function, always return
-	FALSE
-
-	* idl/evolution-calendar.idl: uriList factory call, with flags for
-	types to get
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): cast to remove
-	warning
-
-	* gui/e-itip-control.c (write_label_piece): kill warnings by take
-	const char *
-
-	* gui/component-factory.c (create_object): aggregate offline
-	interface
-
-	* gui/Makefile.am: compile new files
-
-	* calobj.[hc]: Remove obsolete files
-
-	* cal-util/cal-util.h: enum URI types for uriList call
-
-	* cal-client/cal-client.c (build_uri_list): build list from string
-	sequence
-	(cal_client_uri_list): factory call to get uri list
-
-	* cal-client/cal-client.h: new proto
-
-	* cal-client/cal-client.c: use bonobo exception stuff to clean
-	code
-
-	* gui/calendar-offline-handler.[hc]: Start some skeleton routines
-	for online/offline handling
-
-	* pcs/cal-factory.c (launch_backend_for_uri): use accessor and
-	remove FIXME
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (set_date_label): base text on component
-	type
-
-2001-09-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: don't use gnome_vfs_uri_new_private
-	(fixes Ximian #10544)
-
-2001-09-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c: #include a few files we were missing
-	from libgnomevfs.
-
-2001-09-20  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (load_db): gets a config db
-	(cal_backend_file_destroy): release config db
-	(cal_backend_file_init): use load_db
-	(mail_account_get): gets a mail account by number
-	(mail_account_get_default): gets the default mail account
-	(mail_account_is_valid): looks to see if any accounts have the
-	given address
-	(create_user_free_busy): modularize so we can call multiple times
-	if necessary, set organizer
-	(cal_backend_file_get_free_busy): if the list of users is null,
-	use the default account otherwise get the same info for each
-	address that is an identity in the mailer
-
-	* gui/itip-utils.c (itip_addresses_get): s/gint/glong/ for bonobo
-	conf returns
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): fix problems
-	from a merge so that we publish 6 weeks of free/busy information
-	again
-
-2001-09-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_destroy): make
-	sure to release the ref on priv->comp.
-
-	* gui/dialogs/comp-editor.c (real_edit_comp): make sure to release
-	the ref on priv->comp.
-
-2001-09-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
-	notification message always, in addition to playing the sound.
-	(procedure_notification): Present a confirmation dialog before
-	actually running the alarm's program.
-	(procedure_notification): Use gnome_execute_shell() instead of
-	gnome_execute_async() so that we handle multiple arguments
-	properly.  Plus, it is most likely what the user expects.
-	(mail_notification): Display a message about unsupported email
-	reminders instead of blindly dropping the alarm.
-
-	* gui/dialogs/alarm-options.glade: Added an explanatory message
-	about mail alarms not being supported.
-
-	* gui/dialogs/alarm-page.glade: Removed the "Send an email"
-	option.
-
-	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): listen for model
-	changes
-	(task_editor_edit_comp): add the attendees to the model and notify
-	of need send
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-	
-	* gui/dialogs/schedule-page.c: remove model change notification
-	stuff
-	(schedule_page_fill_widgets): no need to do the needs_send here
-	because the editor handles this since it owns the model
-
-	* gui/dialogs/event-editor.c (init_widgets): listen for model
-	changes
-	(event_editor_init): flip page order
-	(event_editor_edit_comp): set needs send value
-	(schedule_meeting_cmd): flip page order
-	(row_count_changed_cb): mark as changed when row added/deleted
-	(model_row_changed_cb): mark as changed when row changes
-
-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need
-	to do the needs_send here because the editor handles this since it
-	owns the model
-	(invite_entry_changed): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_changed): new
-	accessor
-	(comp_editor_get_changed): ditto
-	(comp_editor_set_needs_send): ditto
-	(comp_editor_get_needs_send): ditto
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/itip-utils.c (itip_addresses_get): reflect configuration
-	path changes in the mailer
-
-	* gui/e-meeting-model.c: remove commented out code, ifdef one
-	section for later
-
-2001-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-factory.c (cal_factory_oaf_register): add a new parameter
-	(const char *iid) to specify the OAFIID of the factory being
-	registered
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):
-	remove silly debug #if 0
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): g_list_free
-	rather than g_free
-
-	* gui/e-itip-control.c (write_html): eliminate code path that
-	caused double freed memory
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/schedule-page.*: A page that shows the meeting time
-	selector and free/busy data for attendees
-
-	* gui/dialogs/meeting-page.c: use the meeting model to track/edit
-	attendees, remove table value conversion routines and simple table
-	routines
-	(set_attendees): take a pointer array
-	(meeting_page_destroy): destroy the pointer array, save state
-	(meeting_page_init): new pointer array
-	(meeting_page_fill_widgets): don't null the deleted attendees
-	field
-	(popup_delegate_cb): array add
-	(popup_delete_cb): array add
-	(cleanup_attendees): iterate over the array to unref now
-	(meeting_page_fill_widgets): don't null out fields, no need to add
-	attendees here
-	(invite_entry_changed): use e_meeting_attendee routines
-	(popup_delegate_cb): ditto
-	(popup_delete_cb): ditto
-	(meeting_page_new): take new arg and pass it to construct
-	(meeting_page_construct): take new arg, use e-meeting-model
-	routines to construct table
-
-	* gui/dialogs/task-editor.c (task_editor_init): new meeting model
-	(task_editor_destroy): unref the model
-
-	* gui/dialogs/event-editor.c (event_editor_init): make new model
-	and pass it to meeting and schedule pages
-	(event_editor_set_cal_client): virtual function, set meeting model
-	client
-	(event_editor_edit_comp): add the attendees to the model
-	(event_editor_destroy): unref model
-	
-	* gui/dialogs/comp-editor.h: add virtual function
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): make
-	set_cal_client a virutal function
-
-	* gui/e-meeting-types.h: generally useful type defines
-
-	* gui/e-meeting-time-sel*.[hc]: Move here and use an e-table for
-	the attendee list and extract display information from the new
-	meeting model and attendees
-
-	* gui/e-meeting-time-sel.etspec: spec for the table
-
-	* gui/e-meeting-attendee.[hc]: meeting attendees for the model,
-	with to/from conversions for CalComponentAttendee structure, emits
-	changed signal and allows getting and setting of free busy
-	periods
-
-	* gui/e-meeting-model.[hc]: move the model out on its own
-
-	* gui/e-itip-control.c (write_error_html): clean up warnings
-	
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #6350.
-
-	* gui/component-factory.c (remove_folder): Use a simplified method
-	for removing our folder data; we just need to remove calendar.ics
-	or tasks.ics and the corresponding backup files.
-
-2001-09-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2830.
-
-	* gui/calendar-config.c (calendar_config_get_confirm_delete): New
-	function.
-	(calendar_config_set_confirm_delete): New function.
-	(config_read): Get the default value for the ConfirmDelete option.
-	(calendar_config_write): Set the value of ConfirmDelete.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Handle the
-	configuration option for confirmation.
-
-	* gui/dialogs/cal-prefs-dialog.c (CalPrefsDialogPrivate): Added
-	the fields for the Other page.
-	(get_widgets): Handle the new widgets.
-	(cal_prefs_dialog_show_config): Likewise.
-	(cal_prefs_dialog_update_config): Likewise.
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client-multi.[ch]: new class for managing multiple
-	calendars, with an API very similar to the CalClient one,
-	for ease of transition from one to the other
-
-	* gui/component-factory.c (xfer_folder, remove_folder, create_folder):
-	reworked to be able to manage folders for any calendar backend, and
-	not only the file: one
-
-2001-09-18  Rodrigo Moya <rodrigo@ximian.com>
-	
-	* idl/evolution-calendar.idl: changed signature for the getFreeBusy
-	method, to return a sequence of CalObj's, and added sequence of users
-	as a new parameter to that method
-
-	* cal-client/cal-client.c (cal_client_get_free_busy): adapted to new
-	IDL method signature, by adding a new "GList *users" parameter, for
-	callers to be able to specify a list of users
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy):
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): add the
-	"GList *users" parameter. In cal_backend_file_get_free_busy, call
-	lookup_component to get the CalComponent for each uid, instead
-	of calling cal_backend_get_object, which meant converting the
-	component to a string and then parsing it again.
-
-	* cal-client/client-test.c (cal_opened_cb):
-	* gui/e-itip-control.c (send_freebusy):
-	* gui/calendar-commands.c (publish_freebusy_cmd): adapted to
-	new getFreeBusy method signature
-
-2001-09-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c: added a timeout to refresh the list every
-	10 minutes. Not ideal, as the user may be editing a task when it gets
-	refreshed.
-	(adjust_query_sexp): use the 'completed-before?' operator to filter
-	out tasks according to the config settings.
-
-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets): 
-	added support for the 'Completed' date. This code must have got lost
-	somewhere, as it used to work.
-	(date_changed_cb): set the priv->updating flag while updating the other
-	widgets.
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): made sure
-	we freed the components.
-
-	* pcs/query.c (func_completed_before): added 'completed-before?'
-	operator.
-
-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): 
-	don't set the lower & upper hour. Use 0-24 like the EDateEdit does.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config): set
-	the 12/24-hour time format options sensitive only if we support both.
-
-	* gui/calendar-config.c (config_read): if the locale doesn't define
-	'am' and 'pm' strings then we must use 24-hour format.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): don't
-	translate the '%d' as it doesn't make much sense. Resolves bug #8027.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (owner_set_cb): Do not call
-	calendar_config_init() here.
-
-	* gui/main.c (main): Call calendar_config_init() here.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the
-	timeout if the list was empty.
-	(alarm_ready_cb): Notify with the ID of the original alarm.
-	(alarm_remove): Likewise.
-
-2001-09-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Switch the alarm system from using SIGALRM to normal glib timers.
-	Also, use a more robust de-queueing mechanism.
-
-	* gui/alarm-notify/alarm.c (alarm_init): Removed.
-	(alarm_done): Remove the glib timeout instead of closing the pipes
-	and the signal handler.
-	(alarm_add): Allow adding alarms that happen before right now.
-	(queue_alarm): Use a glib timer instead of a signal.
-	(alarm_remove): Adjust the timeout as appropriate.
-
-	* gui/alarm-notify/notify-main.c (main): There is no need to
-	initialize the alarm system now.
-
-	* gui/main.c (main): Likewise.
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_init): get itip addresses
-	(calendar_model_destroy): destroy same
-	(calendar_model_value_at): do more thorough checking on whether to
-	use recurring, assigned, assigned to or regular task icons
-
-2001-09-17  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-component.c (for_each_remove_all_alarms): for each
-	call back, removes the alarms
-	(cal_component_remove_all_alarms): remove all alarms from the
-	component
-
-	* cal-util/cal-component.h: new proto
-
-	* gui/e-itip-control.c (write_error_html): writes error messages
-	rather than normal html
-
-	* gui/itip-utils.c (itip_send_comp): remove all alarms if the
-	method warrants it
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/dialogs/meeting-page.c (build_etable): Updated this to match
-	the new ETableSimple interface.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* cal-client/Makefile.am: Set CLEANFILES directly instead of using
-	`+='.
-	* gui/Makefile.am: Likewise.
-	* gui/alarm-notify/Makefile.am: Likewise.
-	* pcs/Makefile.am: Likewise.
-
-2001-09-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c (ok_clicked_cb): added space after 'identities'
-	in the message. Fixes bug #9896.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/e-calendar.conduit.in: remove translation
-	marker for now	
-
-2001-09-13  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.h: use ical partstat, role, cutypes
-	directly 
-
-	* cal-util/cal-component.c: ditto
-
-	* gui/e-itip-control.c (find_my_address): set my addresses if the
-	addresses match
-	(find_attendee): strstr returns non-null on a match
-	(write_html): use new icon, select the name displayed (organizer
-	or attendee) based on method,
-	(ok_clicked_cb): when rsvp'ing strip off all but the attendee
-	being replied for as is specified in the spec
-	(find_attendee_partstat): new util function to extract the
-	partstat of an attendee
-	(update_attendee_status): updates the partstat of a specific
-	attendee in the reply message
-
-	* gui/dialogs/meeting-page.c: use ical partstat, role, cutypes
-	directly
-	(popup_delegate_cb): if we delegate, notify of needs send and
-	changed
-	(popup_delete_cb): notify of needs send and changed for each
-	deletion
-	
-2001-09-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of
-	free busy info starting with the UTC start of day
-
-	* gui/itip-utils.c (get_label): create a text representation of
-	the given icaltime
-	(itip_send_comp): if the summary is empty, set the subject based
-	on the type of component, put the right extension on free/busy
-	components and base descriptions on type of component, include
-	start/end for free/busy info
-	
-2001-09-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (display_notification): Added an
-	use_description argument so that other alarms can fall back to
-	this type.
-	(audio_notification): Implemented.
-	(remove_comp): Call remove_queued_alarm() here; there is no longer
-	a destroy notification function for alarms so must we do this
-	manually.
-	(alarm_trigger_cb): Do not pass the alarm to the notification
-	functions so that we can free it ourselves before all the alarms
-	in the component get freed.
-	(display_notification): Get the alarm here instead of getting it
-	as an argument.
-	(procedure_notification): Implemented.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): free the
-	destination vector when we finish with it, if we actually add
-	anyone, notify listeners of the needs send and changed info. Fixes
-	bug #8632.
-
-2001-09-10  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/print.c
-	(format_date): Convert string generated by strftime to UTF-8.
-	(print_week_view_background): Ditto.
-	(print_month_summary): Ditto.
-	(print_month_small): Use U_() instead of _().
-	(print_day_background): Ditto.
-	(print_todo_details): Ditto.
-	(print_date_label): Convert generated string to UTF-8.
-
-2001-09-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_get_attach):
-	Handle the new icalattach type instead of struct icalattachtype.
-	(cal_component_alarm_set_attach): Likewise.
-
-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Likewise.
-	(alarm_to_palarm_widgets): Likewise.
-	(aalarm_widgets_to_alarm): Likewise.
-	(palarm_widgets_to_alarm): Likewise.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the calendar.]
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Remove the
-	ShellComponentFactory.
-
-	* gui/component-factory.c (create_object): Renamed from
-	`component_fn'.  Don't get any args.
-	(component_factory_init): Create the component using
-	`create_object()' and register it into OAF.
-	(COMPONENT_FACTORY_ID): Removed.
-	(COMPONENT_ID): New.
-
-2001-09-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (sc_user_create_new_item_cb):
-	Implemented.
-
-	* gui/main.c (component_editor_factory_init): New function to
-	create the factory for the comp_editor_factory.
-
-	* gui/comp-editor-factory.c: Finished implementation.
-
-	* gui/alarm-notify/alarm-queue.c (edit_component): Implemented the
-	Edit command.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-09-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/tasks-control.c (tasks_control_activate): don't call
-	calendar_config_check_timezone_set() now, since the startup wizard
-	handles that.
-
-	* gui/e-tasks.c (e_tasks_class_init): changed selection_changed signal
-	to GTK_RUN_LAST. It has no reason to be GTK_RUN_FIRST.
-
-	* gui/gnome-cal.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added "selection_changed" signal,
-	XX_delete_event() and XX_get_num_events_selected().
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): fix the shadow
-	around the dates at the top - it was 1 pixel off.
-
-	* gui/calendar-commands.c: added sensitize_commands(), similar to in
-	tasks-control.c, so we only make Cut/Copy/Delete sensitive when an
-	event is selected. Also added delete_event_cmd().
-
-	* gui/dialogs/task-page.c (task_page_set_summary): 
-	* gui/dialogs/event-page.c (event_page_set_summary): do nothing,
-	since the summary only gets changed on the main event/task page now.
-	Fixes bug #6939.
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): 
-	(e_day_view_on_top_canvas_drag_data_received): check that we are
-	dragging an event from the same EDayView. We currently don't support
-	DnD from other widgets.
-	(e_day_view_update_top_canvas_drag): only get the summary if we
-	actually have an event. Fixes bug #5162.
-
-	* gui/e-day-view.c (e_day_view_on_editing_stopped): if the text hasn't
-	changed we need to call e_day_view_update_event_label() to show the
-	times again if necessary. Fixes bug #1813.
-
-	* gui/dialogs/comp-editor.c (comp_editor_destroy): destroy the
-	CompEditorPage objects here rather than in close_dialog(), after the
-	widgets have been destroyed. We do this because the widgets have lots
-	of signal handlers connected with the CompEditorPage objects as the
-	signal data, so we want to ensure that the data pointer is always
-	valid. (Alternatively we could disconnect all the handlers when the
-	CompEditorPage objects are destroyed, or use connect_while_alive()).
-	Fixes bug #7543.
-
-	Note: there is still a small bug in that if you type in a time and
-	then hit 'Save and Close', the time won't be saved. I'm not sure
-	where this should be fixed - should the actions which close the
-	dialog grab the focus to the toplevel, so any widgets currently
-	being edited finish the edit and emit 'changed'?
-	
-	* gui/dialogs/recurrence-page.c (append_exception): use
-	gtk_clist_set_row_data_full() so freeing is handled automatically by
-	the GtkClist. This helps avoid problems at destroy-time.
-	(exception_delete_cb): just call gtk_clist_remove() now. No need to
-	free the row data as GtkCList now handles it.
-	(recurrence_page_destroy): no need to free the data in the clist.
-
-	* gui/dialogs/alarm-page.c: ditto.
-
-	* gui/dialogs/meeting-page.c: ditto.
-	(etable_destroy_cb): save the ETable state in this new handler cb
-	rather than in the destroy method, since the widget will already be
-	destroyed by then.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: changed 3 occurrences of 'Replyed' to 'replied'
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/e-itip-control.c (write_html):
-	Marked strings for translation (with U_).
-
-	* gui/itip-utils.c (itip_send_comp):
-	Ditto.
-
-2001-08-31  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): 
-	(comp_editor_contacts_to_component): fix debugging messages so they
-	use "" rather than NULL. Fixes bug #8559.
-
-2001-08-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_remove_object): See if
-	the set of categories changed by using the removed_categories hash
-	table.
-	(cal_backend_file_init): Create a table of removed categories.
-	This allows us to notify if and only if the set of category
-	changes when an object is updated/removed, instead of
-	unconditionally notifying if an object is updated.
-	(cal_backend_file_update_objects): Only notify if the set of
-	categories really changed.
-	(update_categories_from_comp): Shuffle the categories between the
-	priv->categories and priv->removed_categories lists.
-
-2001-08-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #7879, a query may receive an update notification from
-	the backend before the query itself gets populated.
-
-	* pcs/query.c (ensure_sexp): New function; ensures that the esexp
-	is created and notifies of parse errors.  It is the bulk of
-	start_query_cb() but put in a separate function so that we can
-	share it elsewhere.
-	(start_query_cb): Use ensure_sexp().
-	(process_component_cb): Oops, notify of a successfully finished
-	query.
-	(match_component): Call ensure_sexp().  This function can be
-	called by the backend notification callbacks before the query is
-	populated, so we need to make sure the esexp exists here.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Set the
-	"category is" criterion as the default for the calendar and tasks.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):
-	Unset the priv->updating flag before returning in the case the
-	component has no recurrence information.  Fixes bug #6850.
-
-2001-08-22  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (QueuedAlarm): Added a snooze
-	flag to differentiate snoozed alarms from real occurrences.
-	(add_component_alarms): Do not specify a destroy function for the
-	alarm trigger.  We handle this in the callbacks now.
-	(alarm_trigger_cb): Just remove the alarms for the unimplemented
-	notification types.
-	(create_snooze): Implemented snooze.
-	(notify_dialog_cb): Snooze as appropriate.
-
-2001-08-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (foreach_tzid_callback): call back to add
-	timezones to the top level
-	(itip_send_comp): call icalcomponent_foreach_tzid
-
-2001-08-22  Dan Winship  <danw@ximian.com>
-
-	* gui/gnome-cal.c: #include <libgnomevfs/gnome-vfs-types.h> so
-	this will compile against gnome-vfs 1.0.1.
-
-2001-08-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_open): open the tasks folder
-	associated with the calendar being opened, and not always the local
-	tasks.ics file
-
-	* pcs/cal-factory.c (open_fn): use gnome_vfs_uri_new_private when
-	parsing the URI to allow non-registered URIs
-
-2001-08-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle
-	the case where there is no attachment.  Fixes bug #7257.
-
-2001-08-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (write_html): strip the mailto bit for the
-	email address if we display it
-
-2001-08-21  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/query.c (func_is_completed): added new e-sexp operator. We
-	don't currently use it though.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'
-	since we have an '_Other' notebook tab. Added '_Hide' accel.
-
-	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.
-
-	* gui/calendar-config.c: added config options for hiding completed
-	tasks.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels
-	extra space between icons and text for long events, and 1 pixel space
-	between icons in all events.
-	(e_day_view_realize): changed the background color to match the
-	EGrayBar in the shell.
-
-2001-08-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-util.[ch]: new files to contain utility functions
-	for calendar backends
-
-	* pcs/cal-backend.c (cal_backend_add_cal): implement it here, and not in
-	the calendar backends. Add a "cal_added" signal, so that backends are
-	notified when a new Cal is added, if they need to
-	(cal_backend_get_type_by_uid): implement it here
-
-	* pcs/cal-backend-file.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_file_add_cal): removed
-	(cal_backend_file_init): connect to the "cal_added" signal in the
-	CalBackend class so that we can update categories when a new Cal is
-	added
-	(cal_backend_file_get_type_by_uid): removed
-
-	* pcs/cal-backend-db.c (fill_alarm_instances_seq): moved to
-	cal-backend-util.c
-	(cal_backend_db_add_cal): removed
-	(cal_backend_db_get_type_by_uid): removed
-
-	* AUTHORS: added JP and Damon to list of authors
-
-2001-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-util/cal-util.[ch] (cal_util_generate_alarms_for_list):
-	(cal_util_generate_alarms_for_comp): 
-	new functions moved from the CalBackendFile, to allow its use outside
-	of it. The signature has changed a little bit, since these functions
-	need a way to get the timezones from the callers, so a callback
-	function to resolve the timezones has been added to the list of
-	parameters
-
-	* pcs/cal-backend-file.c (generate_alarms_for_list):
-	(generate_alarms_for_comp): moved to cal-util, with all their related
-	functions/structures
-
-	* pcs/cal-backend-db.c: removed functions that were moved to cal-util
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use Delete icon in menu, and
-	change to bigger Save icon in toolbar.
-
-	* gui/tasks-control.c: 
-	* gui/calendar-commands.c (pixmaps): used new_task-16.png and
-	goto-16.png.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): added delete icons for menu
-	and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: added Cut/Copy/Paste icons for toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tasks-control.c: uses new delete icons in menu & toolbar.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Update the folder list to include a
-	display name and a description.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): use new delete icon for toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-itip-control.c: fixed typo, 'send' -> 'sent'. Bug #7621.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added option to hide completed
-	tasks after a given number of minutes/hours/days. Unfinished.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): initialize
-	zone to NULL to avoid a warning.
-	(contacts_clicked_cb): work around a bug in SelectNames by notifying
-	that the page has changed when you click the 'Contacts' button.
-	Otherwise it is easy to lose changes.
-
-	* gui/dialogs/task-page.c (contacts_clicked_cb): ditto.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.
-
-	* gui/tasks-control.c:
-	* gui/calendar-commands.c (pixmaps): added new Cut/Copy/Paste icons,
-	and changed the 'New Task' icon to use the bigger one I made.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/dialogs/task-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-2001-08-18  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/calendar-config.c (locale_uses_24h_time_format): New.
-	(config_read): Use locale's setting as default for
-	/Calendar/Display/Use24HourFormat so that Europeans don't have to
-	switch to 24-hour format manually.
-
-2001-08-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (destroy): destroy the addresses
-	(clean_up): don't free the addresses, we need them
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_task): new function to open the
-	task editor to add a new task.
-
-	* gui/calendar-commands.c: added new_task_cb() to create a new task
-	in the calendar folder, and added menu commands for it, and a toolbar
-	button (I think that is what Ettore wanted. Maybe he just meant menu
-	commands. Anyway, it is easy to take out.) Note that we don't have a
-	decent icon for 'New Task' for the toolbar.
-	Also added the new Goto button (but we don't have a similar one for
-	the menu command).
-
-2001-08-16  Iain Holmes  <iain@ximian.com>
-
-	* gui/Makefile.am: Add the libetimezonedialog.a lib link
-
-	* gui/calendar-config.c: Change the #include for the timezone dialog
-
-	* gui/e-timezone-entry.c: Ditto.
-
-	* gui/dialogs/Makefile.am: Remove the e-timezone-dialog stuff.
-
-2001-08-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: hide the timezone fields for all-day
-	events. We will use DATE values for these eventually, and these
-	don't have timezones associated with them. Currently we just use the
-	default timezone for all-day events, as a workaround until we have
-	DATE values working.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit): added
-	make_time_insensitive flag. Though we may not use it.
-
-	* gui/dialogs/event-page.glade: made the 'All day event' toggle
-	right-aligned, so it doesn't move when the other widgets are shown
-	and hidden.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_default_timezone): new
-	function to set the default timezone of the widget. If the current
-	timezone setting matches the default then the entry field is hidden.
-	Most people won't use timezones so this makes the GUI simpler.
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): set the default timezone
-	using the above function.
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): if the start date
-	or due date is not set, we use the default timezone, so the user
-	doesn't have to set this each time they set the date.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): If the
-	component has no alarms remember to set the priv->updating flag to
-	FALSE before returning.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/e-delegate-dialog.c
-	(e_delegate_dialog_get_delegate_name): get the destinations
-	property, not the text property
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (clear_widgets): Set the default-to-add
-	notification to be display a message 15 minutes before the start
-	of the appointment.  Fixes bug #7175.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_strip_categories):
-	New function to strip surrounding whitespace from a string of
-	categories entered by the user.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Use
-	comp_editor_strip_categories().
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-2001-08-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
-	Do not set the time popup range.  We also want to be able to
-	create appointments that are not within nine-to-five!  Think of
-	going to the movies!  Fixes bug #7436.
-
-	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
-	Fixes bug #7367.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Changed to reflect my renaming of some of
-	the more hideously-named functions in the ESearchBar API.
-
-2001-08-15  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (save_comp): only fill the component
-	and save it if something has changed
-	(save_comp_with_send): only try to send if something has changed
-	and the editor needs a send
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: OK, re-added the default
-	alarm options.  Way too many people are asking for them.
-
-2001-08-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Add the user creatable
-	items.  The callback is not actually implemented yet; this is just
-	to finalize the GUI.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Added an option to ask for
-	confirmation when deleting items.  Added underlined shortcuts
-	(they may not all work currently).
-
-2001-08-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added support for the Contacts field.
-	Note that I'm not sure what we should put in the iCalendar CONTACT
-	properties. Currently we put "name <email>", but it isn't recognized
-	as a contact when we reopen the dialog, so we may need more info here.
-	Also we currently use a simple parser to parse the above format, and
-	we should maybe use some camel function.
-
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: replaced the GtkEntry fields for the
-	Contacts with a GtkEventBox which we put the BonoboControl in at
-	runtime.
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): added FIXMEs
-	since it doesn't seem to be freeing the EDestination stuff. JP?
-
-	* gui/dialogs/comp-editor-util.c: added bunch of utility functions to
-	handle the Contacts field in the main Event and Task pages.
-
-	* gui/gnome-cal.c: added visible_start and visible_end fields, so we
-	only emit the 'dates-shown-changed' signal when really necessary.
-	Currently changing the folder title bar label results in a complete
-	redraw of the Evolution window (silly GtkLabel queueing a resize),
-	so we want to avoid that as much as possible.
-	(gnome_calendar_new_appointment_for): only move the event's end time
-	to the end of the day if it is not already 00:00:00.
-
-	* gui/e-week-view-event-item.c: 
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: added support for double-clicking on an event to
-	open it, and for double-clicking on the background to create a new
-	event. There is still a minor problem to sort out, but it basically
-	works.
-
-	* cal-util/cal-component.c: added support for CONTACT properties,
-	mainly by copying the code for COMMENT properties which are exactly
-	the same type.
-
-	* gui/e-day-view.c (e_day_view_realize): use the same color for the
-	top canvas background as the shortcut bar, to make it look a little
-	nicer (I think). Although we still have the theme problem with
-	hard-coded colors.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.etspec: Made the click-to-add message
-	shorter.  Fixes bug #7177.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (pixmaps): Added Tigert's new icons for
-	Prev and Next.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (make_suboptions): Make the "Any Category"
-	item consistent with the one in the addressbook.  Also, free the
-	items correctly.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.c (get_current_category): Handle an array of
-	categories in the CalSearchBar instead of our own menu items.
-	(notify_query_contains): Fetch the text from the search bar here
-	instead of in regen_query().
-	(regen_query): Handle category searches.
-	(notify_category_is): New function.
-	(cal_search_bar_construct): Do not create an option menu.
-	(make_suboptions): New function to create the suboption items from
-	the list of categories.
-	(notify_query_contains): Do not include a category sexp here.
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (update_item): add dialog for feedback
-	(remove_item): ditto
-	(send_item): ditto
-	(send_freebusy): ditto
-
-2001-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c: rewrite the gui to use gtkhtml
-
-	* gui/Makefile.am: define the icon dir
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-itip-control.h: Remove #include <config.h> from here.
-	* gui/itip-utilss.h: Same here.
-	
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/tasks-control.c: Update the paths of the Tools menu
-	according to the changes in the XML [i.e. things are moved to the
-	ComponentToolsPlaceholder].
-
-	* gui/calendar-commands.c: Likewise.
-
-2001-08-11  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c (init_widgets): 
-	* gui/dialogs/task-page.c (init_widgets): turn on word-wrap for the
-	description fields. Fixes bug #6821.
-
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/cal-search-bar.c: Where we have ESearchBarItems, set their
-	subitems to NULL.
-
-2001-08-09  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object_component): added new
-	backend method to get the component given a UID.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component): 
-	added implementation of above virtual method.
-	
-	* pcs/query.c (match_component): use the new backend function to get
-	the CalComponent rather than the string. This avoids converting all
-	the calendar components to strings and parsing them back into
-	components for every query! (That wasn't a good idea, was it ;)
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: use a timeout handler to layout the events,
-	to avoid doing a layout for each event we get from a query.
-
-	* gui/print.c (print_day_add_event): 
-	* gui/e-day-view.c (e_day_view_add_event): set start_row_or_col and
-	num_columns to 0. They are guint8's.
-
-	* gui/e-week-view.c (e_week_view_free_events): hide all the jump
-	buttons. Fixes bug #5946.
-
-	* gui/calendar-commands.c (calendar_set_folder_bar_label): added the
-	day numbers for the month view.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Delete" to "_Remove",
-	since it clashed with "_Add". Also added underlined accelerators for
-	the recurrence radio buttons. Note that none of these accelerators
-	actually work at present, due to the way we are using .glade files
-	for each notebook page. I need to add a bug about this.
-	Also, the "_Action" menu doesn't popup when I press Alt+A, even though
-	the "_File" menu does popup when I press Alt+F. Strange.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object):
-	removed debug msgs.
-
-2001-08-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	unref the GdkPixmap and GdkBitmap returned by the function
-	e_categories_config_get_icon_for ()
-
-2001-08-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-page.*: Remove progress frame
-
-	* gui/dialogs/task-details-page.*: Put in progress frame, remove
-	basics frame
-	
-	* gui/dialogs/task-editor.c (set_menu_sens): util function to set
-	menu sensitivity based on state
-	(task_editor_init): add meeting page
-	(task_editor_edit_comp): show page if necessary
-	(task_editor_destroy): unref meeting page
-	(assign_task_cmd): bring up meeting page
-	(refresh_task_cmd): save before sending
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (save_cmd): implement new save command
-
-2001-08-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-itip-control.c (destroy): Chain to the destroy handler in
-	the parent class!
-
-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):
-	Likewise.  Sigh.
-
-	* gui/cal-search-bar.c (cal_search_bar_destroy): Whoops, added a
-	destroy handler.
-
-2001-08-08  Damon Chaplin  <damon@ximian.com>
-
-	* gui/goto-dialog.glade: removed underlined accelerator key from
-	"_Go To Today" button. GnomeDialog doesn't actually support underlined
-	accelerator keys for buttons. We could hack it, like Glade does, if
-	we really need to. Fixes bug #6418.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): Stop editing any event.  Fixes
-	bug #5949.
-
-2001-08-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): Duuuh, set
-	the alarm_copy on the component, not the original alarm.  Fixes
-	bug #5214.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (set_attendees): set the attendees of
-	a component
-	(meeting_page_fill_component): use above
-	(meeting_page_get_cancel_comp): return a comp with the attendees
-	to be cancelled
-
-	* gui/dialogs/meeting-page.h: get a component that will be sent as
-	a cancellation
-
-	* gui/dialogs/event-editor.c (event_editor_class_init): override
-	send_comp class method
-	(event_editor_send_comp): send cancellation notices to deleted
-	attendees
-	(refresh_meeting_cmd): save before send
-	(forward_cmd): ditto
-
-	* gui/dialogs/comp-editor.c (comp_editor_class_init): set default
-	send_comp method
-	(real_send_comp): do the real work
-	(comp_editor_send_comp): call class method
-	(save_comp): don't do any sending
-	(save_comp_with_send): save and send here
-	(prompt_to_save_changes): use above
-	(save_close_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: add virtual function
-
-2001-08-08  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): don't use a NULL mask in the
-	call to gdk_gc_set_clip_mask
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): ditto
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit-config.h: fix pre-processor
-	macros
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit-config.h: fix pre-processor macros
-
-	* conduits/todo/todo-conduit.h: ditto
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/cal-listener.c (cal_listener_stop_notification): New
-	function to stop further notification from happening.
-	(impl_notifyCalOpened): Do not notify if requested.
-	(impl_notifyObjUpdated): Likewise.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyCategoriesChanged): Likewise.
-	(CalListenerPrivate): Do not keep a reference to the server-side
-	Cal.  This would create a circular reference since the server
-	keeps a reference to the listener.
-	(cal_listener_destroy): Likewise.
-	(impl_notifyCalOpened): Likewise.
-
-	* pcs/cal.c (cal_destroy): bonobo_object_release_unref() the listener.
-
-	* cal-client/cal-client.c (cal_client_destroy): Ask the listener
-	to stop notifications.  Also, do not unref it as the server does
-	that itself when we unref the Cal.
-
-2001-08-07  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_free_value): Only unref the
-	FIELD_COMPONENT if it is non-NULL.  We return a NULL for that
-	field from ::initialize_value(), after all.  Fixes bug #6098.
-
-2001-08-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Make calendar.ics the
-	suggested name when attaching the ical object
-
-2001-08-06  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view.h: 
-	* gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent
-	and EWeekViewEvent, to note that the event is in a different timezone.
-	We now compute this once when we add the event to the array, rather
-	than each time we draw the event. If it is set, we will draw the
-	timezone icon next to the event.
-
-	* gui/e-day-view-main-item.c: take transparency into account when
-	drawing the blue vertical bars to represent busy time.
-
-	* gui/tag-calendar.c: take transparency into account when tagging
-	the mini calendar.
-
-	* gui/e-calendar-table.c (e_calendar_table_init): removed the "None"
-	options for transparency and classification, since these properties
-	have defaults anyway, so we may as well use those to keep it simple.
-	Also use "Free" and "Busy" for transparency, rather than "Transparent"
-	and "Opaque".
-
-	* gui/calendar-model.c: updated classification & transparency code
-	as above.
-
-	* gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As"
-	since people have a chance of understanding that.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: 
-	* gui/gnome-cal.c: added functions to get the visible time range.
-
-	* gui/calendar-commands.c: finished stuff to set the folder bar
-	label to the dates currently displayed.
-
-	* gui/control-factory.c (control_factory_new_control): connected
-	signal to update the folder title bar label when the dates shown
-	are changed. I had to connect it here since we need the BonoboControl
-	in the callback, and I don't know how to get the control from the
-	widget.
-
-	* gui/tasks-control.c (tasks_control_activate): clear the folder bar
-	label. We could display something here at some point.
-
-	* gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since
-	we have an "_Actions" menu. (These also use Alt+key, right?)
-
-	* gui/dialogs/event-page.glade: 
-	* gui/dialogs/event-page.c: added 'Show Time As' field, which is
-	really the TRANSP property but with a better name!
-	Also changed one of the "_Confidential" to "Con_fidential" since we
-	already have "_Contacts" using the same 'C' key.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip
-	events that are TRANSPARENT. Also added comment as this code looks
-	inefficient.
-
-	* cal-util/cal-component.c: removed stuff for comparing timezones.
-
-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the
-	above function here, and updated it to compare the UTC offsets of the
-	times as well as the TZIDs.
-
-2001-08-06  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: In process of fixing bug
-	#6005.  The "Calendar" page is now "Display", and it has no
-	frames.  The "Task list" page has colons between the labels and
-	the color pickers, and it has no frame.
-
-2001-08-06  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.c (destroy_wombat_client): added check for
-	NULL pointers. Maybe fixes #5203 (I can't reproduce it, so I'm not
-	sure)
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-client/query-listener.c (query_listener_stop_notification):
-	New function; stops further notification from happening.  This is
-	needed since the listener is destroyed asynchronously from the
-	Wombat and the corresponding CalQuery may already have died.
-	(impl_notifyObjUpdated): Do not notify if requested.
-	(impl_notifyObjRemoved): Likewise.
-	(impl_notifyQueryDone): Likewise.
-	(impl_notifyEvalError): Likewise.
-
-	* cal-client/cal-query.c (cal_query_destroy): Use
-	query_listener_stop_notification().
-
-	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the
-	pointers to the callback functions.
-
-	* gui/e-day-view.c (update_query): Commit our state of no longer
-	having a query before unrefing it.  We may reenter from the ORBit
-	main loop and we *really* want this information to be committed.
-
-	* gui/e-week-view.c (update_query): Likewise.
-
-	* gui/calendar-model.c (update_query): Likewise.
-
-	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"
-	argument that indicates whether the ECalendar should be cleared of
-	any marks first.
-
-	* gui/calendar-commands.c (calendar_control_activate): Removed
-	ifdefed-out view buttons code from the Gnomecal days.
-
-	* gui/gnome-cal.c (client_categories_changed_cb): Merge the
-	categories of the calendar and tasks clients so that we can
-	display the categories in both sets.
-	(gnome_calendar_construct): Connect to "categories_changed" on
-	both clients.
-	(gnome_calendar_on_date_navigator_selection_changed): Removed call
-	to gnome_calendar_update_view_buttons().
-	(gnome_calendar_update_view_buttons): Removed.  We cannot have
-	this until Bonobo supports radio toolbar items.
-	(gnome_calendar_set_view_buttons): Removed.
-	(gnome_calendar_dayjump): Do not use priv->day_button.
-	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button 
-	fields.
-	(gnome_calendar_set_query): Start a retagging process of the date
-	navigator so that it reflects the current query.
-	(update_query): New function to restart a query for the date navigator.
-	(initial_load): Use update_query() instead of tagging the date
-	navigator directly.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(client_cal_opened_cb): Use update_query() instead of initial_load().
-	(initial_load): Removed.
-	(client_obj_updated_cb): Removed.
-	(client_obj_removed_cb): Removed.
-	(gnome_calendar_new_appointment_for): Set the default category of
-	the new component.
-	(search_bar_category_changed_cb): Set the default category for the
-	calendar views.
-
-	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the
-	categories before creating the menu.
-
-	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of
-	"#f" if the time range is not set yet.
-	(update_query): Do not start a query if the time range is not set.
-	(e_day_view_set_default_category): New function.
-	(e_day_view_key_press): Set the default category on the new
-	component.
-
-	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.
-	(update_query): Analogous to the above.
-	(e_week_view_set_default_category): Analogous to the above.
-	(e_week_view_key_press): Analogous to the above.
-
-2001-08-03  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1407.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Removed the alarm
-	preferences page, since we decided it was unnecessary.
-
-2001-08-03  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes.
-
-	* gui/dialogs/event-page.c (summary_changed_cb):
-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need
-	UTF-8 string).
-
-	* gui/itip-utils.c:
-	Added missing #include <config.h>
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/Makefile.am: Added camel dependency (now needed by ebook).
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_value_is_empty): If the
-	default category is the same as the value passed in to this
-	function, return TRUE.  This could be a hack or not, but it
-	prevents two items from being added to the table if a category is
-	selected.
-
-	* gui/e-tasks.c (setup_widgets): Allow the search bar to shrink
-	horizontally.
-
-	* gui/dialogs/task-page.c (clear_widgets): Pass valid values to
-	e_dialog_option_menu_set(); these need to come from the status map.
-
-2001-08-01  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.c: removed debugging messages.
-
-2001-08-01  Federico Mena Quintero  <federico@ximian.com>
-
-	The calendar search bar widget now includes a drop-down menu of
-	available categories.
-
-	* pcs/query.c (func_has_categories): Handle one and only one #f
-	value as meaning "unfiled", for components that have no categories
-	at all.
-
-	* pcs/cal-backend-file.c (open_cal): Duh, do not notify here about
-	changed categories since at this point we don't have any clients
-	bound to us yet.
-	(create_cal): Likewise.
-	(cal_backend_file_add_cal): Notify here.
-
-	* gui/cal-search-bar.h (CalSearchBarClass): New signal
-	"category_changed".
-
-	* gui/cal-search-bar.c (cal_search_bar_construct): Add a drop-down
-	menu for the list of categories.
-	(search_option_items): Removed the "Has category" option, since we
-	now have the drop-down menu instad and it would be confusing to
-	have both options.
-	(regen_query): Likewise.  Also, this function is now the old
-	cal_search_bar_query_changed() and is shared by that very function
-	and by the callback from the drop-down menu.
-	(notify_query_contains): Include the sub-sexp for the categories.
-	(cal_search_bar_set_categories): New function.
-	(cal_search_bar_get_category): New function.
-	(categories_selection_done_cb): Emit the "category_changed" signal.
-
-	* gui/e-tasks.c (obj_updated_cb): Removed function since it did
-	not do anything; all updates are handled by the CalendarModel.
-	(obj_removed_cb): Likewise.
-	(ETasksPrivate): Removed the fields for the categories option
-	menu, since now it is in the ESearchBar.
-	(search_bar_sexp_changed_cb): Use calendar_model_set_query()
-	directly here, as we do not need to frob the sexp anymore.
-	(update_query): Removed.
-	(client_categories_changed_cb): New callback.
-	(search_bar_category_changed_cb): New callback.
-	(e_tasks_new_task): Set the default category on the component to
-	the one that is selected in the search bar.
-	(e_tasks_on_filter_selected): Removed.
-	(e_tasks_on_categories_changed): Removed.
-	(e_tasks_rebuild_categories_menu): Removed.
-	(e_tasks_add_menu_item): Removed.
-	(e_tasks_setup_view_menus): Sanitized not to sink objects wildly.
-	(e_tasks_discard_view_menus): New function.
-
-	* gui/calendar-model.h (CalendarModelClass): Removed the
-	"categories_changed" signal since this is handled in the Wombat
-	now.
-
-	* gui/calendar-model.c (calendar_model_get_categories): Removed.
-	(calendar_model_set_value_at): Do not collect the categories.
-	(query_obj_updated_cb): Likewise.
-	(calendar_model_collect_categories): Removed.
-	(calendar_model_set_default_category): Constify.
-
-	* gui/tasks-control.c (tasks_control_deactivate): Call
-	e_tasks_discard_view_menus().
-
-	* gui/gnome-cal.c (search_bar_category_changed_cb): Set the
-	default category for the task pad's model.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	The Wombat now keeps track of which categories are present in the
-	objects of a calendar.  It will notify the clients of changes in
-	this set.  This is to make the category drop-down menus in the
-	calendar/tasks views be always up to date.
-
-	* idl/evolution-calendar.idl (Listener): Added a
-	notifyCategoriesChanged() method.  The Wombat now keeps track of
-	the categories within a calendar.
-
-	* cal-client/cal-listener.[ch]: Switched it to use BonoboXObject.
-	Also added the notifyCategoriesChanged implementation.
-
-	* cal-client/cal-client.[ch]: Added a "categories_changed" signal.
-
-	* pcs/cal-backend-file.c: Maintain a list of the live categories.
-	(update_categories_from_comp): New function to maintain the set of
-	live categories.
-	(add_component): Update the set of categories.
-	(remove_component): Likewise.
-	(open_cal): Notify about changes in the set of categories.
-	(create_cal): Likewise.
-	(cal_backend_file_update_objects): Likewise.
-	(cal_backend_file_remove_object): Likewise.
-	(notify_categories_changed): New function to notify the clients
-	about the current set of categories.
-
-	* pcs/cal.c (cal_notify_categories_changed): New function.
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-        * gui/e-day-view.c (selection_received):
-        * gui/e-week-view.c (selection_received): yes, set the end date, but
-	correctly calculated, not by using the component's duration, which
-	may not exist. Now really fixes #5836
-
-2001-07-31  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received):
-	* gui/e-week-view.c (selection_received): don't set the end date
-	for the pasted components, since it will be recalculated when the start
-	date is set, thus keeping the same duration than the original
-	cut/copied component. Fixes #5836
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/gnome-cal.c: 
-	* gui/calendar-commands.c (clear_folder_bar_label): started some code
-	to show the currently displayed dates in the folder title bar.
-	Unfinished.
-
-	* gui/e-itip-control.c (set_date_label):
-	* conduits/todo/todo-conduit.c (local_record_from_comp): 
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
-	the CalComponentDateTimes. (Note the iTIP control needs updating for
-	timezone support.)
-
-	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
-	TZID is malloc'ed and freed rather than being a pointer to a static
-	string. This was causing problems as sometimes we were freeing the
-	string that was being pointed to, so we got corrupted TZIDs.
-
-	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
-	DATE values do not have timezones.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
-	since I think they are more commonly-used. Also added underlined
-	accelerator keys.
-
-	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
-	popup menu to be consistent with other folders, and separated from the
-	clipboard commands. Also changed to use EPopupMenu so the accelerators
-	work, and the masks may be useful at some point.
-
-	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
-	that makes it simpler. Fixes bug #5034.
-
-	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
-	location string. Fixes bug #4990.
-
-	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
-	don't include the end time.
-
-	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
-	days_shown. Fixes bug #5709.
-
-	* cal-client/cal-client.c (cal_client_get_timezone): took out some
-	debugging messages.
-
-2001-07-30  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of
-	course it doesn't do anything yet.
-
-2001-07-30  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Mark strings for translation
-
-2001-07-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/client-test.c (cal_opened_cb): call
-	cal_client_get_free_busy for testing the new method
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): implemented
-
-2001-07-28  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #5352.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show): Added a
-	`page' argument so that we can select which page to show when
-	popping up the dialog.
-	(cal_prefs_dialog_construct): Added the `page' argument as well.
-	(cal_prefs_dialog_new): Likewise.
-
-	* gui/calendar-commands.c (settings_cmd): Set the page to the main
-	calendar settings one.
-
-	* gui/tasks-control.c (tasks_control_settings_cmd): Implemented
-	callback for the "Task Settings" command.
-	(verbs): Added the "TasksSettings" verb.
-	(pixmaps): Added an icon for the tasks settings command.
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	recur is always in UTC
-	
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/calendar/calendar-conduit.h: time zone field for the
-	context
-
-	* conduits/calendar/Makefile.am: link to bonobo conf
-
-	* conduits/todo/todo-conduit.c: handle timezones
-	everywhere
-	(get_timezone): new function to get a timezone based
-	on a tzid
-	(get_default_timezone): get default timezone
-
-	* conduits/todo/todo-conduit.h: time zone field for the
-	context
-
-	* conduits/todo/Makefile.am: link to bonobo conf
-	
-2001-07-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): 
-	initialize to NULL some pointers
-
-	* e-calendar-table.c (selection_received): deal correctly with
-	VCALENDAR objects
-	(e_calendar_table_copy_clipboard): g_strdup the value returned by
-	icalcomponent_get_as_ical_string
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (gnome_calendar_set_query): Constify and set the
-	query sexp on the task pad's model as well.
-
-2001-07-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/cal-search-bar.[ch]: New files with a derivative of
-	ESearchBar that generates sexps for calendar queries directly.
-
-	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of
-	ESearchBar.
-
-	* gui/e-calendar-table.h (ECalendarTable): Removed the ->colors
-	array since it is handled by ETableExtras now.
-
-	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use
-	the live query facility to filter tasks.  Removed the filter
-	function stuff as well.
-
-	* gui/e-tasks.c (e_tasks_construct): Use
-	calendar_model_set_cal_client() directly instead of
-	e_calendar_table_set_model().
-	(setup_widgets): Create a calendar search bar for the tasks
-	component.
-	(search_bar_sexp_changed_cb): Set the query sexp on the table model.
-	(e_tasks_on_filter_selected): Regenerate the query from the
-	selected category and the current sexp.
-	(update_query): New convenience function to recompute the real
-	query sexp.
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.
-
-	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):
-	Removed function; people are now supposed to get the model from
-	the calendar table and operate on it.
-
-	* gui/calendar-commands.c (verbs): Consistency fixes with the XML
-	file.
-	(pixmaps): Likewise.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	cal-search-bar.[ch] to the list of sources.
-
-2001-07-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CompEditorFactory): New interface to
-	a centralized factory for calendar component editors.  Has
-	editExisting() and editNew() methods to edit an existing component
-	from a URI/UID pair, and to create a new component in a calendar
-	that is in a particular URI, respectively.
-
-	* gui/comp-editor-factory.[ch]: Implementation files for the
-	component editor factory.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory
-	stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-editor-factory.[ch] to the list of sources.
-
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): when an entry
-	has changed, iterate over the elements of the entry and add them
-	to the list if need be
-	(get_select_name_dialog): add a Chair Persons section
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-	
-2001-07-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): send the empty string as
-	subject if there is no summary
-
-	* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of
-	attendees
-	(meeting_page_fill_widgets): clean up attendee lists and fix typo
-	(find_match): add ability to return pos of match
-	(popup_delete_cb): if deletion happens, make sure to tidy up
-	delegation chain
-
-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
-	use the destination rather than text property
-	(e_delegate_dialog_get_delegate): ditto
-	(e_delegate_dialog_new): take name/address pair for dialog default
-
-	* gui/dialogs/e-delegate-dialog.h: update protos
-
-	* gui/e-itip-control.c (clean_up): only unref the object if we
-	have one
-	
-	* gui/itip-control-factory.c (stream_read): make sure we null
-	terminate the final buffer
-
-	* gui/itip-utils.c (itip_send_comp): strip the mailto: from the
-	organizer address if necessary
-
-2001-07-26  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (exception_select_row_cb): check that
-	the row passed in is valid. Sometimes we get the "row-selected"
-	signal for row 0 when there are no rows in the list. Fixes bug #4266.
-
-	* cal-client/cal-client.c (cal_client_get_object): prefetch all the
-	timezone data needed by the object, to try to avoid making Corba
-	calls all over the place. They can cause problems because they call
-	the GTK+ main loop recursively. This currently leads to an assertion
-	failure in the GnomeCanvas occasionally.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_set_data): gracefully
-	handle the lack of a method
-
-2001-07-25  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received_cb): check type of component
-	before actually pasting.
-	Deal with VCALENDAR components also (fixes bug #5140)
-
-	* gui/e-week-view.c (selection_received_cb): ditto
-
-	* cal-client/cal-client.c (cal_client_update_object): check the return
-	value from cal_component_get_as_string and don't call
-	GNOME_Evolution_Calendar_Cal_updateObjects if NULL
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
-
-	* gui/print.c (range_selector_new): changed the 'Current day/week...'
-	strings to 'Selected day/week...' to make a little less confusing.
-	Fixes bug #5451.
-
-2001-07-25  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (is_duplicate): see if the address is
-	already in the list of attendees
-	(duplicate_error): throw up an error dialog
-	(popup_delegate_cb): if the attendee has already delegated, delete
-	the old delegatee
-	(value_at): cast to kill warnings
-	(append_row): don't add the new attendee if they are already in
-	the list
-
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (get_exception_string): calculate
-	tmp_tm.tm_wday ourselves. strftime has a habit of crashing if you
-	have weird values here. I think this fixes bug #4574.
-
-2001-07-24  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (value_at): stip the delto and
-	delfrom
-	(popup_delegate_cb): show a delegate dialog and add the new
-	delegatee and update the delegator
-	(add_section): listen for changes in a more direct manner
-	(get_select_name_dialog): add_section now takes a limit argument
-
-	* gui/dialogs/e-delegate-dialog.[hc]: New dialog to query the user
-	for a person to delegate to
-
-	* gui/dialogs/Makefile.am: build/install new files
-
-	* gui/Makefile.am: add ldadd line for ebook
-
-2001-07-21  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed
-	the test to see whether we should draw the icons.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (get_local_file_name_for_folder_type):
-	New helper function.
-	(remove_folder): Add a @type arg and handle it, by deleting
-	"tasks.ics" instead of "calendar.ics" if the type is "tasks".  If
-	the type is not "tasks" or "calendar", report an
-	`UNSUPPORTED_TYPE' error.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c: Make folders of type "calendar" and
-	"tasks" user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/event-editor.h (event_editor_update_widgets):
-	Removed unused prototype.
-
-	* gui/dialogs/task-editor.h (task_editor_update_widgets):
-	Likewise.
-
-2001-07-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (clean_up): free various data related
-	settings
-	(destroy): use cleanup and unref the clients
-	(e_itip_control_set_data): clean up before setting the data and
-	store the timezones in a top level component
-	(update_item): use cal_client_update_objects and our top level
-	(including the timezones)
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/comp-editor.c (pixmaps): 
-	* gui/calendar-commands.c (pixmaps): updated to use new print icon.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (init_widgets): don't show the time
-	in the EDateEdit widget for adding EXDATEs.
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): don't
-	set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably
-	don't want a date value, so we leave it at 0.
-
-2001-07-18  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	do not discard drawing icon if mask is NULL
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-2001-07-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (get_next): find the next displayable
-	component
-	(get_prev): find the previous displayable component
-	(e_itip_control_set_data): use above
-	(prev_clicked_cb): ditto
-	(next_clicked_cb): ditto
-
-2001-07-17  Federico Mena Quintero  <federico@ximian.com>
-
-	Really fixes #4380.  The previous fix was necessary but not
-	sufficient; it worked for me because my system timezone happens to
-	match the Evolution timezone --- if they don't match, the bug
-	would persist.  Not matching is *not* an error; it is just a
-	matter of Unix sucking a lot and XST not being finished :)
-
-	* cal-util/timeutil.c (time_to_gdate_with_zone): New function.  We
-	cannot use g_date_set_time() anymore because it does not take
-	timezones into account.
-
-	* gui/gnome-cal.c (get_days_shown): Use the function above.
-
-	* gui/e-day-view.c (e_day_view_find_work_week_start): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_selected_time_range): Likewise.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/dialogs/meeting-page.c (invite_entry_changed): Print
-	a g_message when the list of invited people changes
-	in the SelectNames control.
-	(add_section): #if 0/#endif out some (broken?) code.
-	(get_select_name_dialog): Listen for changes in the
-	SelectNames control.
-
-2001-07-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_destroy): destroy
-	the dialog widget here. Fixes bug #4198.
-
-2001-07-16  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-page.c (task_page_fill_widgets): 
-	* gui/dialogs/event-page.c (event_page_fill_widgets): try to use
-	builtin timezones before getting them from the server. When creating
-	new events/tasks the timezones may not be on the server.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): for all-day
-	events we subtract a day from the end date rather than add it.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): ignore the event
-	if it isn't a GDK_CROSSING_NORMAL event. For some reason we are getting
-	leave events when the button is pressed, which meant that selecting
-	timezones in the map didn't work.
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): 
-	* gui/print.c (print_date_label): only free icaltimetype if not NULL.
-
-2001-07-12  Taylor Hayward  <taylorhayward@yahoo.com>
-
-	* gui/goto-dialog.glade:
-	* gui/meeting-mockup.glade:
-	* gui/alarm-notifyålarm-notify.glade:
-	* gui/dialogs/alarm-page.glade:
-	* gui/dialogs/meeting-page.glade:
-	* gui/dialogs/recurrence-page.glade: Added missing underlined
-	shortcuts.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-	
-	* cal-util/cal-util.h: new proto
-
-	* cal-util/cal-util.c (cal_util_new_top_level): standard place to
-	get your top level calendar component
-
-	* pcs/cal-backend-file.c (create_cal): use it
-
-	* gui/itip-utils.c (itip_send_comp): ditto
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): ditto
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
-	typo breaking compilation
-
-	* gui/dialogs/meeting-page.c: fix include
-
-	* gui/dialogs/Makefile.am: build select names idl here
-
-	* gui/Makefile.am: remove select names compilation from here
-	
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	guard against infinite loops with the updating boolean, fixes 4270
-
-2001-07-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c: added support for multiple selections in
-	cut/copy/paste. Also, it's now ready for the
-	s/update_object/update_objects change (I think)
-
-2001-07-11  Damon Chaplin  <damon@ximian.com>
-
-	* idl/evolution-calendar.idl: renamed updateObject to updateObjects
-	and removed the UID argument, since it can add/update multiple objects
-	at once. (It can't yet, but it will!)
-
-	* pcs/cal.c: 
-	* pcs/cal-backend.[hc]: 
-	* pcs/cal-backend-file.c: renamed update_object to update_objects and
-	got rid of the UID arg.
-
-	* cal-client/cal-client.c (cal_client_update_objects): new function to
-	add/update multiple objects in one go, i.e for iTIP and for importing
-	calendars.
-
-	* gui/print.c (print_date_label): fixed type bug.
-
-	* gui/e-week-view.[hc]: 
-	* gui/e-week-view-event-item.c: draw the timezone icons if the event's
-	DTSTART or DTEND is in a different timezone to the current one.
-	Note that we may want to change this so it compares the UTC offsets
-	rather than the TZIDs, since currently it will draw the icons for all
-	events coming from iTIP requests from other clients.
-
-2001-07-11  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4380 as well as some leftovers from the days of struct
-	tm and some uninitialized values.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Initialize
-	the icaltimetype structures completely.
-	(gnome_calendar_init): Do not reset priv->zone to NULL here, since
-	it was set by gnome_calendar_update_config_settings() from
-	setup_widgets().
-
-	* gui/calendar-model.c (set_completed): Do not set is_daylight.
-
-	* gui/e-day-view.c (e_day_view_convert_grid_position_to_time):
-	Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_timezone): Likewise.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Likewise,
-	and initialize start_tt and end_tt completely.
-
-	* cal-util/timeutil.c (time_year_begin_with_zone): Likewise.
-	(time_month_begin_with_zone): Likewise.
-	(time_week_begin_with_zone): Likewise.
-	(time_day_begin_with_zone): Likewise.
-	(time_day_end_with_zone): Likewise.
-	(time_from_isodate): Likewise.
-
-	* gui/dialogs/task-page.c (task_page_fill_component): Initialize
-	icaltime before using it.
-
-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.
-
-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an
-	unused icaltimetype.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_component): Initialize icaltime before
-	using it.
-
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component-factory.c: fix the calendar not exiting with a
-	gross hack because i don't have time to fix the ref counting right
-	now
-	
-2001-07-11  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: be careful about adding and
-	stripping MAILTO:'s properly
-
-	* gui/dialogs/meeting-page.etspec: add missing columns
-
-	* gui/itip-utils.c (itip_strip_mailto): point to the real start of
-	the email address
-
-	* gui/itip-utils.h: add proto
-
-	* gui/itip-control-factory.c: get rid of the my address property
-
-	* gui/e-itip-control.c: use the users real identity to figure out
-	which attendee they are
-	(find_my_address): figure out who the user is among the attendees
-
-	* gui/e-itip-control.h: remove protos
-
-	* gui/dialogs/Makefile.am: extra dist etspecs
-
-	* gui/Makefile.am: ditto
-
-2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Added a hack to get the last
-	string translated since xml-i18n-tools doesn't recognize
-	_click-to-add-message="Click here to add a task".
-	
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am (BUILT_SOURCES): Move this higher so that
-	Makefile properly depends on us. Fixes distcheck.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4389: ETableSpecification still in e-calendar-table.c
-	file]
-	
-	* gui/e-calendar-table.etspec: New file containing the spec that
-	was in e-calendar-table.c as a big string.
-	
-	* gui/e-calendar-table.c (e_calendar_table_init): Use the spec
-	file instead of a string.
-	(e_calendar_table_get_spec): Removed this function, we don't need
-	it anymore.
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Don't load from string,
-	from file instead.
-	
-	* gui/Makefile.am: Necessary changes to get the new .etspec file
-	installed.
-
-2001-07-10  Jason Leach  <jleach@ximian.com>
-
-	[Fix bug #4388: ETableSpecification still in meeting-page.c file]
-
-	* gui/dialogs/meeting-page.etspec: New file containing the spec
-	that was previously in meeting-page.c as a string.
-	
-	* gui/dialogs/meeting-page.c: One line change to get it to use
-	this spec file instead of a string.
-
-	* gui/dialogs/Makefile.am: Necessary changes to get the new
-	meeting-page.etspec installed.
-
-2001-07-10  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-model.c:
-	* gui/e-calendar-table.c:
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.[hc]:
-	* gui/e-week-view.c:
-	* gui/gnome-cal.c:
-	* gui/print.c:
-	* gui/dialogs/cal-prefs-dialog.c:
-	* gui/dialogs/comp-editor-util.c:
-	* gui/dialogs/event-page.c:
-	* pcs/cal-backend-file.c:
-	* pcs/query.c:
-	* cal-util/cal-component.[hc]: 
-	* cal-util/cal-recur.c: 
-	* cal-util/timeutil.[hc]: 
-	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much
-	done with the calendar code now, except for alarms and conduits,
-	which Federico and JP know more about. And there are a couple of
-	other minor things to fix. But it is still pretty buggy.
-
-2001-07-10  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add popup support so you can delete
-	users from the list
-
-	* gui/dialogs/comp-editor.c (setup_widgets): fix typo
-
-2001-07-10  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Handle the
-	different alarm actions.
-	(display_notification): Do the alarm notification dialog here.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (make_heading): Take in a
-	CalComponentVType, not a whole component.
-	(alarm_notify_dialog): Take in a CalComponentVType and the final
-	message instead of generating it ourselves.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
-	parent vCalendar component as the timezone closure of
-	cal_recur_generate_instances().
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
-	consistent with the option menu text.
-	(get_alarm_string): Removed extra spaces from the last part of the
-	alarm string.
-
-2001-07-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_day_view_cut_clipboard): Constify.
-	(e_day_view_on_cut): Constify.
-	(e_day_view_reshape_long_event): Remove unused variable.
-
-	* gui/e-week-view.c (e_week_view_key_press): Use
-	e_utf8_from_gtk_event_key() so that we can input utf8 text
-	properly.
-	(e_week_view_cut_clipboard): Constify.
-	(e_week_view_on_cut): Constify.
-
-	* cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the
-	prototype so that this matches CalRecurResolveTimezoneFn.  Also
-	renamed it so that it is clear that it is supposed to be a
-	callback.
-
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (init_widgets): connect to the entry
-	not the combo
-
-	* gui/dialogs/event-editor.c (set_menu_sens): set menu
-	sensitivities based on whether or not the meeting page is shown
-	(event_editor_init): call above
-	(event_editor_edit_comp): ditto
-	(schedule_meeting_cmd): ditto
-
-	* gui/dialogs/comp-editor.h: new proto
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_ui_prop): new
-	function to allow for set of ui props (esp. "sensitive")
-	
-2001-07-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c (clear_widgets): actually clear some
-	widgets and hide/show widgets in the default setup
-	(meeting_page_destroy): destroy the address lists
-	(meeting_page_fill_widgets): allow the user to select among their
-	identities as a new organizer, or show the existing organizer as
-	label
-	(meeting_page_fill_component): set the "MAILTO:" bit of the
-	organizer to match spec, set CN properly if we know it
-	(get_widgets): load new widgets
-	(other_clicked_cb): handle "Other Organizer" click
-	(change_clicked_cb): handle "Change Organizer" click
-	(init_widgets): listen for clicks on new buttons
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove the
-	page from our internal list and unref it
-
-	* gui/itip-utils.c (itip_addresses_get): get the configure mail
-	identities
-	(itip_addresses_free): free a list of identities returned by
-	itip_addresses_get
-
-	* gui/itip-utils.h: remove obsolete protos, and new protos
-
-	* gui/gnome-cal.html: Remove ancient file
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #4018 and what would be the analogous bugs for the other
-	component editors.
-
-	* gui/dialogs/comp-editor-page.h (CompEditorPageClass): New
-	virtual method "::focus_main_widget()".
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_focus_main_widget): New function.
-
-	* gui/dialogs/comp-editor.c (comp_editor_append_page): If we are
-	inserting the main page, ask it to focus its main widget.
-
-	* gui/dialogs/alarm-page.c (alarm_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/event-page.c (event_page_focus_main_widget):
-	Implemented.
-	#include "e-util/e-categories-config.h".
-
-	* gui/dialogs/meeting-page.c (meeting_page_focus_main_widget):
-	Implemented.
-
-	* gui/dialogs/recurrence-page.c
-	(recurrence_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_focus_main_widget): Implemented.
-
-	* gui/dialogs/task-page.c (task_page_focus_main_widget):
-	Implemented.
-
-2001-07-04  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-commands.c (clear_folder_bar_label): New function.
-	(calendar_control_activate): Clear the folder bar label; we really
-	don't have anything interesting to display.
-
-2001-07-03  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/meeting-page.c: Add new columns for information
-	specification
-	(meeting_page_destroy): save the table state
-	(build_etable): load new table state
-
-	* gui/dialogs/task-editor.c (task_editor_destroy): unref pages
-
-	* gui/dialogs/event-editor.c (event_editor_destroy): unref pages
-
-	* gui/dialogs/comp-editor.c (setup_widgets): kill warning
-	(comp_editor_append_page): ref page passed in
-	(close_dialog): unref pages
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-day-view.c (query_obj_updated_cb): fix warning, and added
-	some debug messages.
-
-	* gui/dialogs/comp-editor-util.c (write_label_piece): 
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): call mktime()
-	to set the weekday, though this is a temporary fix.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE
-	component given a TZID. We need this to resolve TZIDs when expanding
-	an event using cal_recur_generate_instances() in query.c.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented
-	virtual method.
-	(cal_backend_file_update_object): fixed bug, kind -> child_kind.
-
-	* pcs/query.c (func_occur_in_time_range): use the virtual method for
-	resolving TZIDs. The other way didn't work anyway, as we didn't have
-	the entire VCALENDAR with VTIMEZONEs in it.
-
-	* gui/dialogs/recurrence-page.c (init_widgets): 
-	(make_ending_until_special): moved the call to
-	e_date_edit_set_get_time_callback() from init_widgets to
-	make_ending_until_special(), since that is where the widget gets
-	created.
-
-	* gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone
-	being NULL.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/alarm-options.[ch]: New files with the alarm options
-	dialog; this configures the repeat/duration properties and the
-	options specific to each alarm action type.
-
-	* gui/dialogs/alarm-page.c (AlarmPagePrivate): Added the alarm
-	options button.  Also, keep an alarm structure which we are
-	editing and an alarm options dialog.
-	(init_widgets): Connect to the options button.
-	(add_clicked_cb): Clone the component we are editing instead of
-	creating a new one so that we preserve the data from the alarm
-	options dialog.
-	(button_options_clicked_cb): Pop up the alarm options dialog.
-
-	* cal-util/cal-component.c (cal_component_alarm_new): Doh,
-	initialize the other fields in the new alarm.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* cal-client/cal-client.[hc]
-	* cal-util/cal-component.c
-	* cal-util/cal-recur.[hc]
-	* cal-util/test-recur.c
-	* cal-util/timeutil.c
-	* gui/calendar-config.c
-	* gui/calendar-model.[hc]
-	* gui/comp-util.[hc]
-	* gui/e-calendar-table.c
-	* gui/e-day-view-main-item.c
-	* gui/e-day-view-top-item.c
-	* gui/e-day-view.[hc]
-	* gui/e-itip-control.c
-	* gui/e-timezone-entry.[hc]
-	* gui/e-week-view.[hc]
-	* gui/gnome-cal.[hc]
-	* gui/goto.c
-	* gui/tag-calendar.[hc]
-	* gui/dialogs/cal-prefs-dialog.c
-	* gui/dialogs/comp-editor-page.[hc]
-	* gui/dialogs/comp-editor-util.[hc]
-	* gui/dialogs/comp-editor.c
-	* gui/dialogs/e-timezone-dialog.[hc]
-	* gui/dialogs/event-page.c
-	* gui/dialogs/meeting-page.c
-	* gui/dialogs/recurrence-page.c
-	* gui/dialogs/task-details-page.c
-	* gui/dialogs/task-details-page.glade
-	* gui/dialogs/task-page.c
-	* idl/evolution-calendar.idl
-	* pcs/cal-backend-file.c
-	* pcs/cal-backend.c
-	* pcs/cal-backend.h
-	* pcs/cal.c
-	* pcs/query.c: timezone changes everywhere. There's still quite a
-	few things to update, and its not working well at present.
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (publish_freebusy_cmd): publish
-	free/busy information for the currently viewed time range
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
-	(evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for ATTACH, DESCRIPTION properties in alarm components.
-
-	* cal-util/cal-component.c (scan_alarm_property):  Deal with
-	ATTACH, DESCRIPTION properties.
-	(cal_component_alarm_get_attach): New function.  Libical is
-	actually bogus; supposedly icalattachtype structures are
-	refcounted but the property functions return them by value.
-	(cal_copmonent_alarm_set_attach): New function.
-	(cal_component_alarm_get_description): New function.
-	(cal_component_alarm_set_description): New function.
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Support for repeat/duration properties in alarm components.
-
-	* cal-util/cal-component.h (CalAlarmRepeat): New structure that
-	pairs the repeat/duration values of an alarm component, which must
-	be set both together or not set at all.
-
-	* cal-util/cal-component.c (CalComponentAlarm): Added fields for
-	the repeat and duration properties.
-	(scan_alarm_property): Scan the DURATION and REPEAT properties.
-	(make_alarm): Nullify/initialize all the fields in the alarm.
-	(cal_component_alarm_get_repeat): New function.
-	(cal_component_alarm_set_repeat): New function.
-
-	* gui/dialogs/alarm-page.glade: Changed the label of display
-	alarms from "Show a dialog" to "Display a message".
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_fill_widgets): fill in delegated from field
-	
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/dialogs/task-page.c (categories_clicked_cb): 
-	* gui/dialogs/event-page.c (categories_clicked_cb): use the new
-	self-contained e_categories_config_open_dialog_for_entry() function
-
-	* gui/e-week-view-event-item.c (e_week_view_item_draw_icons): 
-	* gui/e-day-view-top-item.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): ditto
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	use e_categories_config_get_icon_for() to retrieve the icon
-	associated with each category
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (send_freebusy): implement
-
-	* cal-util/cal-component.c (set_attendee_list): add the delto
-	property rather than the delfrom property twice
-
-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show
-	delegation info if appropriate
-	(delegate_task_cmd): delegate command
-	(cancel_task_cmd): cancel command
-	(refresh_task_cmd): refresh command
-
-	* gui/dialogs/task-details-page.c: Load new widgets
-	(task_details_page_show_delegation): show/hide delegation info widgets
-
-	* gui/dialogs/task-details-page.h: new proto
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): free
-	attendee list when finished
-
-	* gui/dialogs/comp-editor.c (setup_widgets): explicitly show the
-	widgets, update pixmaps after the verbs have been added
-	(comp_editor_focus): don't do a show all
-
-2001-07-02  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #1406.
-
-	* gui/calendar-config.c (config_read): Handle the options for the
-	task list colors.
-	(calendar_config_write): Ditto.
-	(calendar_config_get_tasks_due_today_color): New function.
-	(calendar_config_set_tasks_due_today_color): New function.
-	(calendar_config_get_tasks_overdue_color): New function.
-	(calendar_config_set_tasks_overdue_color): New function.
-	(calendar_config_configure_e_calendar_table): Use
-	e_table_model_changed() for the colors.
-
-	* gui/dialogs/cal-prefs-dialog.glade: Updated the options for the
-	task list and alarms.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):
-	Update the task list settings.
-	(cal_prefs_dialog_update_config): Ditto.
-
-	* gui/calendar-model.c (get_color): Deal with tasks for today as
-	well as overdue tasks.  Make it cleaner, even though we have to
-	duplicate a chunk of is_overdue().
-
-	* gui/calendar-commands.c (preferences_cmd): Renamed from
-	properties_cmd().
-
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_day_event): draw icons per category
-
-	* gui/e-day-view-top-item.c
-	(e_day_view_top_item_draw_long_event): draw icons per category
-
-	* gui/e-day-view.c
-	(e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): calculate space for category icons
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_draw_icons): draw icons per category
-
-	* gui/e-week-view.c
-	(e_week_view_reshape_event_span): calculate space for category icons
-	
-2001-07-01  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_*_clipboard): fixed clibpoard
-	command activation from the menu entries. CTRL-C and CTRL-X don't
-	work though, since it seems the key presses are being captured by
-	the text item
-
-	gui/e-week-view.c (e_week_view_*_clipboard): ditto
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-week-view-event-item.c
-	(e_week_view_event_item_button_press): Only set the
-	pressed_event_num and pressed_span_num if button 1 was pressed.
-	Fix up return values a bit.  This fixes bug #3780.
-
-	* gui/gnome-cal.c
-	(gnome_calendar_on_date_navigator_selection_changed): Doh, the
-	call for the day view was supposed to be
-	gnome_calendar_set_view(), not set_view().  Fixes bug #3779.
-
-2001-06-30  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/tasks-control.c (tasks_control_cut_cmd): call
-	e_calendar_table_cut_clipboard with the correct object
-
-	(tasks_control_copy_cmd): ditto
-
-	(sensitize_commands): sensitize clipboard commands based on the
-	number of selected tasks
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch] (e_calendar_table_cut_clipboard),
-	(e_calendar_table_copy_clipboard),
-	(e_calendar_table_paste_clipboard): new functions for allowing the
-	execution of clipboard-related commands
-
-	* gui/tasks-control.c (tasks_control_cut_cmd),
-	(tasks_control_copy_cmd), (tasks_control_paste_cmd): added
-	callbacks for the new clipboard-related menu entries
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c: removed not-uses-anymore parameter in
-	call to evolution_shell_component_new
-
-	* gui/gnome-cal.[ch] (gnome_calendar_cut_clipboard),
-	(gnome_calendar_copy_clipboard), (gnome_calendar_paste_clipboard):
-	new functions for allowing execution of clipboard-related commands
-
-	* gui/e-day-view.[ch] (e_day_view_cut_clipboard),
-	(e_day_view_copy_clipboard), (e_day_view_paste_clipboard): ditto
-
-	* gui/e-week-view.[ch] (e_week_view_cut_clipboard),
-	(e_week_view_copy_clipboard), (e_week_view_paste_clipboard): ditto
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/calendar-commands.c (cut_event_cmd),
-	(copy_event_cmd), (paste_event_cmd): added callbacks for the new
-	clipboard-related menu entries
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* conduits/*/Makefile.am (INCLUDES): More srcdir != builddir
-	fixes.
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.c (selection_received): fixed
-	(e_calendar_table_on_copy): fixed
-
-2001-06-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur
-	field to occur_start; added an occur_end field.  This way we can
-	present the complete times for the occurrence from the server.
-
-	* cal-util/cal-component.h (CalAlarmInstance): Likewise.
-
-	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new
-	fields appropriately.
-	(generate_absolute_triggers): Likewise; we use -1 in case the
-	component has no DTSTART or DTEND because there are no meaningful
-	occurrence dates here.
-	(fill_alarm_instances_seq): Fill in the new fields.
-
-	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.
-
-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
-	Take in both the occur_start and occur_end times.
-
-	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out
-	cases.
-
-	* gui/dialogs/event-page.c (get_widgets): Do not assert if we
-	cannot find the main widget; just return FALSE.
-
-	* gui/dialogs/alarm-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/task-details-page.c (get_widgets): Likewise.
-
-	* gui/dialogs/meeting-page.c (get_widgets): Likewise.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Fixes for
-	srcdir != builddir. Link to the static libwombat.
-
-	* conduits/todo/Makefile.am (INCLUDES): Here too.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize libglade.
-
-	* pcs/cal-backend-file.c (compute_alarm_range):
-	icaldurationtype_as_int() will now return a negative value if
-	dur->is_neg is true, so we need to flip the sign of some
-	operations here.
-	(add_alarm_occurrences_cb): Likewise.
-
-	* pcs/cal-backend-db.c (compute_alarm_range): Likewise.
-	(add_alarm_occurrences_cb): Likewise.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c: Converted to use BonoboXObject.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Ask the alarm
-	notification service to add the calendar and tasks URIs.
-	(add_alarms): New function.
-
-	* gui/alarm-notify/notify-main.c (main): Doh, fixed typo in the
-	OAFIID.
-	(main): Initialize and shut down gnome-vfs.
-
-	* gui/Makefile.am (IDLS): Added evolution-calendar.idl, sigh.
-	(evolution_calendar_SOURCES): Added the files generated from the IDL.
-
-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): New function
-	used when an alarm is triggered.
-
-	* gui/dialogs/Makefile.am: Removed the alarm-notify-dialog files;
-	they are now in gui/alarm-notify.
-
-	* gui/alarm-notify/Makefile.am: Added the alarm-notify-dialog
-	files.
-
-	* pcs/cal.c (cal_forget_password): This was incorrectly named
-	cal_client_forget_password(); renamed it.
-
-	* gui/main.c (main): Initialize and shut down gnome-vfs.
-
-2001-06-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (task_compare_cb): New function to
-	compare tasks like the Pilot task list.
-
-	* cal-util/cal-component.h (CalComponentField): Added a
-	semi-hackish CAL_COMPONENT_FIELD_COMPONENT.  In the ETable model,
-	it is intended to return a pointer to the component itself.
-
-	* gui/calendar-model.c (calendar_model_value_at): Return the
-	component itself for CAL_COMPONENT_FIELD_COMPONENT.  Be more
-	paranoid about invalid columns.
-	(calendar_model_set_value_at): Be more paranoid about invalid
-	columns.
-	(calendar_model_duplicate_value): Ref the component field.
-	(calendar_model_initialize_value): Deal with the component field.
-	(calendar_model_value_is_empty): Likewise.
-	(calendar_model_value_to_string): Likewise.
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/Makefile.am: Added itip-control-factory.* to the build.
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal.[ch] (cal_get_password): new function for the backends to
-	be able to call the getPassword method on the associated
-	WombatClient
-	(cal_forget_password): ditto for the forgetPassword method
-
-2001-06-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: changed getFreeBusy method to return
-	a CalObj instead of a sequence
-
-	* cal-client/cal-client.[ch] (cal_client_get_free_busy): changed it to
-	work like the cal_client_get_object function, that is, it does not
-	return anymore a list of UIDs, but a CalClientGetStatus code, and
-	added a new parameter for the caller to get the component back when
-	this function returns
-	(cal_client_open): aggregate WombatClient interface to the CalListener
-	being used
-
-	* pcs/cal-backend-db.c, pcs/cal-backend-file.c (..get_free_busy): set
-	return value to "char *" as it will be returning a FreeBusy object,
-	and not a list of UIDs
-
-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy): ditto
-
-	* pcs/cal.c (cal_construct): queryInterface on the listener to obtain
-	the WombatClient interface
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/main.c (main): update to new call
-
-	* gui/e-itip-control.[hc]: break the widget bits out on their own
-	into a proper object, basic stuff seems to be working again
-	
-	* gui/itip-control-factory.c: put the control specific bits here
-	from e-itip-control.c
-
-	* gui/itip-control-factory.h: new header
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am (gladedir): add include path
-
-	* gui/dialogs/comp-editor.c (setup_widgets): remove buttons and
-	use evolution's standard ui config
-
-	* gui/print.c (print_comp_item): print description text
-
-2001-06-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* cal-client/cal-client.[ch]:
-	(cal_client_init): create a WombatClient when creating a CalClient
-	object, so that we can receive authentication notifications from
-	the wombat
-	(cal_client_destroy): destroy the WombatClient object when dying
-	(cal_client_set_auth_func): new function to set the authentication
-	function to be called when a password is required by the calendar
-	server (through the WombatClient object)
-	(cal_client_get_free_busy): new function for calling the new IDL
-	method Cal::getFreeBusy
-
-	* gui/alarm-notify/Makefile.am: add libwombat to LDADD
-
-	* gui/Makefile.am: add libwombat to LDADD
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* gui/itip-utils.c (itip_send_comp): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor.c (print_cmd): print menu command
-	(print_preview_cmd): ditto for print preview
-	(print_setup_cmd): ditto for print setup
-	(comp_editor_set_cal_client): listen for updated and removed
-	signals
-	(obj_updated_cb): if the item changes else where, query the user
-	for the course of action
-	(obj_removed_cb): ditto for removal
-
-	* gui/print.c (print_setup): rudimentary page setup support
-	(print_comp): rudimentary individual event/task printing support
-
-	* gui/print.h: new protos
-
-	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
-	what to do when a item is changed elsewhere
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
-	assignment
-	
-2001-06-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* idl/evolution-calendar.idl: added getFreeBusy method
-
-	* pcs/cal.c (impl_Cal_get_free_busy): implementation of the new
-	getFreeBusy added method
-	
-	* pcs/cal-backend.[ch]: added new virtual method to the CalBackend
-	class (get_free_busy)
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_free_busy): new function,
-	not implemented yet
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): new funtion,
-	not implemented yet
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-config.[hc]:
-	* gui/gnome-cal.[hc]: 
-	* gui/tasks-control.c (tasks_control_activate): 
-	* gui/calendar-commands.c (calendar_control_activate): moved the
-	function to check for a default timezone to calendar-config.c, and
-	also used it in the tasks control.
-
-	* gui/dialogs/e-timezone-dialog.h: #include <gtk/gtkwidget.h> fix.
-
-2001-06-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/gnome-cal.[hc]: added code to show the timezone dialog if the
-	user hasn't set a default timezone yet.
-
-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_add_timezones): 
-	set the "None" item string before adding it to the combo, to stop the
-	combo putting "None" in the entry initially.
-
-2001-06-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-calendar-table.[ch]: added cut/copy/paste support. It works
-	with single selections (a single component selected) and with
-	multiple ones (several components selected)
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/event-page.c: if the timezones of the start and end of
-	the event are the same, then if the start timezone is changed we
-	change the end timezone as well, since that is what most users will
-	want.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* pcs/cal.c: 
-	* idl/evolution-calendar.idl: 
-	* cal-client/cal-client.[hc]: removed stuff to get builtin timezone
-	info from the server.
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also
-	rearranged a little, adding a new 'General' page, since we had too
-	many settings on the 'Calendar' page.
-
-	* gui/e-timezone-entry.[hc]: 
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/comp-editor.c: 
-	* gui/dialogs/comp-editor-page.[hc]: 
-	* gui/dialogs/event-page.c: 
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog
-	now uses the timezone data directly from the client's libical library.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (task_editor_init): add ui
-	(forward_cmd): implement forward command
-
-	* gui/dialogs/comp-editor.c (save_as_ok): bug fix, seems to work
-	now
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/control-factory.c (control_factory_init): add auto exit unref
-
-	* gui/component-factory.c (destroy_cb): destroy our selves if we
-	have no more shells
-	(component_factory_init): add auto exit unref
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: don't compile or install the old meeting edit
-	stuff
-
-	* gui/e-week-view.c: ditto
-
-	* gui/e-day-view.c: Remove scheduling menu option
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/itip-utils.c: add some needed commas
-	(itip_send_comp): if publishing, don't set the to list and show
-	the message.  unless publishing, just send the email
-
-	* gui/Makefile.am: remove typo
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/send-comp.c: itip/imip send dialog
-
-	* gui/dialogs/send-comp.h: new proto
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): only
-	use the weekday picker if visible
-
-	* gui/dialogs/meeting-page.c: just show the meeting list
-
-	* gui/dialogs/event-editor.c (event_editor_edit_comp): remove the
-	meeting page if no attendees
-	(schedule_meeting_cmd): schedule a meeting menu item
-	(refresh_meeting_cmd): refresh meeting request menu item
-	(cancel_meeting_cmd): ditto for cancel
-	(forward_cmd): send as attachment
-
-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove page
-	from dialog
-	(comp_editor_show_page): show a given page
-	(comp_editor_get_current_comp): return a cal component
-	representing the current widget state
-	(comp_editor_save_comp): save the cal component
-	(comp_editor_delete_comp): delete the cal component
-	(comp_editor_send_comp): send the cal component
-	(comp_editor_merge_ui): merge xml in to the bonobo gui
-	(setup_widgets): use a bonobo window instead of a gtk window, add menus again
-	(save_as_cmd): save to file on disk - still broken
-	(save_close_cmd): close menu command
-	(save_close_cmd): save and close menu command
-
-	* gui/dialogs/comp-editor.h: new protos
-
-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): itip/imip
-	cancellation dialog
-
-	* gui/dialogs/cancel-comp.h: new proto
-
-	* gui/dialogs/Makefile.am: build new files
-
-	* gui/dialogs/comp-editor-page.c
-	(comp_editor_page_notify_needs_send): emit needs_send signal
-
-	* gui/dialogs/comp-editor-page.h: new signal protos
-
-	* gui/itip-utils.c (itip_send_comp): new function to send cal
-	components
-
-	* gui/itip-utils.h: new proto
-
-	* gui/e-itip-control.c (pstream_load): trim using cal-component
-	wrapper stuff
-	(accept_button_clicked_cb): use itip_send_comp
-	(tentative_button_clicked_cb): ditto
-	(decline_button_clicked_cb): ditto
-
-	* gui/Makefile.am: compile select name idl stuff
-
-	* cal-util/cal-component.c (cal_component_get_organizer): get the organizer
-	(cal_component_set_organizer): set the organizer
-	(cal_component_get_recurid): get the recurrence id
-	(cal_component_set_recurid): set the recurrence id
-	(set_attendee_list): actually set the attendee list
-	(get_attendee_list): build the attendee list
-
-	* cal-util/cal-component.h: new protos
-
-2001-06-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/task-details-page.glade: 
-	* gui/dialogs/task-page.glade: 
-	* gui/dialogs/event-page.glade: added timezone fields. Also moved the
-	'All Day' flag into an alignment so it doesn't mess up the height of
-	the other widgets.
-
-	* gui/dialogs/task-details-page.c: 
-	* gui/dialogs/task-page.c: 
-	* gui/dialogs/event-page.c: added code to handle the timezone fields.
-	This still needs to be hooked up when the libical code is finished.
-
-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): new function to
-	clear the preview label and turn off the highlighted point on the
-	map when you move the mouse outside it.
-	(find_selected_point): new function to try to find the point
-	corresponding to the text in the combo.
-	(on_combo_changed): call the above function to update the selected
-	point.
-	(on_map_leave): turn off the preview point & label when the mouse
-	leaves the map.
-	(e_timezone_dialog_set_cal_client): changed it so that selecting "None"
-	clears the entry.
-	
-	* gui/dialogs/comp-editor-page.[hc]: added set_cal_client() virtual
-	method since some pages need to access the CalClient to get timezone
-	information. Also added comp_editor_page_set_cal_client() to call
-	the virtual method.
-
-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): called
-	comp_editor_page_set_cal_client() on each page.
-
-	* gui/calendar-config.c: added functions to get & set the timezone.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record),
-	(check_for_slow_setting), (conduit_get_gpilot_conduit):
-	* conduits/todo/todo-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-view.[ch]: New files with the generic calendar view
-	object.  It sucks that we have to implement at least two classes
-	to define a GalView and its factory.
-
-	* gui/calendar-view-factory.[ch]: New files; factory for calendar
-	views.
-
-	* gui/gnome-cal.h (GnomeCalendarViewType): Moved from gnome-cal.c
-	and renamed from ViewType.  We no longer use strings to identify
-	the view types.
-
-	* gui/gnome-cal.c (gnome_calendar_get_view_type): New function.
-	(set_view): Renamed from gnome_calendar_set_view_internal().
-	(gnome_calendar_set_query): Made public; renamed from set_query().
-	(gnome_calendar_setup_view_menus): New function to set up the view
-	collection and the GalViewMenus.
-	(gnome_calendar_discard_view_menus): New function to discard them.
-
-	* gui/calendar-commands.c (calendar_control_activate): Set up the
-	GalView menus.
-	(calendar_control_deactivate): Discard the GalView menus.
-
-	* gui/e-day-view.c: #include <gtk/gtkinvisible.h>
-
-	* gui/dialogs/comp-editor.c (comp_editor_get_type): The type info
-	structure should be static.
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): generate a new UID
-	when pasting
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.c (selection_received): finished implementation
-	of Paste stuff
-
-	* gui/e-week-view.c (selection_received): ditto
-
-2001-06-14  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added popup menu items for cut/copy/paste
-
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-timezone-entry.[hc]: new widget to enter a timezone.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added the above.
-	* gui/Makefile.am (evolution_calendar_LDADD): had to move
-	libcal-dialogs.a above libmiscwidgets.a to get it to compile.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* gui/dialogs/e-timezone-dialog.[hc]: 
-	* gui/dialogs/e-timezone-dialog.glade: new dialog for setting the
-	time zone.
-
-	* gui/dialogs/Makefile.am: added timezone dialog files.
-
-	* idl/evolution-calendar.idl: added CalTimezoneInfo struct and seq,
-	and getBuiltinTimezoneInfo method.
-
-	* pcs/cal.c (impl_Cal_get_builtin_timezone_info): implemented method.
-	(cal_class_init): added method to epv.
-	
-	* cal-client/cal-client.c (struct CalClientPrivate): added
-	timezone_info array to contain cached info on builtin timezone city
-	names and coordinates.
-	(cal_client_get_builtin_timezone_info): new function to get the info
-	about builtin timezones.
-
-	* cal-client/cal-client.h: added CalTimezoneInfo struct, to contain
-	the city names and coords of the builtin timezones.
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_date_label): remove
-	unnecessary space
-
-	* gui/dialogs/task-page.c (task_page_set_summary): indicate we are
-	updating, Fixes #3307
-
-2001-06-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
-	set the completed time in the date editor if appropriate
-
-	* gui/dialogs/task-page.c (task_page_set_dates): if we are
-	updating, return
-	(complete_date_changed): don't returns if we are updating - the
-	guards are done in the calling function
-	(status_changed): indicate when we are updating and when we are
-	finished, round the completion time to the nearest minute
-	(percent_complete_changed): indicate when are updating and when we
-	are finished
-	(percent_complete_changed): notify of the date change after the
-	option menu is updated
-	
-2001-06-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/e-day-view.[ch]: added cut&paste support, by using a GtkInvisible
-	widget to manage the clipboard selections.
-	
-	* gui/e-week-view.[ch]: ditto
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component-factory.c: Removed the executive-summary includes.
-	(component_factory_init): Don't init the summary factory.
-
-	* gui/calendar-summary.[ch]: Removed.
-
-	* gui/Makefile.am: Remove executive-summary stuff, move some libs 
-	around a bit.
-
-2001-06-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates):
-	update the blocked/selected days if the starting day of the
-	appointment changes, fixes #2188
-
-	* gui/dialogs/task-details-page.h: tidy proto
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead
-	of <bonobo/bonobo-running-context.h>.
-	* gui/tasks-control-factory.c: Likewise.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'
-	before libeutil.
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/Makefile.am: no longer build widget-util.*, the code has
-	been moved
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/event-page.c (make_date_edit): use new func
-
-	* gui/dialogs/task-details-page.c
-	(task_details_page_create_date_edit): ditto
-
-	* gui/dialogs/recurrence-page.c (make_ending_until_special): ditto
-
-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit):
-	rename date_edit_new function
-
-	* gui/dialogs/comp-editor-util.h: new proto
-
-	* gui/dialogs/task-page.c (task_page_set_summary): no longer any
-	need to block/unblock the handler
-	(task_page_create_date_edit): use new func
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/.cvsignore: Update
-
-	* gui/evolution-calendar-control.c: Remove dead file
-
-	* gui/*.vcf: Remove dead files
-	
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/comp-editor-page.[hc]: renamed from editor-page for
-	consistency, more complete implementation
-
-	* gui/dialogs/comp-editor.[hc]: More complete implementation
-
-	* gui/dialogs/*-page.*: The various pages needed to construct the
-	event and task dialogs
-	
-	* gui/dialogs/comp-editor-util.[hc]: useful utility functions for the
-	component editor pages to use
-
-	* gui/dialogs/Makefile.am: Build and install new files
-
-	* gui/event-editor*: Remove, obsoleted by the new comp-editor
-	stuff
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-	* gui/e-calendar-table.c (open_task): update to use comp editor
-	stuff
-
-	* gui/e-tasks.c (e_tasks_new_task): ditto
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): ditto
-
-	* gui/Makefile.am: don't build non-existent files nor try to
-	install them
-
-2001-06-01  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory_init): ditto
-
-	* gui/tasks-control-factory.c (tasks_control_factory_init):
-	auto_exit_unref the factory
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Add `$(DB3_LDADD)'.
-
-2001-05-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_get_calendar_table): New function.
-
-	* gui/tasks-control.c (tasks_control_activate): Connect to the
-	"selection_changed" signal of the tasks widget here, not in
-	tasks_control_new().  Also, update the sensitivity of the commands
-	here for the first time.
-	(tasks_control_deactivate): Disconnect from the signal here since
-	it only makes sense to monitor selection changes while the control
-	is active.
-	(selection_changed_cb): Removed hack that tested the presence of
-	the remote UI container.
-	(sensitize_commands): New function.
-
-2001-05-28  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-week-view-layout.[hc]: 
-	* gui/e-day-view-layout.[hc]: new files to contain layout code split
-	off from EDayView an EWeekView, so we can use it for printing.
-
-	* gui/print.c: rewritten to use the same layout code as the EDayView
-	and EWeekView widgets.
-
-	* gui/gnome-cal.c (gnome_calendar_get_task_pad_cal_client): added
-	function so we can get the CalClient used for the TaskPad for printing.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): added
-	e-day-view-layout.[hc] amd e-week-view-layout.[hc].
-
-	* cal-util/timeutil.c (time_week_begin): 
-	(time_week_end): added week_start_day argument.
-
-	* cal-util/cal-recur.c: added comments describing problems in it.
-
-2001-05-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* gui/component-factory.c (remove_folder): implemented the
-	'remove_folder' function for the calendar shell component
-	(xfer_folder): ditto for 'xfer_folder'
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/calendar-commands.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-	* gui/tasks-control.c: Likewise.
- 
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
-
-2001-05-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/recurrence-page.c: Finished porting from the old
-	event-editor.c.  Made it store a clone of the component for when
-	we need to expand the recurrence set.
-
-	* gui/dialogs/event-page.c (event_page_get_dates): New function.
-
-	* gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from
-	editor_page_set_dtstart(); now sets both DTSTART and DTEND.
-
-	* gui/dialogs/alarm-page.c (alarm_page_set_dates): Ahem, it is a
-	label, not an entry.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2831; the tasks toolbar and menu now have a button to
-	delete the selected tasks.
-
-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): New
-	function.
-	(delete_cb): Use e_calendar_table_delete_selected().
-	(e_calendar_table_get_table): New function.
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): Handle the
-	delete command.
-	(selection_changed_cb): Change the sensitivity of the TasksDelete
-	command when the selection in the table changes.
-
-	* gui/e-tasks.c (table_selection_change_cb): Notify upstream when
-	the ETable selection changes.
-
-2001-05-18  Federico Mena Quintero  <federico@ximian.com>
-
-	Fix bug #2829.
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Allow the
-	caller to specify whether just one or many components are to be
-	deleted.
-
-	* gui/e-calendar-table.c (tasks_popup_one): Popup menu definition
-	for when one and only one task is selected.
-	(tasks_popup_many): Likewise, for more than one task.
-	(e_calendar_table_on_right_click): Do not create a structure for
-	the closure data; we can simply pass the cal_table.  Use a
-	different menu depending on the number of selected tasks.
-	(mark_as_complete_cb): Renamed; now iterates over the selected
-	rows.
-	(delete_selected_components): New function to delete all the
-	selected components.
-	(delete_cb): Adjusted for delete_component_dialog().
-	(open_task): New function, simply open a CalComponent in the task
-	editor.
-	(open_task_by_row): Renamed; use open_task().
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Updated
-	for delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-2001-05-16  Duncan Mak  <duncan@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): removed
-	editor-page.[ch] because they've now moved dialogs.
-
-2001-05-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Split the event and task editors into different objects for the
-	separate pages; this way they can be shared by both editors.
-
-	* gui/dialogs/editor-page.[ch]: New abstract class for a page in a
-	calendar component editor.
-
-	* gui/dialogs/event-page.[ch]: Main page of an event editor.
-
-	* gui/dialogs/alarm-page.[ch]: Alarm page of a calendar component
-	editor.
-
-	* gui/dialogs/recurrence-page.[ch]: Recurrence page of a calendar
-	component editor.
-
-	* gui/dialogs/event-page.c (event_page_fill_widgets): Eeek, this
-	was missing a bunch of break statements.
-	(event_page_fill_component): Use a temporary variable rather than
-	allocating a struct icaltimetype.
-
-	* gui/dialogs/alarm-page.c (get_alarm_string): Do not use
-	fixed-size buffers.
-	(alarm_page_fill_widgets): Use cal_obj_uid_list_free().
-	(append_reminder): Now the list stores the plain CalComponentAlarm
-	structures in the row data.  We do *NOT* want to be frobbing the
-	component's data directly.  Rather, we clone the alarms from the
-	component and maintain them on our own.
-	(alarm_page_fill_component): Clone the alarms before adding them
-	to the component so that we maintain the invariant that the alarm
-	structures in the list did *not* come from the component.
-
-	* cal-util/cal-component.c (cal_component_add_alarm): Added
-	documentation.
-	(cal_component_remove_alarm): Added documentation.
-	(cal_component_remove_alarm): Do a lookup in our hash table of
-	alarms instead of scanning the whole component.
-	(CalComponentAlarm): Removed the `parent' field, since it was
-	unused.
-	(cal_component_free_alarm_uids): Removed function, since
-	cal_component_get_alarm_uids() is documented so that the user will
-	know that he must use cal_obj_uid_list_free().
-	(cal_component_alarm_clone): New function.
-
-2001-05-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	editor-page.[ch] to the list of sources.
-
-2001-05-09  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (reminder_add_cb): switch on the correct
-	widget and map
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-itip-control.c (e_itip_control_factory): unref the
-	property bag when we finish with it
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): ditto
-
-	* gui/control-factory.c (calendar_properties_init): ditto
-
-	* gui/calendar-summary.c (create_summary_view): ditto
-
-2001-05-08  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free):
-	(cal_component_alarm_free): free the alarm component if it doesn't
-	have a parent, rather than if it does
-
-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
-	lines are shorter (fixes problem on solaries due to sed)
-
-2001-05-07  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-factory.[hc]: Convert to bonobo xobject
-
-	* pcs/cal.[hc]: Convert to bonobo xobject
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/event-editor.c (make_title_from_comp): conversion summary
-	from utf8 here, use translated strings as is.
-	(set_title_from_comp): reflect this, simplify.
-
-	* gui/dialogs/task-editor.c: updated copies of above functions here.
-
-	* gui/gnome-cal.c: use defines from widgets/misc/e-filter-bar.h for
-	consistency in "Show all".
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): unref the
-	calcomponent when we're done with it
-
-	* cal-util/cal-component.c (cal_component_gen_uid): free the iso
-	date string when we finish with it
-
-2001-04-27  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (put_property_in_list): remove hardcoded
-	values
-	(edit_attendee): ditto, and there are only 4 roles now
-
-	* gui/e-meeting-dialog.glade: tweak
-
-	* gui/itip-utils.c: There shouldn't be an "other" role
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	 * gui/e-meeting-edit.c (edit_attendee): use enums not hard code
-	 values
-	
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-meeting-edit.c (add_button_clicked_cb):
-	icalparameter_new_rsvp now takes an enum
-
-2001-04-26  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): the
-	value type should be inited with ICAL_VALUE_* rather than
-	ICAL_*_VALUE because it is a param argument.
-
-2001-04-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-model.c (get_is_overdue): Replace "<" by "<=" in
-	the comparison for due dates against the current time.  This makes
-	tasks appear immediately as red when you click Now in the due date
-	popup field.
-
-	This is not a complete solution to the more general problem of
-	tasks staying the same color even if they become overdue while the
-	task list remains the same on the screen.  This has been logged as
-	bug #2399.
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove
-	UNICODE_LIBS
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove -lunicode
-
-2001-04-24  Duncan Mak  <duncan@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed
-	Strftime so it uses the locale prefered way to display date/time. 
-	("%x %X" instead of "%Y/%m/%d %H:%M:%S")
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-summary.c: translate "Things to do" etc. and convert them
-	to utf8. Changed some link from helixcode to ximian.
-
-2001-04-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/calendar/cal-client',
-	`-I$(top_builddir)/calendar/cal-client'.
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-	* cal-client/cal-query.h: #include "evolution-calendar.h".
-
-2001-04-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the "changed"
-	signal of the categories entry so that they will be applied
-	correctly.
-	(EventEditorPrivate): Added fields for the contacts button and
-	entry.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-	(get_widgets): Get the contacts widgets.
-
-	* gui/dialogs/task-editor.c (get_widgets): Get the contacts
-	button, which was missing.
-	(init_widgets): Disable the contacts widgets as we do not support
-	them yet.
-
-	* pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp()
-	instead of plain e_utf8_strstrcase().
-	(matches_summary): Likewise.
-
-2001-04-17  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_action): the
-	libical action stuff uses enums rather than strings to enumerate
-	the various actions now
-	(cal_component_alarm_get_action): ditto
-
-2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):
-	Add `$(CORBA_GENERATED)'.
-
-2001-04-16  Dan Winship  <danw@ximian.com>
-
-	* pcs/Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS, for gal.
-
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/gnome-cal.c (setup_widgets): Create the ESearchBar thingy.
-	(search_bar_query_changed_cb): Build the different queries based
-	on the type and string.
-
-	* pcs/query.c (backend_obj_updated_cb): Ref the query while we are
-	notifying the listener so that it will not disappear from under us.
-	(backend_obj_removed_cb): Likewise.
-	(process_component_cb): Likewise.
-	(func_contains): New function to match text fields.
-	(matches_comment): New function to match comment lists.
-	(matches_description): New function to match description lists.
-	(matches_summary): New function to match summaries.
-	(matches_any): New function to match any text field.
-	(func_has_categories): New function to match categories.
-
-2001-04-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/notify-main.c (main): Initialize the trigger
-	and queue systems.
-
-2001-04-13  Dan Winship  <danw@ximian.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon
-	here, and attempt to fix the logical bogon too. (tm_gmtoff and
-	timezone have opposite signs... I'm assuming Federico tested the
-	Linux case, so I'm flipping the sign of the BSD case. But maybe he
-	didn't and it's supposed to be the other way...)
-
-2001-04-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-day-view.c (update_query): New function to restart a query
-	for the day view.
-	(query_obj_updated_cb): Renamed from obj_updated_cb(); updated for
-	queries instead of calendar clients.
-	(query_obj_removed_cb): Likewise.
-	(cal_opened_cb): Just update_query() instead of queueing reloading
-	all the events.
-	(e_day_view_set_cal_client): Likewise.
-	(e_day_view_set_query): Likewise.
-	(e_day_view_set_selected_time_range): Likewise.
-	(e_day_view_set_days_shown): Likewise.
-	(e_day_view_recalc_work_week): Likewise.
-	(e_day_view_queue_reload_events): Removed function now that events
-	are updated entirely by the query.
-	(e_day_view_reload_events_idle_cb): Likewise.
-	(e_day_view_reload_events): Likewise.
-	(e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* gui/e-week-view.c: Analogous changes to the ones in e-day-view.c.
-	(e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-	* cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed
-	version of the string instead of a pointer to a static buffer.
-	(time_from_isodate): Resurrected function.  Polished up to our
-	current standards of paranoia.
-
-	* pcs/query.c (func_time_now): New function (time-now).
-	(func_make_time): New function (make-time ISODATE).
-	(func_time_add_day): New function (time-add-day TIME N).
-	(func_time_day_begin): New function (time-day-begin TIME).
-	(func_time_day_end): New function (time-day-end TIME).
-	(func_occur_in_time_range): Use time_t values instead of ints.
-	(match_component): Free the stringized component.  Free the ESexp
-	result value.
-
-	* gui/e-day-view.h: Removed a couple of unused prototypes.
-
-	* pcs/query.c (query_destroy): Oops, disconnect from the backend.
-
-	* pcs/cal.c (Cal_get_query): Duplicate the query reference before
-	we return it.
-
-	* gui/calendar-commands.c (pixmaps): Fixed paths to image files.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):
-	prepend to both changes and change_ids when different and mark as
-	modified, not added
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): Fix this to
-	just send the data to the wombat instead of inserting it
-	ourselves.
-
-2001-04-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Display fixes, thanks to Kjartan for finding these.
-
-	* gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for
-	strings which are never in utf-8.
-	* dialogs/delete-comp.c (delete_component_dialog): convert only
-	summary from utf-8 to gtk charset. Translated values are in correct
-	craset already.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/calendar-commands.c: Fix headers.
-	* gui/calendar-config.c: Same here.
-	* gui/calendar-model.c: Same here.
-	* gui/e-day-view-time-item.c: Same here.
-	* gui/e-day-view-top-item.c: Same here.
-	* gui/e-day-view.c: Same here.
-	* gui/e-meeting-edit.c: Same here.
-	* gui/e-week-view-main-item.c: Same here.
-	* gui/e-week-view.c: Same here.
-	* gui/event-editor.c: Same here.
-	* gui/gnome-cal.c: Same here.
-	* gui/goto.c: Same here.
-	* gui/main.c: Same her.
-	* gui/print.c: Same here.
-
-2001-04-02  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_setup_menus): Plug leak.
-
-	* gui/event-editor.c (obj_updated_cb): Do nothing for now until we
-	think of something sensible to do.
-	(obj_removed_cb): Likewise.
-
-	* gui/dialogs/task-editor.c (obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-
-	* gui/event-editor.c (dialog_to_comp_object): Plug leak.
-
-2001-04-01  Federico Mena Quintero  <federico@ximian.com>
-
-	Client-side glue for the live query engine.
-
-	* cal-client/query-listener.[ch]: New files with the
-	implementation fo the QueryListener interface.
-
-	* cal-client/cal-query.[ch]: New files with the client-side
-	convenience object for live queries.
-
-	* cal-client/cal-listener.h (CalListenerClass): Removed unused
-	slots for signal handlers.
-
-	* cal-client/Makefile.am (libcal_clientinclude_HEADERS): Now we
-	install the evolution-calendar.h header.  This sucks a bit.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/calendar-commands.c: use new pixmap cache. Added some menu icons
-	and changed filenames of renamed icons.
-	* gui/tasks-control.c: added icons for new task and print in menu.
-
-2001-03-29  Federico Mena Quintero  <federico@ximian.com>
-
-	Engine for live queries to calendars.  A query object watches a
-	CalBackend in the PCS and is otherwise completely separate from
-	it; backends need to do nothing to support live queries.  Right
-	now we have the following functions:
-
-		(get-vtype)
-
-			Returns a string indicating the type of component
-			(VEVENT, VTODO, VJOURNAL, VFREEBUSY, VTIMEZONE,
-			UNKNOWN).
-
-		(occur-in-time-range? START END)
-
-			START - int, time_t start of the time range
-			END - int, time_t end of the time range
-
-			Returns a boolean indicating whether the component
-			has any occurrences in the specified time range.
-
-	* idl/evolution-calendar.idl (Cal::getQuery): New method that
-	initiates a live query.
-	(Query): New interface for a handle to a live query.
-	(QueryListener): New interface for a listener to changes in a live
-	query.
-
-	* pcs/query.[ch]: New files with the live query engine.
-
-	* pcs/cal-backend.h (CalBackendClass): Added notification signals
-	so that the query system can catch them.
-	(CalBackendClass): New virtual method ::get_load_state().
-
-	* pcs/cal-backend.c (cal_backend_opened):
-	(cal_backend_obj_updated):
-	(cal_backend_obj_updated): New functions to emit the notification
-	signals; to be used only by backend implementations.
-	(cal_backend_get_load_state): New function.
-
-	* pcs/cal-backend-file.c (notify_update): Call
-	cal_backend_obj_updated().
-	(notify_remove): Call call_backend_obj_removed().
-	(open_cal): Free the icalcomp if it is not of the correct type.
-	(cal_backend_file_get_load_state): Implemented new method.
-
-	* pcs/cal-backend-db.c (cal_backend_db_update_object): Call
-	cal_backend_obj_updated().
-	(cal_backend_db_remove_object): Call cal_backend_obj_removed().
-	(cal_backend_db_get_load_state): Implemented new method.
-
-	* pcs/cal.c (Cal_get_query): Implementation of the ::getQuery()
-	method.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.c: fixed button placement to comply
-	with gnome standards.
-
-2001-03-27 Anna Marie Dirks <anna@ximian.com>
-
-	* gui/e-itip-control.glade: fixed spacing and label alignment to
-	comply with gnome standards. Also removed shadows from extraneous
-	scrolled windows to avoid bevelitous. There are many more changes
-	that need to happen to this viewer, but they all require a hacker
-	to do some c-coding, so I will avoid committing them until after the
-	.10 release.
-
-2001-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* cal-client/client-test.c: Replace includes of <gnome.h>, <bonobo.h>
-	and <gtk/gtk.h> with the needed headers to speed up compile.
-	* cal-util/test-recur.c: Same here for <gtk/gtk.h>
-	* gui/calendar-commands.c: Replace <bonobo.h> and remove
-	<libgnorba/gnorba.h>
-	* gui/calendar-summary.c: Replace <gnome.h> and <bonobo.h>
-	* gui/calendar-summary.h: Added <bonobo/bonobo-generic-factory.h>
-	* gui/component-factory.c: Remove <bonobo.h>
-	* gui/control-factory.c: Replace <bonobo.h>
-	* gui/e-calendar-table.c: Remove <gnome.h>
-	* gui/e-itip-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/e-meeting-edit.c: Replace <bonobo.h>
-	* gui/e-tasks.c: Replace <gnome.h>
-	* gui/e-tasks.h: Replace <bonobo.h>
-	* gui/gnome-cal.h: Remove <bonobo.h>
-	* gui/main.c: Replace <bonobo.h> and <glade/glade.h>
-	* gui/tasks-control-factory.c: Replace <bonobo.h>
-	* gui/tasks-control.c: Replace <gnome.h> and <bonobo.h>
-	* gui/weekday-picker.c: Add <string.h> and <libgnome/gnome-defs.h>
-	* gui/alarm-notify/client-main.c: Remove <gnome.h> and <bonobo.h>
-	* gui/alarm-notify/notify-main.c: Replace <gnome.h> and <bonobo.h>
-	* gui/dialogs/alarm-notify-dialog.c: Replace <gnome.h>
-	* pcs/cal-backend.c: Replace <gtk/gtk.h>
-
-2001-03-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): The
-	model_rows_{inserted,deleted} signals changed names; deal with it.
-	(e_calendar_table_on_rows_inserted): Updated for new ETable API.
-	(e_calendar_table_on_rows_deleted): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed unused enum.
-
-	* gui/gnome-cal.c (gnome_calendar_open): Constify.
-
-	* gui/calendar-commands.c (calendar_set_uri): Removed function,
-	since it was just calling gnome_calendar_open().
-
-	* gui/control-factory.c (set_prop): Replace usage of
-	calendar_set_uri() with gnome_calendar_open().
-	(load_calendar): Likewise.
-	(calendar_persist_init): Made static.
-
-	* gui/e-tasks.c: #include "calendar-config.h"
-	(e_tasks_update_all_config_settings): We are configuring a table,
-	not a calendar!  Use the appropriate function.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_event,
-	e_day_view_on_new_appointment): Simplifed this function to use the
-	shared code.
-
-	* gui/e-week-view.c (e_week_view_on_new_event,
-	e_week_view_on_new_appointment): ditto.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New
-	function used to launch editor components with a time range.   A
-	bunch of functions use this code now instead of duplicating code
-	all over the place
-
-	* gui/e-week-view.c (e_week_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_week_view_on_new_full_day): New function for making a full day
-	event.
-	(e_week_view_on_goto_date): Go To support.
-	(e_week_view_on_goto_today): Goto today support.
-
-	* gui/e-day-view.c (e_day_view_new_event): Moved functionality
-	here from e_day_view_on_new_appointment.  Allows setting for "full
-	day" event.
-	(e_day_view_on_new_full_day): New function for making a full day
-	event.
-	(e_day_view_on_goto_date): Go To support.
-	(e_day_view_on_goto_today): Goto today support.
-
-	* main_items: Add New All Day Event;  Go to Today; Go to Date.
-
-2001-03-07  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/control-factory.c (calendar_persist_init): New function:
-	inits the BonoboPersistFile server.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Added BonoboPropertyBag to
-	the list of supported interfaces that were supported but not
-	reported.  Add the new PersistFile.
-
-	Add text/calendar mime type attribute.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_start_editing_event):
-	* gui/e-day-view.c (e_day_view_start_editing_event): Update
-	arguments to e_canvas_item_grab_focus.
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/*.xpm: moved to ../art.
-	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.
-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:
-	#include "art/*.xpm".
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component-factory.c (factory_fn): Specify a NULL
-	`EvolutionShellComponentGetDndSelectionFn'.
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-05  Damon Chaplin  <damon@ximian.com>
-
-	* gui/e-tasks.c: keep list of all Tasks folders so we can update the
-	preference settings when necessary.
-
-	* gui/gnome-cal.c: configure the TaskPad according to the settings.
-
-	* gui/e-calendar-table.c: use ECellCombo and ECellDateEdit for fields,
-	so the tasks folders is almost usable now.
-
-	* gui/calendar-model.c: added support for the Status property.
-
-	* gui/calendar-config.[hc]: added convenience functions to setup
-	ECalendarTable and ECellDateEdit objects.
-
-	* gui/calendar-commands.c: connected to "destroy" signal of calendars
-	so we can remove them from all_calendars list.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	call e_tasks_update_all_config_settings() to update all the settings
-	in the Tasks folders as well.
-
-	* cal-util/cal-component.h: added CAL_COMPONENT_FIELD_STATUS.
-
-	* cal-util/cal-component.c (cal_component_get_transparency): fixed
-	calls to strcasecmp so they check for '== 0'.
-
-	Applied patch from Miguel...
-
-2001-02-27  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize
-	the menus to have entries always in a consistent fashion, as
-	reported to the genepool mailing list.
-	(e_day_view_on_event_right_click): Added a FIXME comment to the
-	FIXME comment without a FIXME.
-
-	Now we use e_popup_menu.  This allows us to hide/show items on
-	demand, and to sensitize/de-sensitize items depending on their
-	state.
-
-	This will also let us add icon support (when we get nice icons for
-	this)
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.
-
-	The files popup-menu.c and popup-menu.h can now be removed.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/e-todo.conduit.in: update for new pilot foo
-
-	* conduits/calendar/e-calendar.conduit.in: ditto
-
-	* conduits/todo/Makefile.am: update sed script
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-28  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (recurrence_exception_select_row_cb): New
-	function to set the EDateEdit's value when a row is selected in
-	the exception date list.  Fixes bug #1638.
-	(append_exception): Set the value as well. Block/unblock signals
-	from the clist as appropriate.  Gotta love non-model/view widgets.
-	(recurrence_exception_delete_cb): Be more paranoid about the
-	contents of the list row's data.
-	(recur_to_comp_object): Likewise.
-	(fill_exception_widgets): Select the first row after we are done
-	appending the exception dates.
-
-2001-02-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a
-	little stand-alone library for the low-level alarm trigger
-	mechanism.  This is so that the GUI parts of the calendar can use
-	it in addition to the alarm daemon.
-
-	* gui/main.c: #include "alarm-notify/alarm.h".
-
-	* gui/calendar-summary.c: Likewise.
-	(alarm_fn): Do not remove the previous alarm; it is removed
-	automatically when it is triggered.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed alarm.[ch]
-	from the sources.
-
-	* gui/alarm.[ch]: Removed obsolete files.
-
-2001-02-23  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):
-	Switched to using our own refcounted structure for loaded clients.
-	(AlarmNotify_removeCalendar): Ditto.  Also, do the full
-	destruction of the client.
-	(alarm_notify_destroy): Destroy each element in the hash table.
-
-	* cal-client/cal-client.c (cal_client_construct): Test for
-	exceptions from OAF when activating the Wombat calendar factory.
-
-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:
-	New .oaf.in file.
-
-	* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.
-
-	* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here
-	instead of in a million files.
-
-	* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.
-
-	* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*
-	obsolete file.
-
-	* gui/Makefile.am (oaf_in_files): Updated.
-
-2001-02-23  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (add_history): fixed generation of history records
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* pcs/cal-factory.c (CalFactoryPrivate): Added a `registered'
-	field.
-	(cal_factory_oaf_register): New function; now the factory performs
-	its own registration with OAF.
-	(cal_factory_destroy): Unregister from OAF if appropriate.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/Makefile.am: Remove PISOCK_LIBDIR
-
-	* conduits/calendar/Makefile.am: ditto
-
-2001-02-16  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/calbackend-db.c (cal_backend_db_destroy): close DB environment.
-	Some compilation warnings removed
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Added libmenus.la.
-
-	* gui/e-calendar-table.c, gui/e-calendar-table.h
-	(e_calendar_table_get_spec): Added this function.
-
-	* gui/e-tasks.c, gui/e-tasks.h (e_tasks_setup_menus): Added this
-	function.
-
-	* gui/tasks-control.c (tasks_control_activate): Call
-	e_tasks_setup_menus.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-tasks.c (e_tasks_new_task): call task_editor_focus
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new
-	appointment icon
-	(set_pixmap): load files rather than create from xpm file
-
-	* gui/*view.xpm: move to the art directory
-
-2001-02-13  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object):
-	implemented
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new command
-
-	* gui/e-calendar-table.c: Add titles to pixbuf column for grouping
-
-	* gui/calendar-model.c (calendar_model_class_init): override value
-	to string virtual method
-	(calendar_model_value_to_string): implement value to string for
-	etable (necessary for group by)
-
-2001-02-12  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-file.c:
-	cal_backend_db_update_object(): manage both updates and additions/add notification
-	cal_backend_db_get_object(): don't use DB cursors
-	cal_backend_db_get_type_by_uid(): don't use DB cursors
-	cal_backend_db_remove_object(): don't use DB cursors/add notification
-	cal_backend_db_get_alarms_in_range(): implemented
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
-	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.
-
-2001-02-11  Rodrigo Moya <rodrigo@ximian.com>
-
-	* pcs/cal-backend-db.c: added DB3 transactions support
-	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just
-	the beginning, there are some missing things still.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop,
-	conduits/todo/e-todo-conduit-control-applet.desktop: removed.
-
-	* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,
-	conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.
-
-	* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:
-	reflect above changes, merge translations.
-
-	* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract
-	takes care of strings itself.
-
-	* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings
-
-	* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed
-	files in EXTRA_DIST.
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/task-editor.c (fill_widgets): fill in new
-	classification stuff properly
-	(get_widgets): load new class. widgets
-	(init_widgets): if the class. widgets change, mark the dialog
-	dirty
-	(dialog_to_comp_object): set the comp class. from the new widgets
-
-	* gui/dialogs/task-editor-dialog.glade: Make more consistent,
-	fixing bugs 1247 and 1249
-
-	* gui/dialogs/task-editor.c (fill_widgets):
-
-	* gui/event-editor-dialog.glade: Gui tidying
-
-	* gui/event-editor.c: Remove old alarm cruft
-
-	* cal-util/cal-component.c (cal_component_set_url): Don't try and
-	write an empty string as a property
-
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c: Move the get_change code here
-
-	* pcs/cal-backend.c: Remove get_changes related stuff and
-	implement by calling the virtual method instead
-
-	* pcs/cal-backend.h: New virtual method.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Use
-	icaldurationtype_as_int (replace _as_timet)
-	(add_alarm_occurrences_cb): ditto
-
-	* gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to
-	throw up the meeting schedule dialog
-	(e_week_view_show_popup_menu): add schedule meeting to the
-	contextual menu where appropriate
-
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c: Remove assorted menu/bonobo stuff
-
-	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
-	(task_editor_construct): no longer suck out the glade contents
-	into a bonobo win, listen for apply and close signals
-	(tedit_apply_event_cb): listen for apply signal and save object
-	(tedit_close_event_cb): listen for close signal and prompt to save
-	if need be
-	(task_editor_focus): new function to bring the dialog to the front
-
-	* gui/dialogs/task-editor.h: new prototype
-
-	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
-	update widgets in the event editor since the event editor won't be
-	open
-	(e_meeting_editor_new): don't need the event editor reference any
-	more
-
-	* gui/e-meeting-edit.h: Change prototype
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
-	schedule meeting a new contextual menu item
-	(e_day_view_on_schedule_meet): new routine to schedule a meeting
-	from the contextual menu
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
-	task_editor_focus
-
-	* gui/event-editor-dialog.glade: Update to be a property box
-
-	* gui/dialogs/task-editor-dialog.glade: Update to be a property
-	box
-
-2001-02-07  Iain Holmes  <iain@ximian.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a setter to the
-	property bag.
-	(set_property): The setter.
-	(generate_html_summary): Sort the UIDs accodring to time.
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (fill_reminder_widgets): Match new
-	append_alarm signature
-	(reminder_to_comp_object): only add alarms tagged as new, no
-	longer delete all alarms first
-	(append_reminder): the row data is now of type ReminderData,
-	rename from append_alarm
-	(reminder_add_cb): math new append_alarm signature
-	(reminder_delete_cb): if the alarm existed before the dialog was
-	loaded, delete it immediately from the cal component
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix spacing
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
-
-	* gui/dialogs/task-editor-dialog.glade: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
-	consistent
-
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
-
-	* gui/e-calendar-table.c: ditto
-
-2001-02-06  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_set_categories): If the
-	categories string is empty, remove the property
-	(get_period_list): Fixes from clahey to handle the new rdate
-	format in libical
-	(set_period_list): ditto
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set
-	the time and duration values in the trigger to null by default
-	(cal_component_free_alarm_uids): properly free the list of alarm
-	uids
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (get_widgets): get the new reminder widgets
-	(sync_entries): different callback data
-	(summary_changed_cb): take different data and handle various cases
-	(init_widgets): connect signals for the new widgets
-	(get_alarm_duration_string): give a text string of the alarm
-	duration
-	(get_alarm_string): give a string representing the alarm
-	(fill_widgets): make sure we don't loop infinitely and remove old
-	alarm cruft
-	(reminder_to_comp_object): dump alarm info in the gui into the cal
-	component
-	(append_alarm): add alarm to the clist
-	(reminder_add_cb): create new alarm
-	(reminder_delete_cb): remove the alarm from the list
-
-	* gui/event-editor-dialog.glade: Update gui
-
-	* gui/e-calendar-table.c: include gnome.h for all the menu stuff
-
-	* gui/calendar-summary.c: for internationalization
-
-	* gui/tasks-control.c: include gnome.h
-
-	* gui/e-tasks.c: ditto
-
-	* gui/e-itip-control.c: ditto
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for
-	libical changes
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Fixed up these #includes.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/save-comp.c (save_component_dialog):
-	gnome_dialog_grab_focus() on the Yes button.  Fixes bug #1242.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/e-calendar-table.c: Mark a string for translation.
-	* gui/e-itip-control.c: Mark a bunch of strings for translation.
-
-2001-01-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/print.c: #include <sys/time.h>.
-
-2001-01-29  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/calendar-config.c: <gnome.h> trimming to reduce compilation
-	time.
-	* gui/calendar-summary.c: Likewise.
-	* gui/e-calendar-table.c: Likewise.
-	* gui/e-day-view-time-item.c: Likewise.
-	* gui/e-day-view.c: Likewise.
-	* gui/e-itip-control.c: Likewise.
-	* gui/e-meeting-edit.c: Likewise.
-	* gui/e-meeting-edit.h: Likewise.
-	* gui/e-tasks.c: Likewise.
-	* gui/e-week-view.c: Likewise.
-	* gui/event-editor.c: Likewise.
-	* gui/gnome-cal.c: Likewise.
-	* gui/goto.c: Likewise.
-	* gui/itip-utils.h: Likewise.
-	* gui/main.c: Likewise.
-	* gui/popup-menu.c: Likewise.
-	* gui/print.c: Likewise.
-	* gui/tasks-control-factory.c: Likewise.
-	* gui/tasks-control.c: Likewise.
-	* gui/tasks-migrate.c: Likewise.
-
-2001-01-25  Federico Mena Quintero  <federico@ximian.com>
-
-	* cal-util/timeutil.c: <gnome.h> trimming to reduce compilation time.
-	* gui/dialogs/task-editor.c: Ditto.
-	* gui/dialogs/cal-prefs-dialog.c: Ditto.
-	* gui/dialogs/save-comp.c: Ditto.
-	* gui/dialogs/delete-comp.c: Ditto.
-	* gui/calendar-commands.c: Ditto.
-	* gui/calendar-model.c: Ditto.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to
-	call `icalcomponent_remove_component()' on a NULL component or a
-	NULL subcomponent.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* gui/tag-calendar.c: don't tag the calendar if no dates are shown.
-	(e_calendar_item_get_date_range() now returns FALSE in this case.)
-
-2001-01-23  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (ensure_task_complete): make sure the status
-	is set to "Completed". Fixes bug #1253.
-
-	* gui/e-tasks.c (e_tasks_open): load the ETable state after opening
-	the tasks folder, since it relies on the folder uri, which isn't set
-	now until you open the folder.
-
-	* gui/calendar-model.c (obj_updated_cb): add the categories from the
-	updated object to our tree, and emit the "categories-changed" signal
-	if they have changed. Fixes bug #1255.
-
-	* gui/e-tasks.c: removed debug messages.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	*  libical import cleanup
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): properly ref
-	the cal component when we use it, prevents double free
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): ditto
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* gui/dialogs/Makefile.am: compile new stuff
-
-	* gui/dialogs/task-editor.c (prompt_to_save_changes): use new
-	standard dialog
-
-	* gui/event-editor.c (prompt_to_save_changes): ditto
-
-	* gui/dialogs/save-comp.h: new header
-
-	* gui/dialogs/save-comp.c (save_component_dialog): shows the save
-	dialog
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
-	message
-
-	* conduits/calendar/Makefile.am: Remove vfs lib dependency
-
-	* conduits/todo/Makefile.am: ditto
-
-	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
-	(for_each_modified): remove duplicate message
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_record): Remove
-	deleted records from the pilot map so we don't have dupes in the future
-
-	* conduits/todo/todo-conduit.c (delete_record): ditto
-
-2001-01-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now
-	we present a confirmation dialog before deleting the component.
-
-2001-01-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor-dialog.glade: Fix bug #1243.  Turn on the Y
-	expand/fill options for the date widgets in the General page.
-	This makes them be vertically aligned with the "All day event"
-	toggle so that they will get the focus in the proper order; the
-	toggle would get the focus before them because it was a pixel or
-	two above them.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/weekday-picker.c (weekday_picker_init): Unset the
-	GTK_CAN_FOCUS flag on the weekday picker.  This will do until it
-	supports being used with the keyboard.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_new): create a new
-	cal component alarm
-	(cal_component_add_alarm): add alarm to the cal component
-	(cal_component_remove_alarm): remove alarm from the cal component
-	(remove_alarm): remove alarm from hash
-
-	* cal-util/cal-component.h: new protos
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	add alarm information, still needs to be hacked to replace an already
-	existing alarm.  questions abound about the heuristic for doing this.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Properly set categories
-	to NULL if there are none
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/tasks-migrate.[ch]: New files with a simple sequence to
-	migrate the task components from the old calendar folder into the
-	new tasks folder.
-
-	* gui/component-factory.c (owner_set_cb): Call tasks_migrate()
-	once evolution_dir is set.  It sucks to have to do this here.
-
-	* cal-client/cal-client.c (cal_client_get_uids): In the inline
-	docs, indicate how to free the return value.
-	(cal_opened_cb): Ahem, moved assertion to the right place.  Also,
-	ref() and unref() around our own signal emission because we are
-	not inside a signal handler, rather a simple callback from the
-	listener object; we want to have a chance to clean up even if the
-	client is unrefed during the emission.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tasks-migrate.[ch] to the list of sources.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/event-editor.c (init_widgets): Use
-	e_calendar_item_set_max_days_sel() instead of setting GTK+ object
-	arguments.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Oops, we had a
-	reversed test for the client being loaded.
-
-	* gui/tag-calendar.c (tag_calendar_by_client): Fixed similarly
-	reversed test.
-
-2001-01-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view*.c
-	* gui/e-day-view*.c: don't use the theme colors at all within
-	the graphical parts of the widgets, since they may clash with
-	our colors. May make them configurable in future so people can tweak
-	them to go with their theme. At least the calendars are usable in any
-	theme now, even though the colors may not go well with the theme.
-	Also set the font of all the EText items in style_set.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the icons if we are editing the event.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: reinstated the optimizations so we don't do a
-	complete relayout if the event's dates haven't been changed.
-	(Though we still do a re-layout when recurring events change, since
-	comparing all the RDATES/RRULES/EXDATES/EXRULES is too much hassle.)
-	A side-effect of this change is that the EWeekView won't crash so
-	often - only recurring events will be a problem.
-
-	* cal-util/cal-component.[hc]: added function to check if the start
-	and end dates of a component match. Used for optimizing the updating
-	of the EDayView & EWeekView.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check
-	for open error and handled
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition
-	of sync db location
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* */*: Ximianified email addresses and copyrights.
-
-	* idl/evolution-calendar.idl (CalFactory::open): Renamed from
-	::load(), and added an only_if_exists argument.
-	(CalFactory::create): Removed method.
-	(Listener::OpenStatus): Removed the IN_USE error and replaced it
-	with a NOT_FOUND one; renamed the enum from LoadStatus.
-	(Listener::notifyCalOpened): Renamed from notifyCalLoaded().
-
-	* pcs/cal-backend.h (CalBackend): Removed the uri field.
-	(CalBackendOpenStatus): Renamed from CalBackendLoadStatus and
-	added a NOT_FOUND value.
-	(CalBackendClass::open): Put in a slot for the open method.
-
-	* pcs/cal-backend.c (cal_backend_create): Removed function.
-
-	* pcs/cal-backend-file.c (cal_backend_file_open): Return the
-	appropriate value when only_if_exists is TRUE.
-	(create_cal): We are Ximian now, so set the PRODID property to
-	the appropriate foo.
-
-	* pcs/cal-factory.c (CalFactory_open): implemented, replacing
-	CalFactory_load() and CalFactory_create().
-	(CalFactory_open): Moved the queue_load_create_job() stuff to
-	here, since we now only need to contemplate the open case instead
-	of load/create ones.
-	(open_backend): Do everything here; replaces load_backend() and
-	create_backend().
-
-	* cal-client/cal-listener.h (CalListenerClass::cal_opened):
-	Renamed from cal_loaded.
-	(CalListenerClass): Replaced the silly signals, which are
-	gratuitous abstraction, by a set of function pointers in the
-	instance structure.
-
-	* cal-client/cal-listener.c (cal_listener_get_calendar): Removed
-	unused function.
-	(cal_listener_construct): Added the listener notification functions.
-	(cal_listener_new): Ditto.
-	(Listener_notifyCalOpened): Renamed to our new naming convention
-	for servant implementations.
-	(Listener_notifyObjUpdated): Ditto.
-	(Listener_notifyObjRemoved): Ditto.
-
-	* cal-client/cal-client.h (CalClientOpenStatus): Renamed from
-	CalClientLoadStatus.
-	(CalClientClass::cal_opened): Renamed from ::cal_loaded().
-	(CalClientLoadState): New enum; basically make LoadState public so
-	that users of this code do not have to maintain their own states.
-
-	* cal-client/cal-client.c (cal_client_create_calendar): Removed
-	function.
-	(cal_client_open_calendar): Moved the functionality over from
-	load_or_create(); now we do everything here.
-	(*): Use the CalClientLoadState enum values instead of the old
-	LoadState values.
-	(cal_client_get_load_state): Renamed from cal_client_is_loaded(),
-	and return the appropriate value.
-	(CalClientPrivate): Added an uri field.
-	(cal_client_init): Initialize priv->uri.
-	(cal_client_destroy): Free the priv->uri.
-	(cal_opened_cb): Maintain the priv->uri.
-	(cal_client_open_calendar): Fill in the priv->uri.
-	(cal_client_get_uri): New function.
-
-	* gui/calendar-model.c (calendar_model_set_new_comp_vtype): New
-	function to configure the type of calendar components to create
-	when doing click-to-add.  This makes the model usable for
-	something other than task lists.
-	(calendar_model_get_new_comp_vtype): New function.
-
-	* gui/e-calendar-table.c (e_calendar_table_get_model): New function.
-	(e_calendar_table_destroy): Unref the subset_model.
-
-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed enum.
-
-	* gui/gnome-cal.c (LoadState): Removed enum; we now use the
-	CalClientLoadState from the client objects.
-	(GnomeCalendarPrivate): Removed the loading_uri and
-	task_pad_loading_uri fields as well as the load_state and
-	task_pad_load_state fields, as we can now query them directly from
-	the CalClient.
-	(open_error): Renamed from load_error().
-	(create_error): Removed function.
-	(gnome_calendar_open): Do not take in the mode parameter.
-	(cal_opened_cb): Get rid of our beautifully-crafted state machine
-	and replace it with simple code; all the loading smarts are in the
-	Wombat now.
-	(setup_widgets): Set the new component vtype of the table model to
-	CAL_COMPONENT_TODO.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	gnome-month-item.[ch] from the list of sources.
-
-	* gui/calendar-summary.c (CalSummary): Removed unused cal_loaded
-	field.
-	(create_summary_view): Do not check if the file exists; this is
-	the job of the Wombat.
-	(generate_html_summary): Fixed prototype.
-	(alarm_fn): Fixed prototype.
-	(property_dialog): Fixed prototype.  Wonder if/how this ever
-	worked.
-	(create_summary_view): Cast the component and view as
-	appropriate.  Removed unused html variable.
-
-	[Iain dude, are you compiling with -Wall?]
-
-	* gui/e-itip-control.c (cal_opened_cb): Sigh, this function
-	signature was *very* wrong.  It was using CalClientGetStatus
-	instead of CalClientOpenStatus.
-
-	* gui/e-tasks.h (ETasksOpenMode): Removed enum.
-
-	* gui/e-tasks.c (setup_widgets): Set the new component vtype of
-	the table model to CAL_COMPONENT_TODO.
-	(LoadState): Removed the state machine foo.
-	(e_tasks_open): Removed the mode parameter.
-	(initial_load): Removed function.
-	(create_error): Removed function.
-	(ETasksPrivate): Removed folder_uri field.
-	(cal_opened_cb): Remove the state machine.
-
-	* gui/component-factory.c: #include "tasks-control.h"
-
-	* conduits/calendar/calendar-conduit.h (ECalConduitContext):
-	Removed calendar_load_tried field.
-
-	* conduits/calendar/calendar-conduit.c (start_calendar_server_cb):
-	Sigh, fixed function prototype.
-
-	* conduits/todo/todo-conduit.h (EToDoConduitContext): Removed
-	calendar_load_tried field.
-
-	* conduits/todo/todo-conduit.c (start_calendar_server_cb): Fixed
-	function prototype.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): fix debug output
-	(print_remote): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks
-	in their new dir
-
-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
-	buffer overflows.
-	(print_remote): ditto
-
-	* conduits/calendar/calendar-conduit.c: as above
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion
-	values so that small text fields are 1.0, all the date fields and the
-	URL field are 2.0, and the Summary is 3.0. Hopefully the user will
-	resize the fields as desired, but at least this is a better start.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduits/calendar/Makefile.am: pass -module and -avoid-version to
-	conduit linker
-
-	* conduits/todo/Makefile.am: ditto
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.[hc]: moved #include
-	<cal-client/cal-client.h> to the .h file.
-
-	* gui/e-tasks.c: load & save the Tasks folders' ETable layout.
-	Added an option menu to filter tasks by category.
-
-	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.
-	(We may make the actual tasks folder shown a per-calendar option.)
-
-	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for
-	the New Task icon on the toolbar.
-
-	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model
-	to filter the tasks by a category. And tidied up a little.
-
-	* gui/calendar-model.[hc]: added way to get all the categories used by
-	the tasks, so we can show an option menu of them. Also a signal which
-	is emitted when they are changed.
-	Also allows a default category to be set, which is used to initialize
-	the 'click-to-add' row.
-	Also made sure the initialize_value()/get_value() functions don't
-	return NULL since that can cause a SEGV.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items
-	to black since it doesn't seem to set up a default color properly.
-	Hopefully this fixes the bug on Solaris where the items appear with
-	strange colors.
-
-	* gui/widget-util.c (date_edit_new): use the calendar_config function
-	to set most of the options. It wasn't setting the 12/24 hour option
-	before.
-
-	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/e-calendar-table.c: Add translation strings.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Add a PropertyControl
-	interface to set whether or not to show tasks and appointments. Add
-	a PersistStream to remember this.
-
-2001-01-09  Dave Camp  <dave@helixcode.com>
-
-	* gui/Makefile.am: Replaced e-meet-dialog.glade.h with
-	e-meeting-dialog.glade in glade_messages.
-
-	* gui/e-meeting-dialog.glade: Enabled the translatable string option.
-
-	* gui/e-itip-control.glade: Likewise.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (AlarmNotify): New interface for the
-	alarm notification system.
-
-	* gui/alarm-notify: New directory for the alarm notification
-	daemon and its auxiliary stuff.
-
-	* gui/alarm-notify/alarm.[ch]: Moved over from gui/alarm.[ch].
-
-	* gui/alarm-notify/alarm-queue.[ch]: Moved over from
-	gui/alarm-notify.[ch].  Renamed functions from alarm_notify_*() to
-	alarm_queue_*().
-
-	* gui/alarm-notify/alarm-notify.[ch]: Implementation of the
-	GNOME::Evolution::Calendar::AlarmNotify interface.
-
-	* gui/Makefile.am (evolution_calendar_LDADD): Removed the
-	LINK_FLAGS variable and reordered the libraries to remove some
-	duplicated ones.
-	(SUBDIRS): Added the alarm-notify directory.
-
-2001-01-08  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Get the tasks
-	correctly.
-	(generate_html_summary): Mark the tasks as completed if so.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files for the Tasks folders.
-
-	* gui/e-tasks.[hc]: new widget to encapsulate the Tasks view.
-
-	* gui/tasks-control.[hc]: new files to implement the Tasks control.
-
-	* gui/tasks-control-factory.[hc]: new files to implement the factory
-	for the Tasks controls. (I think the way I've split the code up is a
-	lot cleaner than the GnomeCal implementation - the factory file just
-	contains the factory functions and the control file contains all the
-	control functions. Maybe we should make GnomeCal like this.)
-
-	* gui/main.c: initialize the Tasks control factory.
-
-	* gui/component-factory.c: added support for the Tasks control.
-	Also added a "create_folder" function so we can now create new Tasks
-	and Calendar folders within Evolution.
-	I'm not a Bonobo expert so someone might want to check these over.
-
-	* gui/calendar-config.[hc]: added convenience functions to configure
-	the common settings of ECalendar and EDateEdit widgets.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit):
-	* gui/gnome-cal.c (gnome_calendar_update_config_settings):
-	* gui/event-editor.c: used function to configure the ECalendars
-	and EDateEdits.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	fixed minor bug in format strings.
-
-2001-01-06  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (generate_html_summary): Neaten the HTML,
-	and fix the time printing stuff. Add stuff the get Tasks.
-	(alarm_fn): Set up an alarm for midnight everynight and regenerate
-	the HTML for the new day.
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/event-editor-dialog.glade: Add categories and contacts buttons
-	and fields
-
-	* gui/dialogs/task-editor-dialog.glade: Rename button
-
-2001-01-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (get_widgets): get categories button
-	(init_widgets): listen for button click
-	(fill_widgets): fill in the categories area
-	(dialog_to_comp_object): set the cal component categories
-	(categories_clicked): throw up the categories dialog and update
-	when ok is clicked
-
-	* gui/dialogs/task-editor-dialog.glade: Tweak to name the categories
-	button and make it active
-
-	* gui/calendar-model.c (get_categories): We can get the string list of
-	categories directly now
-
-	* cal-util/cal-component.c (cal_component_get_categories): new function
-	to get the categories list as a string
-	(cal_component_set_categories): same but for setting
-	(free_icalcomponent): init the categories var
-	(scan_categories): kill
-	(scan_property): assign the prop to the categories var
-	(cal_component_get_categories_list): deal with renaming var to categories
-	(cal_component_set_categories_list): fix brokeness
-
-2001-01-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Handle the case where
-	the calendar view cannot be created; present a warning dialog box.
-	(new_calendar): Do not show the widget here, since we already show
-	it in control-factory.c.
-
-	* gui/control-factory.c (control_factory_new_control): Handle the
-	case where the calendar view cannot be created.
-
-	* gui/component-factory.c (create_view): Ditto.
-
-	* gui/calendar-summary.h: Added prototype for
-	calendar_summary_factory_init().
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm-notify.c (add_component_alarms): If the component has
-	no alarms, do not try to queue them.
-	(remove_client_alarms): New function to remove all the queued
-	alarms for a calendar client.
-	(alarm_notify_remove_client): Remove the client's alarms.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Do not
-	compose strings so that they can be localized correctly.  Also,
-	convert from UTF8 into the font's encoding.  Fixes bug #1030.
-
-	* gui/e-calendar-table.c (delete_component): Pass the widget
-	argument to delete_component_dialog().
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/event-editor.c (file_delete_cb): Likewise.
-
-	* gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of
-	BONOBO_UI_UNSAFE_VERB().  Guess what, all of our handler
-	signatures were wrong.
-
-	* gui/event-editor.c: Likewise.
-
-	* gui/dialogs/task-editor.c: Likewise.
-
-	* gui/goto-dialog.glade: Added some spacing between the month/year
-	widgets and the calendar widget.
-
-2001-01-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove
-	the client from the alarm notification system.
-	Removed all the obsolete alarm code.
-
-	* gui/event-editor.c: Removed some crufty externs left over from
-	Gnomecal.
-
-	* gui/calendar-commands.c: #include "goto.h"
-	Removed crufty variables left over from Gnomecal.
-	(new_calendar): Do not take a full_name parameter.
-	(init_username): Removed function.
-	(init_calendar): Wheeeeeeee!  Removed crufty function.
-	(quit_cmd): Removed function.
-
-	* gui/print.c (WEEK_STARTS_ON_MONDAY): Made it unconditionally
-	FALSE because we do not use the configuration setting anyways.
-	Sigh, all the printing code needs to be revamped.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c (create_summary_view): Create a shared
-	BonoboEventSource object.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_init): Set draw background to FALSE.
-	(e_day_view_reshape_long_event): ditto.
-	(e_day_view_reshape_day_event): ditto.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/delete-comp.c (delete_component_dialog): Clean up
-	translatable strings for translators, fixes bug 993
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (create_ecal): Make sure the current month is shown
-	when the dialog pops up.
-
-	* gui/goto-dialog.glade: Remove flicker
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):
-	account for the case where there are no alarms, fixes crash
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto.c (ecal_date_range_changed): New function to keep the
-	ecal marked properly
-	(create_ecal): move more creation code here, update marks
-	(goto_dialog_init_widgets): listen for date_range_changed signal
-	in the ecal
-
-	* gui/calendar-commands.c (init_calendar): Remove ancient gnomecal
-	cruft
-
-	* gui/mark.[hc], gui/prop.c: Remove ancient gnomecal code that is
-	no longer needed, last bit of bug 904
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/goto-dialog.glade.h: translations
-
-	* gui/goto-dialog.glade: new glade file for goto dialog
-
-	* gui/gnome-cal.c (setup_widgets): Set date navigator attributes
-
-	* gui/calendar-commands.h: remove prototype
-
-	* gui/goto.h: Add prototype
-
-	* gui/Makefile.am: Add glade file stuff
-
-	* gui/gnome-cal.c (setup_widgets): Use accessors to configure the
-	calendar item properly
-
-2000-12-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm trigger queueing for the GUI part.
-
-	* gui/alarm-notify.[ch]: New files with the high-level alarm
-	notification system; mostly moved over from gnome-cal.c.  The
-	low-level timer stuff is still in alarm.[ch].
-
-	* gui/alarm-notify.c (alarm_notify_init): New function to
-	initialize the alarm notification system.
-	(alarm_notify_done): New function to shut down the alarm
-	notification system.
-	(alarm_notify_add_client): New function to start monitoring a
-	calendar client for alarm notification.
-	(alarm_notify_remove_client): New function to stop monitoring a
-	client.
-
-	* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so
-	the callback may know which ID is being destroyed.
-
-	* gui/alarm.c (clear_itimer): New function.
-	(pop_alarm): Use clear_itimer().
-	(alarm_done): New function to shut down the timer system.
-	(alarm_add): Add some preconditions.  Do not call the destroy
-	notification function if we could not create the alarm.
-	(alarm_ready): Pass the alarm ID to the destroy notify function.
-	(alarm_remove): Likewise.  Also, add some preconditions.
-
-	* gui/gnome-cal.c: Removed the alarm notification functions from
-	here since they are now in alarm-notify.c.
-	(gnome_calendar_construct): Register the client with
-	alarm_notify_add_client().
-	(gnome_calendar_destroy): Use alarm_notify_remove_client() to
-	unregister the client.
-	(obj_updated_cb): Do not do any alarm-related stuff.
-	(obj_removed_cb): Likewise.
-
-	* gui/main.c (main): Shut down the alarm timer system.
-	(main): Initialize and shut down the alarm notification system.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	alarm-notify.[ch] to the list of sources.
-
-	* gui/calendar-model.c (calendar_model_set_cal_client): Only
-	connect to the "cal_loaded" signal if the client is not already
-	loaded.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.
-
-	* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"
-	before issuing the load request.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* gui/calendar-summary.c: Updated for new executive summary.
-
-	* gui/component-factory.c: Reenabled the summary.
-
-	* gui/GNOME_Evolution_Calendar.oafinfo: Added the summary.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Fix erroneous documentation
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): if
-	!is_empty_time rather than is_empty_time
-	(e_todo_context_new): Return a pointer rather than fill in
-	a parameter
-	(e_todo_context_foreach_change): Free just the key
-	(e_todo_context_destroy): Plug this enormous leakage.  I had assumed
-	i had done this earlier, which isn't too bright when anything beyond
-	2 minutes ago is fuzzy.
-	(comp_from_remote_record): Kill warnings
-	(post_sync): Destroy the map later
-	(conduit_get_gpilot_conduit): Fix e_todo_context_new params
-
-	* conduits/calendar/calendar-conduit.[hc]: Similar to above
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Remove pointless comment
-
-	* conduits/todo/todo-conduit.c (is_empty_time): add utility function
-	(comp_from_remote_record): use it
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Convert cal component strings to pilot character set
-	(comp_from_remote_record): vice versa
-
-	* conduits/todo/todo-conduit.c: Same as above
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in
-	the way the range is expanded.
-
-	* cal-util/cal-component.c (cal_component_alarms_free): Doh,
-	alarms->alarms is a list, not a generic pointer.  Free it properly.
-	(cal_component_free_pilot_id): Removed unused function.
-	(cal_component_free_pilot_status): Likewise.
-
-	* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded
-	string.  Pass argc by value, not by reference.  Test the return
-	value of gnome_init_with_popt_table().
-
-	* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed
-	implementing this function.
-
-	* cal-util/timeutil.c (print_time_t): Better printing format.
-	(isodiff_to_secs): Removed unused function.
-	(isodiff_from_secs): Removed unused function.
-	(time_day_end): Removed crufty part.
-	(time_day_begin): Removed crufty part.
-	(time_day_hour): Removed unused function.
-	(format_simple_hour): Removed unused function.
-	(get_time_t_hour): Removed unused function.
-	(time_from_start_duration): Removed unused function.
-
-	* cal-util/timeutil.h (parse_date): Removed unimplemented, unused
-	function prototype.
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/gnome-cal.c: Removed prototype for setup_alarm to fix a
-	warning.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	Alarm instance generation support for the Wombat.
-
-	* idl/evolution-calendar.idl (Cal::CalAlarmInstance): Changed to
-	have an alarm UID, the trigger time, and the actual occurrence
-	time.
-	(Cal::CalComponentAlarms): New structure to hold a pair of a
-	component and its alarms that trigger in a particular range of
-	time.
-	(Cal::getAlarmsInRange): Changed to return a CalComponentAlarmsSeq.
-
-	* cal-util/cal-component.h (CalAlarmInstance): New C-side
-	structure to match the one on the IDL.
-	(CalComponentAlarms): Ditto.
-	(CalAlarmAction): Renamed from CalComponentAlarmAction.
-	(CalAlarmTriggerType): Renamed from CalComponentAlarmTriggerType.
-	Encoded the START and END parameters for the RELATED parameter in
-	this enum, too.  Added a NONE value for invalid or missing trigger
-	specifications.
-	(CalComponentAlarmTriggerRelated): Removed.
-	(CalAlarmTrigger): Renamed from CalComponentAlarmTrigger.  Renamed
-	the duration/time fields to rel_duration/abs_time, respectively.
-
-	* cal-util/cal-component.c (cal_component_alarm_get_trigger):
-	Changed to use the new trigger structure.
-	(cal_component_alarm_set_trigger): Likewise.
-	(cal_component_alarm_free_trigger): Removed function.
-	(cal_component_has_alarms): Count the elements in the
-	alarm_uid_hash instead of trying to fetch the first alarm subcomponent.
-	(cal_component_alarms_free): New function to free a
-	CalComponentAlarms structure.
-	(CalComponentAlarmPrivate): Added an uid property pointer.
-	(scan_alarm_property): Scan for the our extension UID property.
-	(cal_component_alarm_get_uid): New function.
-
-	* pcs/cal-backend.h (CalBackendClass): Changed the signatures of
-	the ::get_alarms_in_range() and ::get_alarms_for_object() methods.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): Changed
-	signature; use the new method.
-	(cal_backend_get_alarms_for_object): Likewise.
-
-	* pcs/cal-backend-file.c (compute_alarm_range): New spiffy
-	function to compute a range of time for alarm occurrences.
-	(add_alarm_occurrences_cb): New function to add alarms for a
-	particular occurrence of the component.
-	(generate_absolute_triggers): New function to add the absolute
-	alarm triggers.
-	(generate_alarms_for_comp): New function to generate all the alarm
-	instances for a component.
-	(cal_backend_file_get_alarms_in_range): Implemented.
-
-	* pcs/cal.c (Cal_get_alarms_in_range): Use the new CalBackend API.
-	(Cal_get_alarms_for_object): Likewise.
-	(build_alarm_instance_seq): Removed old function.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): Removed
-	function.
-
-	* cal-client/cal-client.c (build_component_alarms_list): New
-	function to demarshal the component alarms sequence.
-	(build_alarm_instance_list): New function to demarshal the alarm
-	instances sequence.
-	(cal_client_get_alarms_in_range): Updated for the new API.
-	(cal_client_get_alarms_for_object): Updated for the new API.
-
-	* gui/gnome-cal.c: Temporary #ifdef-ing out of alarm-related stuff
-	to make it build.
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.[ch] (time_from_isodate): Removed unused
-	function, a relic from Gnomecal.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/timeutil.c (time_from_isodate): Fix the sign in the
-	HAVE_TM_GMTOFF case
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.
-	We no longer use it; it is a relic from Gnomecal.
-
-	* gui/getdate.y: Removed file.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #955.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for
-	the week_start_day, to be used in the same way as
-	calendar-config.h defines it.  Removed the week_starts_on_monday
-	flag.
-	(day_event_cb): Use the week_start_day.
-	(colorize_items): Likewise.
-	(configure_items): Likewise.
-	(weekday_picker_set_week_start_day): New function.
-	(weekday_picker_get_week_start_day): New function.
-	(weekday_picker_set_week_starts_on_monday): Removed function.
-	(weekday_picker_get_week_starts_on_monday): Removed function.
-
-	* gui/widget-util.[ch]: New files with utilities for creating or
-	configuring widgets.
-
-	* gui/widget-util.c (date_edit_new): New function to create an
-	EDateEdit configured with the calendar's preferences; moved over
-	from event-editor.c.
-
-	* gui/event-editor.c (make_recur_weekly_special): Use
-	weekday_picker_set_week_start_day() and the corresponding function
-	from calendar-config.h.
-	(init_widgets): Likewise.
-	(make_date_edit_with_time): Removed function.
-	(make_recur_ending_until_special): Use date_edit_new().
-	(make_date_edit): Likewise.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): Likewise.
-
-	* gui/event-editor-dialog.glade: Removed references to
-	make_date_edit_with_time(); replace them with make_date_edit().
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	widget-util.[ch] to the list of sources.
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reset the widths
-	of the columns with pixbufs to the actual pixbufs' sizes; now
-	ETable properly computes its column widths so we do not need to
-	add extra padding here.
-
-2000-12-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not
-	nothing. Also, move this bit after the other #includes to
-	prevent potential messiness.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (ensure_mandatory_properties): Even
-	though icaltime_from_timet() now properly ignores the is_utc
-	argument since time_t values *are* in UTC by definition, we were
-	passing FALSE for that argument's value in a bunch of places.  So
-	although it is ignored, changed them to TRUE for consistency.
-	Hopefully newer versions of libical will remove that argument
-	entirely since it does not make sense to speak of non-absolute
-	time_t values.
-
-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise.
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-	* gui/e-week-view.c (e_week_view_key_press): Likewise.
-	(e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (simple_recur_to_comp_object): Likewise.
-	(recur_to_comp_object): Likewise.
-	(dialog_to_comp_object): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func.
-	(cal_object_get_rdate_end): Changed this function to get rid of a
-	possible uninitialized error on the rdate function.
-
-	* gui/calendar-model.c: Fixed some warnings involving the #define
-	_XOPEN_SOURCE lines here.
-
-	* gui/component-factory.c: #ifdef WANT_THE_EXECUTIVE_SUMMARYed out
-	the summary_factory object since it's unused if
-	WANT_THE_EXCUTIVE_SUMMARY is not defined.
-
-	* gui/e-day-view.c: #if 0ed out e_day_view_remove_event_cb.
-	(obj_updated_cb): #ifndef NO_WARNINGSed out a #warning.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): Made
-	it so that
-
-	* gui/e-week-view.c (obj_updated_cb): #ifndef NO_WARNINGSed out a
-	#warning.
-
-2000-12-13  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Revert federico's change for now
-	because of libtool limitations with ldadding shared libtool
-	libs
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-12  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use
-	set_title_from_comp
-	(save_todo_object): ditto
-	(set_title_from_comp): Make sure the title is encoded properly (as in
-	event-editor)
-
-2000-12-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (get_text_list): Constify for new
-	libical API.
-	(set_text_list): Likewise.
-
-	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
-	(cal_recur_set_rule_end_date): Likewise.
-
-	* gui/e-itip-control.c (find_attendee): Likewise.
-	(pstream_load): Likewise.
-
-	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.
-
-	* gui/dialogs/task-editor.c (status_string_map): Removed unused
-	variable.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
-	shared library.
-
-	* cal-client/Makefile.am (client_test_LDADD): Likewise.
-
-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
-	Likewise.
-
-	* gui/Makefile.am (LINK_FLAGS): Likewise.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	This is to make things work with libical 0.21helix1 and later.
-	Warnings remain because at last libical was constified; will take
-	care of those tomorrow.
-
-	* cal-util/timeutil.h: #include <ical.h> instead of <icaltypes.h>
-
-	* gui/e-itip-control.c: Likewise.
-
-	* gui/e-meeting-edit.c: Likewise.
-
-	* gui/itip-utils.h: Likewise.
-
-	* cal-util/cal-component.c (alarm_uid_from_prop): constify.
-	(cal_component_get_status): Updated for new libical API.
-	(cal_component_set_status): Likewise.
-
-	* gui/calendar-model.c (ensure_task_complete): Removed unused
-	status code.
-	(ensure_task_not_complete): Update for new status API.
-
-	* gui/dialogs/task-editor.c (status_string_to_value): Removed
-	function.
-	(status_value_to_string): Removed function.
-	(status_string_map): Removed variable.
-	(fill_widgets): Update for new status API.
-	(dialog_to_comp_object): Likewise.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): updated the
-	tests on the start & end time just before calling the callback. It
-	was skipping occurrences that started before the required interval's
-	start time, which was wrong. We want all occurrences that intersect
-	the interval.
-	(cal_obj_time_weekday): removed the CalRecurrence* argument, since it
-	isn't needed.
-
-2000-12-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: added changed flags and added calls to a new
-	function event_editor_set_changed() to set & reset this flag.
-	Added prompt_to_save_changed() which is called when the user
-	selects File/Close or the window's close button.
-	Fixed the 'All day event' toggle button.
-	Made the 'Alarm' page sensitive as appropriate when filling widgets.
-	(Though note that the alarm widgets are not being set yet.)
-
-	* gui/dialogs/task-editor.c: added changed flag as above.
-
-	* gui/event-editor-dialog.glade: used good names for all the
-	classification radio buttons so we can access them in the code.
-
-	* gui/event-editor.c (init_widgets): use the "show week numbers" config
-	option in the recurrence preview calendar.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): use 9:00 instead
-	of 09:00 in the main view, as we do everywhere else now. It means the
-	times won't line up, but they are easier to read which I think is
-	better.
-	Added support for Page Up/Down, though I think it should move the
-	selection rather than just scroll the canvas.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): removed the
-	end parameter since we should be using the chunk end time now.
-	Added single_rule parameter for when we are generating the
-	occurrences of a single RRULE, in which case the event's start date is
-	not included in the occurrences output (unless it results from the
-	RRULE expansion). Both of these fix problems when using COUNT.
-
-	* gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed):
-	fixed bug when checking if the new start day starts on the week start
-	day. If you select a complete week it should now show the Week view.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Free the strings we
-	get from the editables.
-
-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.
-	This sucks; this code should be shared between the two dialogs.
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (fill_widgets): Free the dates we get from
-	the component.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Attach signal
-	handlers to the e_scrolled_table's etable rather than to the
-	e_scrolled_table directly
-	(e_calendar_table_on_double_click): This signal provides more
-	params now
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Got rid of code referencing the
-	ETableScrolled proxy functions.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Ugly hack for syncing
-	until pcs can be altered (longer term)
-
-	* conduits/todo/todo-conduit.c (post_sync): ditto
-
-2000-12-07  Chris Toshok  <toshok@helixcode.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): add
-	EXTRA_GNOME_LIBS.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Create
-	an empty cal component if the object has been deleted.
-
-	* idl/evolution-calendar.idl: Bit shift the change type constants
-	properly
-
-2000-12-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): Unref
-	the component from the objects list; it got referenced as many
-	times as appropriate for the instances list.
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Confirm before deleting the
-	event.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_init): unref the pixbuf when
-	finished with it
-
-2000-12-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #920.
-
-	* gui/e-calendar-table.c (delete_component): New function.
-	(e_calendar_table_on_delete_task): Use delete_component().
-	(e_calendar_table_on_key_press): Likewise.  Also, mark the event
-	as handled.
-
-	* gui/calendar-model.c (calendar_model_get_component): Renamed
-	function from calendar_model_get_cal_object().
-	(calendar_model_delete_task): Removed function.
-
-	* gui/dialogs/delete-comp.[ch]: New files with the dialog for
-	deleting a calendar component.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm
-	before actually deleting the appointment.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added
-	delete-comp.[ch] to the list of sources.
-
-	* cal-util/cal-component.c (cal_component_destroy): Free the alarm
-	UID hash.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal.c (build_change_seq): kill
-	(Cal_get_changes): return the corba sequence directly
-
-	* pcs/cal-backend.h: update prototype
-
-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Build
-	the corba struct rather than the old calobjchange thing
-	(cal_backend_compute_changes): ditto.  build and return the actual
-	corba sequence rather than the list of calobjchanges
-	(cal_backend_get_changes): return the corba sequence
-
-	* cal-util/cal-util.h: Remove CalObjChange cruft
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): Kill
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-util.c:
-
-	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict
-	with calendar
-	(next_changed_item): update to use CalClientChange instead of CalObjChange
-	(compute_status): ditto
-	(pre_sync): ditto
-	(for_each_modified): since we now have the cal component we can call
-	local_record_from_comp directly
-
-	* conduits/todo/todo-conduit.c: same as above
-
-	* pcs/cal-backend.c: Remove much logging cruft
-	(cal_backend_compute_changes): Calculate the changes based on the
-	hashed database
-	(cal_backend_get_changes): call cal_backend_compute_changes
-	(cal_backend_compute_changes_foreach_key): hash callback for
-	calculating deletions
-
-	* pcs/cal-backend.h: update protype, remove logging cruft from
-	object
-
-	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid
-	now
-	(Cal_get_changes): rename from Cal_get_changed_uids
-	(cal_get_epv): reflect name change in epv
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion
-
-	* cal-util/cal-util.h: CalObjChange now returns the entire ical
-	component, update the change types.  This should all go away shortly
-
-	* idl/evolution-calendar.idl: getChangedUIds -> getChanges.
-	CalObjChange now contains the calobj rather than the uid, update
-	the change types
-
-	* cal-client/cal-client.c (cal_client_get_changes): rename from
-	cal_client_get_changed_uids to make idl and addressbook
-
-	* cal-client/cal-client.h: Update prototype
-
-	* cal-client/cal-client.c (build_change_list): Build a list of
-	CalClientChange instead of CalObjChange
-
-	* cal-client/cal-client-types.c (cal_client_change_list_free): Free
-	a glist of CalClientChanges
-
-	* cal-client/cal-client-types.h: New file. Declarations for
-	CalClientChange.
-
-	* cal-client/Makefile.am: Build new files
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix my build stupidty READ THE MACRO
-
-	* conduits/calendar/Makefile.am: ditto
-
-2000-12-04  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):
-	Initialize max_large_digit_width to 0 to prevent crazy sizing issues.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* gui/e-itip-control.c: Remove mysterious #include inserted by
-	mmeeks to break the build.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fixes bug #918.
-
-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for a
-	set of blocked days.
-	(weekday_picker_set_blocked_days): New function to configure a set
-	of days that cannot be modified by the user.
-	(weekday_picker_get_blocked_days): Query function for the above.
-	(day_event_cb): Block the appropriate days from being modified.
-
-	* gui/event-editor.c (get_start_weekday_mask): New function to
-	compute a day mask for the start day of a calendar component.
-	(set_recur_special_defaults): New function to set sane defaults
-	for the recurrence special widgets.
-	(fill_recurrence_widgets): Use set_recur_special_defaults().
-	(make_recur_weekly_special): Block the appropriate days.
-
-2000-12-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/control-factory.c (set_prop): Removed debugging message.
-	(control_factory_init): Ditto.
-
-	* gui/calendar-commands.c (calendar_set_uri): Ditto.
-
-	* gui/main.c (main): Ditto.
-
-	* gui/event-editor.c (set_title_from_comp): New function to
-	generate a title and convert it from UTF8 before setting it on the
-	window.
-	(save_event_object): Uset set_title_from_comp().
-	(event_editor_set_event_object): Likewise.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c:  Debug message cleanups
-	(comp_from_remote_record): Properly set the ical description field
-
-	* conduits/calendar/calendar-conduit.c (is_empty_time): New utility
-	functions that look for all 0's in a struct tm
-	(comp_from_remote_record): use above
-	(local_record_from_comp): Correctly set the repeatForever value so
-	that we repeat forever instead of a really long time
-	(comp_from_remote_record): Only set the cal component recurrence
-	until field when repeatForever is 0
-
-2000-11-30  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed a bug that caused the calendar to
-	segfault when the iTip control was destroyed.
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Empty
-	by_day entries are no longer indicated by ICAL_RECURRENCE_ARRAY_MAX not
-	SHRT_MAX. Calculate weekly and monthly by date recurrences properly
-	(get_pilot_day): Convert ical day to corresponding integer for pilot day
-
-2000-11-30  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Debug message cleanups
-	(get_ical_day): Fix off-by-one error which affected weekly occurences.
-	(comp_from_remote_record): Monthly by day and by date were reversed
-	(nth_weekday): function taken from event-editor.c that encodes BYDAY
-	values - this needs to be in libical really.
-	(comp_from_remote_record): Don't set the description if the pilot note
-	is null.  Rejig so that we don't have to free objects.
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	Upgrade of the alarm framework.  We now access alarms by a unique
-	identifier.  This UID is added as an extension property to alarm
-	subcomponents when their parent components are scanned by
-	CalComponent.
-
-	* cal-util/cal-component.c (CalComponentPrivate): Added a hash
-	table of alarm UIDs -> alarm properties.
-	(cal_component_init): Initialize priv->alarm_uid_hash.
-	(free_icalcomponent): Free the elements in the
-	priv->alarm_uid_hash.
-	(scan_alarm): New function to add scan an alarm subcomponent and
-	ensure that it has an alarm UID extension property so that we can
-	add it to our mapping table.
-	(cal_component_get_first_alarm): Removed function.
-	(cal_component_get_next_alarm): Removed function.
-	(cal_component_get_alarm_uids): New function.
-	(cal_component_get_alarm): New function.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-11-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reformatted the
-	table spec to make it easier to read.
-
-	* gui/tag-calendar.c: Oops, Damon wrote this, not me.  Fixed the
-	Authors line.
-
-2000-11-28  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]:
-	* gui/e-week-view*.[hc]: finished 12-hour support and tried to tidy
-	up & comment the drawing code in places. Also fixed a couple of bugs I
-	spotted. All the options on the 'Calendar' page should now work.
-
-2000-11-28  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: removed some debugging code that I had,
-	which might have caused problems.
-
-2000-11-27  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/calendar-model.c: added a preliminary change to have
-	Assigned To-Do items have a corresponding icon.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (free_prepare): Ditto
-
-	* conduits/calendar/calendar-conduit.c (free_prepare): Adjust
-	free_prepare to the correct signal parameters.  Don't actually
-	do anything - there is a semantic discrepancy that needs to be
-	resolved.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.
-
-2000-11-26  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c: added more support for config settings.
-
-	* gui/e-week-view.[hc]:
-	* gui/e-day-view.[hc]: added support for setting - show event end
-	times, week start day and 12-hour format (unfinished).
-
-	* gui/e-day-view-time-item.c: started 12-hour support.
-
-	* gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to
-	include the last day.
-
-	* gui/event-editor.c (set_all_day): minor change when turning all_day
-	off - set the event end to one hour after the event start if it is on
-	or before the start time. Also added more comments to make it a bit
-	clearer.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day
-	rather than a guint since we now support -ve days.
-	Also fixed bug with weekly recurrences.
-
-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): use
-	config settings.
-
-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):
-	updated EDateEdit calls.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Unref the ETable
-	extras.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (free_icalcomponent): DOH, fixed
-	reversed test for the presence of the icalcomp's parent.  This was
-	causing memory leaks in the Wombat and elsewhere.
-
-	* pcs/cal-backend.c (cal_backend_set_node_timet): Plug leak.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (scan_vcalendar): Use the new libical
-	external iterators (icalcomponent_begin_component() and friends);
-	the internal iterators are deprecated.
-
-	* cal-util/test-recur.c (generate_occurrences): Likewise.
-
-	* gui/e-itip-control.c (pstream_load): Likewise.
-
-	* gui/e-meeting-edit.c (e_meeting_edit): Likewise.
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Plug leak.
-	(cal_backend_log_sync): Free the entry->uid.
-
-	* util/icalendar-save.[ch]:
-	* util/icalendar-test.c:
-	* util/icalendar.[ch]: Removed obsolete files.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/task.xpm: Remove the check because it makes it look like the
-	task is already completed.  This fixes bug #819.
-
-	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.
-
-	* gui/task-*.xpm: Made the things look like little spiral-bound
-	notebooks.
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
-	column order be icon/completed/summary.  You may need to erase
-	your ~/evolution/config/TaskPad for this to appear.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon
-	column is not editable!
-
-	* gui/calendar-commands.c (todo_properties_changed): Removed.
-	(time_format_changed): Removed.
-	(colors_changed): Removed.
-
-	* gui/calendar-commands.h:
-	* gui/prop.c (prop_apply):
-	* gui/calendar-commands.c (init_calendar): Removed the old to-do
-	list crap.
-
-	* gui/gncal-todo.[ch]: Removed obsolete files.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed gncal-todo.[ch].
-
-	* gui/gnome-cal.c (gnome_calendar_todo_properties_changed): Removed.
-	(gnome_calendar_time_format_changed): Removed.
-	(gnome_calendar_colors_changed): Removed.
-
-2000-11-21   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: fixed the stupid Bonobo widget size
-	allocation bug that had been vexing me.
-
-	* gui/e-itip-control.glade: I removed some hacks that were
-	necessary for said size bug.
-
-2000-11-16   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation
-	code to our program; people can cancel meetings, which is the best
-	thing to do for most meetings.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: made the REPLY code actually work.
-
-2000-11-13   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/itip-utils.[ch]: I created this file to store some commonly used enumeration to
-	string mappings and functions.
-
-	* gui/Makefile.am: this was changed to reflect the addition of the above file.
-
-	* gui/e-itip-control.c: added code to take action on a REPLY message.
-
-	* gui/e-meeting-edit.c: bug fixes.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, bugzilla bug #829 is fixed and that does not redeem me from
-	extreme procrastination.  Wheeeeeeeeeeeeeeee!
-
-	* gui/event-editor-dialog.c: Changed the "Rule view" label to
-	"Preview"
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (make_recur_ending_count_special): Misspelled
-	"occurrences".
-	(fill_recurrence_widgets): Sensitize the "Custom recurrence" radio
-	button as appropriate.
-	(sensitize_recur_widgets): Resurrected the recurrence custom
-	warning label.
-	(get_widgets): Load the recurrence custom warning bin.
-
-	* gui/event-editor-dialog.glade: Add an empty alignment for the
-	recurrence custom warning label.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_preview_date_range_changed_cb): New
-	function; re-tag the calendar when its date range changes.
-	(init_widgets): Connect to "date_range_changed" on the recurrence
-	preview calendar.
-	(make_recur_weekly_special): Connect to "changed" on the weekday
-	picker.
-	(recur_weekday_picker_changed_cb): New function; re-tag the calendar.
-	(month_day_menu_selection_done_cb): Re-tag the calendar.
-	(recur_month_index_value_changed_cb): Likewise.
-	(recur_ending_until_changed_cb): Likewise.
-	(recur_ending_count_value_changed_cb): Likewise.
-	(make_recur_monthly_special): Connect to "value_changed" on the
-	adjustment of the month index.
-	(make_recur_ending_until_special): Connect to "changed" on the
-	ending-until date picker.
-	(make_recur_ending_count_special): Connect to "value_changed" on
-	the ending-count adjustment.
-	(init_widgets): Set to zero the maximum number of selectable days
-	in the recurrence preview calendar.  Set the week_start_day from
-	the calendar's configuration.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (clear_widgets): Block the signals as appropriate.
-	(fill_ending_date): Ditto.
-	(fill_recurrence_widgets): Ditto.
-	(recurrence_type_toggled_cb): Only sensitize the widgets and
-	preview the recurrence if the toggle button is active.
-
-2000-11-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and
-	exrule lists from the component if we are setting a simple
-	recurrence.
-	(recur_to_comp_object): Set the exdate list here instead of in
-	dialog_to_comp_object().
-	(preview_recur): New function to tag the recurrence preview
-	calendar based on the information from the dialog box.
-	(fill_exception_widgets): Fill the exception widgets here; moved
-	over from fill_widgets().
-	(fill_recurrence_widgets): Call preview_recur().  Also, call
-	fill_exception_widgets() first of all.
-	(recurrence_type_toggled_cb): Call preview_recur().
-	(recur_interval_selection_done_cb): Likewise.
-	(recur_ending_selection_done_cb): Likewise.
-	(recurrence_exception_add_cb): Likewise.
-	(recurrence_exception_modify_cb): Likewise.
-	(recurrence_exception_delete_cb): Likewise.
-	(date_changed_cb): Likewise.
-	(recur_interval_value_changed_cb): Likewise, new function.
-
-	* gui/tag-calendar.[ch]: New files with utilities for tagging
-	calendars.  mark.[ch] should go away some day.
-
-	* gui/tag-calendar.c (tag_calendar): Moved over from
-	gnome_calendar_tag_calendar().  Take in a CalClient instead of a
-	GnomeCalendar.  Added API docs.
-	(tag_calendar_by_comp): New function to tag a calendar based on a
-	single calendar component instead of a whole client.
-
-	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().
-	(obj_updated_cb): Likewise.
-	(obj_removed_cb): Likewise.
-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
-	(editor_closed_cb): Free the closure.
-	(destroy_editor_cb): Renamed from free_uid().  Do not free the
-	UID; just unref the event editor.  Our destroy handler to it will
-	free things properly.  This will also cause the corresponding
-	calendar client to be unrefed.
-	(editor_closed_cb): Use a flag on the GnomeCalendar to decide
-	whether to remove the editor from the hash table.  This is sort of
-	icky.
-
-	* gui/calendar-model.c (obj_updated_cb): If the object is new, we
-	have to use e_table_model_row_inserted(), not row_changed().
-	Thanks to JP Rosevear for reporting this.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	tag-calendar.[ch] to the list of sources.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/evolution-calendar.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
-
-	* pcs/Makefile.am (idl_flags): ditto.
-
-2000-11-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
-	iterator before finding the next changed item.
-
-	* conduits/todo/todo-conduit.c (for_each_modified): ditto
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests
-	can reply appropriately.
-
-2000-11-09   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c:  fixed a bug that would make the calendar segfault
-	if the meeting editor were called up twice without first saving the
-	component.
-
-2000-11-08   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI
-	to allow the user to add PUBLISHed events to his calendar, and created
-	unworking buttons for meeting requests.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	These changes fix bugzilla bugs #874 and #875.
-
-	* cal-util/cal-component.c (cal_component_get_exdate_list): Return
-	a list of CalComponentDateTime instead of simple struct
-	icaltimetype objects.  Exception date properties *can* contain a
-	timezone parameter, so we need to include those if they are
-	present.
-	(cal_component_set_exdate_list): On the input, handle a list of
-	CalComponentDateTime structures.  On the internals, handle a list
-	of struct datetime instead of plain properties.
-	(cal_component_free_exdate_list): Handle a list of
-	CalComponentDateTime structures.
-	(scan_exdate): Create a list of struct datetime structures.
-	(free_icalcomponent): Free the exdate_list properly.
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): Use the
-	proper types for exception dates.
-
-	* gui/comp-util.h:
-	* gui/comp-util.c: New files with utilities for manipulating
-	calendar component objects.
-	(cal_comp_util_add_exdate): New function.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	comp-util.[ch] to the list of sources.
-
-	* gui/e-day-view.c (add_exdate): New convenience function to add
-	an exception date to a calendar component.
-	(e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate().
-	(e_day_view_on_delete_occurrence): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-
-	* gui/event-editor.c (nth_weekday): Be paranoid about valid
-	position values.
-	(fill_widgets): Use the proper types for exdates.
-	(dialog_to_comp_object): Likewise.
-
-2000-11-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (adjust_day_index_spin): Adjust the valid
-	range of the month index spin button depending on the selection of
-	the day/weekday menu.
-
-2000-11-07   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed the GUI,
-	and added some extra feedback for the user.
-
-2000-11-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.h (WeekdayPickerClass): Added a "changed"
-	signal to notify of changes to the set of selected days.
-
-	* gui/weekday-picker.c (weekday_picker_class_init): Create the
-	"changed" signal.
-	(weekday_picker_set_days): Emit the "changed" signal.
-
-2000-11-06   Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed to GUI to
-	accomodate dynamically generated buttons, which will be tailored to
-	the type of iTip message that is incoming.
-
-	* gui/e-meeting-dialog.glade gui/e-meeting-edit.c: added a new button
-	to publish events, in addition to requesting meetings.
-
-2000-11-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Removed the old recurrence page.
-	Wheeeeeeeeee!
-
-	* gui/event-editor.c (make_recurrence_special): Clear the monthly
-	widgets.
-	(make_recur_monthly_special): Create the monthly widgets.
-	(clear_widgets): Clear the monthly values.
-	(simple_recur_to_comp_object): Fill in the monthly values.
-	(fill_recurrence_widgets): Fill in the monthly and yearly source
-	values.
-	(dialog_to_comp_object): Take in a CalComponent instead of using
-	the event editor's directly.
-	(recur_to_comp_object): Likewise.
-	(simple_recur_to_comp_object): Likewise.
-	(EventEditorPrivate): Removed the widgets from the old recurrence
-	page.
-	(get_widgets): Likewise.
-	(clear_widgets): Likewise.
-	(dialog_to_comp_object): If the description or summary are empty,
-	just clear the description list or summary property, respectively,
-	instead of saving empty ones.
-	(simple_recur_to_comp_object): Set the week_start field.
-
-	* gui/main.c: Fix includes, and add calendar-config.h.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages
-	file should not be in SOURCES.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore
-	files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (check_all_day): Block signals from the
-	toggle button.
-	(date_changed_cb): Merged check_dates() and check_times() into
-	this function; provide better behavior as well.
-	(check_dates): Removed function.
-	(check_times): Removed function.
-	(init_widgets): Connect to the "changed" signal on the start_time
-	and end_time widgets.
-	(check_all_day): Use a better test.
-
-	* gui/Makefile.am: Clean the idl-generated sources properly.
-	* cal-client/Makefile.am: Likewise.
-
-2000-11-03  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: added some checks for the type of an
-	incoming iCal component before passing it off to the CalComponent
-	routines.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): The date editor's
-	signal is now "changed".
-	(completed_changed): Renamed callback to reflect the name of the
-	signal.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so
-	all calendar gui shows up localized.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to
-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.
-	(fill_recurrence_widgets): Likewise.
-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The
-	weekday picker is not the immediate child of the recurrence
-	special container.
-	(fill_recurrence_widgets): Call make_recurrence_special() after
-	setting the recurrence period type.
-	(fill_ending_date): Call make_recurrence_ending_special().  This
-	would be so much nicer if GTK+ were model/view all over.
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and
-	add changed_hash.
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function
-	to get the next "really" changed item (changed status can be cleared now)
-	(compute_status): Compute status based on changed_hash
-	(pre_sync): Fill changed_hash and counts adds/mods/dels
-	(set_status_cleared): New callback handler - avoid double syncing
-	(for_each_modified): Use next_changed_item to iterate
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): New callback handler - mark/unmark archive status
-	(conduit_get_gpilot_conduit): Adjust signal connects
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We
-	split it from the radio callback so that we can call it explicitly
-	from fill_recurrence_widgets().
-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as
-	appropriate.
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Removed the geometry and
-	hidden arguments.  This code is ancient.
-	(all_calendars): Made static.  This sucks; configuration should be
-	notification-based instead of "let's iterate through all open
-	calendars".
-	(active_calendars): Removed.  Functions can check the length of
-	the all_calendars list if they are interested.
-
-	* gui/event-editor.c (sync_entries): Do not take in an extra data
-	pointer.
-	(summary_changed_cb): Use a single call back to sync both entries.
-	(sync_date_edits): New function to sync two EDateEdit widgets.
-	(init_widgets): Connect the general and recurrence starting date
-	widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sync_entries): New function.
-	(general_summary_changed_cb): Sync the general summary to the
-	recurrence summary widget.
-	(recurrence_summary_changed_cb): Vice-versa.
-	(init_widgets): Hook to the summaries.
-
-	* event-editor-dialog.glade: Do not expand/fill the start and end
-	date so that the "all day event" button is not pushed all the way
-	to the right.
-	Decrease the spacing between the recurrence sentence widgets.
-	Remove a spurious empty label that was lurking around the
-	recurrence widgets.
-	Make the alarm widgets expand the right way.
-	Delete old recurrence widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the recurrence
-	ending menu.
-	(recur_ending_selection_done_cb): Implemented.
-	(make_recurrence_ending_special): Implemented.
-	(make_recur_ending_until_special): Implemented.
-	(fill_ending_date): Implemented.
-	(make_recur_ending_count_special): Implemented.
-	(simple_recur_to_comp_object): Fill in the ending date.
-	(clear_widgets): Clear the recurrence ending widgets.
-
-	* gui/event-editor-dialog.glade: Moved the recurrence type radio
-	buttons to a single hbox to save space.
-	Fixed the lower value of the recurrence interval spin button.
-	Removed the stale widgets from the recurrence ending date part.
-
-2000-10-27  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA
-	strings of 0 length, but then didn't NULL terminate them.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):
-	Check boundary case of fast sync
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove
-	invalid test.
-	(local_record_from_comp): If the event is all day, mark it as timeless
-	(comp_from_remote_record): Timeless events take up all day
-
-	* conduits/todo/todo-conduit.c (add_archive_record): ditto
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper
-	number of parameters
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto
-
-2000-10-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new
-	recurrence page.  Replace the old widget pointers with the new
-	ones.  Modified the relevant functions accordingly and added
-	plenty of new ones.
-	(event_editor_get_cal_client): New function.
-	(fill_recurrence_widgets): This is *THE* tricky function for you.
-	It has to discriminate whether we get a recurrence we support for
-	editing or not.  And this is not trivial.  Sigh.
-	(event_editor_update_widgets): Added preconditions and API docs.
-
-	* event-editor-dialog.glade: Fixed all the spacings/
-	paddings/packing options so that the widgets will look right if
-	the dialog box is resized.  Also fixes some misaligned widgets.
-
-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed
-	incorrect assertion.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha
-
-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: brushed up some code to deal with
-	the organizer entry, and solidified the CORBA memory-freeing
-	issues.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* removed the Evolution-Composer generated files, due
-	to a tip on how we do things.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation
-	bugs, and finished the initial integration with the mailer.
-
-	* gui/Makefile.am: made the build us the Evolution-Composer.idl
-	from the composer directory.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/Evolution-Composer.idl: added this from the composer IDL sources
-
-	* gui/Makefile.am: changed to reflect the above IDL and the associated
-	orbit-idl generated files.
-
-	* gui/Evolution-Composer.h,
-	  gui/Evolution-Composer-common.c,
-	  gui/Evolution-Composer-stubs.c,
-	  gui/Evolution-Composer-skels.c:
-	the generated files, as per the above description.
-
-	* gui/e-meeting-edit.c: more work towards mailer integration.
-
-2000-10-24  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's
-	CORBA interfaces, though it's not yet working.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES):
-	* gui/dialogs/Makefile.am (INCLUDES):
-	* gui/Makefile.am (INCLUDES):
-	* cal-util/Makefile.am (INCLUDES):
-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c: ditto
-
-	* conduits/calendar/Makefile.am: Add libeconduit-static.la
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Add libeconduit-static.la
-
-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.
-
-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function
-	to save the state of the table to a given file.
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field
-	so we can access it to save the state.
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): call
-	e_calendar_table_save_state() to save the state of the TaskPad.
-	(setup_widgets): load the state of the TaskPad.
-
-	* gui/calendar-config.c: added support for the default view.
-
-	* gui/gnome-cal.c (gnome_calendar_construct):
-	(gnome_calendar_set_view_internal): use/set the default view setting.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-editor.c: added more (working) integration with the
-	meeting schedular.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion
-	of the code back into operation, because the icalproperty_remove_parameter()
-	function is now implemented.
-
-	* gui/e-meeting-editor.c: added more (unworking) integration with the
-	meeting schedular.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_destroy): New destroy
-	handler to properly stop the timer, sync the log and unref
-	the URI.
-	(cal_backend_last_client_gone): Just emit the signal,
-	clean up work is done in cal_backend_destroy now.
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the
-	uri we are replacing NOT the new uri.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix build
-
-	* conduits/calendar/Makefile.am: Fix build
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_archive_record):
-	Don't throw an error
-
-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* gui/calendar-commands.c (properties_cmd): ditto.
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use
-	cal_component_has_alarms().
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added
-	_click-to-add-message, though I'm not sure if i18n will work.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_hours):
-	(cal_obj_time_add_minutes):
-	(cal_obj_time_add_seconds): updated to handle -ve args.
-
-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling
-	mktime().
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the
-	callback if the event ends exactly on the interval start time.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): use cal_component_has_alarms().
-
-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().
-
-2000-10-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-config.c (config_read): set default MonthVPanePosition
-	to 1 rather than 0, so if you move the hpane you'll see the date
-	navigator.
-
-2000-10-19  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/event-editor.[ch]: added a public function which causes the
-	event editor to reload its widgets to the associated CalComponent.
-
-	* gui/e-meeting-edit.c: added rudimentary support for the phat
-	e-meeting-time-selector widget, though it has no effect on the
-	component yet.
-
-	* gui/Makefile.am: the meeting editor depends on the meeting widget
-	library, now.
-
-	* gui/e-itip-control.glade: I added another toolbar button that summons
-	from the hoary deep the meeting time widget.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.
-
-	* gui/event-editor.c (create_menu, create_toolbar): kill.
-	(event_editor_destroy): upd.
-	(event_editor_construct): update to new UI handler, cast
-	priv->general_summary to a widget not an object.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.
-	(debug_xml_cb): add debugging hook.
-
-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR
-
-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.
-
-2000-10-17  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-16  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: You can now add incoming iTip
-	messages to your calendar store.
-
-	* gui/e-itip-control.glade: added a progress bar dialog
-	in case the calendar loading takes a long time.
-
-2000-10-16  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff
-	is in the conduits now and uses the logging facility.
-
-	* pcs/cal-backend-file.c: ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal-backend.c: ditto
-
-	* pcs/cal.c: ditto
-
-	* pcs/cal.h: ditto
-
-	* idl/evolution-calendar.idl: ditto
-
-	* cal-util/cal-component.h: ditto
-
-	* cal-util/cal-component.c: ditto
-
-	* cal-client/cal-client.c: ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Take a stab at storing recurrence stuff on the pilot properly
-
-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the
-	event until after the update in case its a new item
-
-2000-10-16  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm
-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know
-	if you like these or not, I might work on these some more but
-	I wanted to put these versions up anyway to get feedback..
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
-	already in INCLUDES
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added an
-	"evolution:shell-component-icon" attribute.
-
-2000-10-12  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.{c,glade}: Made the control much more
-	relavent to the function at hand.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
-	columns to a min width of 18 and resizable to FALSE.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	(update_pixmaps):
-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,
-	and removed a lot of old unused stuff. We'll use plain buttons for
-	the view buttons for now, until Bonobo toolbars support radio buttons.
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not
-	NULL before using it.
-	(gnome_calendar_update_view_buttons): check button is not NULL.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
-	hour format the wrong way round.
-
-2000-10-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	Store recurrence stuff on the desktop properly
-	(get_ical_day): Utility function
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component-factory.c: Disable the executive summary.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType
-	as a param because its impossible to determine after a delete.
-	(cal_backend_remove_object): Calculate CalObjType and pass
-	it to cal_backend_log_entry
-	(cal_backend_update_object): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill
-	unused variables.
-	(add_archive_record): Don't kill the sync if this happens
-	(update_record): Kill old function
-	(replace_record): New function to handle replace_record signal
-	(conduit_get_gpilot_conduit): Listen for replace record signal
-	(add_record): Always add a new record, never replace
-	(replace_record): Always replace an existing record
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: set a default size for the control.
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added information about the
-	text/calendar MIME type, so that the evolution-calendar is called
-	to deal with iMIP attachments.
-
-	* gui/e-itip-control.[ch]: These files implement a Bonobo
-	control that will eventually deal with iMIP/iTIP messages from
-	the mailer. Right now, it's not working.
-
-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned
-	control.
-
-	* gui/Makefile.am: added references to the files I created.
-
-	* gui/main.c: called the initialization function of the Bonobo
-	control factory.
-
-2000-10-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/task-assigned-to.xpm gui/task-assigned.xpm
-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:
-	New versions of the icons for the tasklist/pad.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir
-	as we need it to save the config settings.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/main.c (main): call calendar_config_write_on_exit() to write
-	out some special config settings (as the mail component does).
-
-	* gui/calendar-commands.c (properties_cmd): changed to use the new
-	preferences dialog.
-	(update_all_config_settings): new function to iterate over all the
-	calendars and update the config settings.
-
-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.
-
-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
-	dialog.
-
-	* gui/calendar-config.[hc]: new files to handle loading/saving config
-	settings.
-
-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
-	plus minor changes.
-
-	* cal-util/test-recur.c: updated.
-
-	* gui/e-day-view-time-item.c:
-	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>
-
-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
-	(owner_set_cb):
-	(owner_unset_cb): updated the prototypes.
-
-	* gui/main.c (main): added call to calendar_config_write_on_exit().
-
-	* gui/component-factory.h:
-	* gui/component-factory.c (owner_set_cb): added global evolution_dir
-	just like the mail component, so we know we to store config stuff.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Updated to use the new ETable
-	specification stuff.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (map_sax_start_element): The
-	element is "pilot_id" not "pilotid".  Update both maps
-	(compute_pid): Utility function to set a local records pid
-	(local_record_from_comp): Compute the pid and status here,
-	no longer use the old cal_component pilot interfaces
-	(free_match): Its a *local not a **local
-
-	* conduits/calendar/calendar-conduit.c: same as above
-
-	* conduits/todo/todo-conduit.h: Have both a uid and pid map
-
-	* conduits/todo/calendar-conduit.h: same as above
-
-2000-10-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which
-	is based on the latest pilot link changes.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* Makefile.am: Added the executive-summary library and cflags
-
-	* gui/evolution-calendar.oafinfo: Added oaf servers for the
-	executive summary and executive summary factory.
-
-	* gui/calendar-summary.[ch]: New files to create the summary.
-
-	* gui/component-factory.c (summary_fn): Create the executive
-	summary component.
-	(component_factory_init): Start the summary factory as well.
-
-2000-10-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.[ch]: New widget to pick weekdays.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: upd.
-	(calendar_control_activate): upd.
-	(calendar_control_deactivate): upd.
-
-2000-10-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: when the user types in a new event, don't create
-	it until the user hits Return or switches focus. Removed the
-	editing_new_event flags.
-
-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can
-	start testing the recurrence code.
-
-	* cal-util/cal-recur.c: a few fixes.
-
-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to
-	return TRUE for long events, not FALSE.
-
-2000-10-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (print_todo_details): As a temporary solution to the
-	to-do printing, just print the summaries.  We'll use the ETable
-	printing stuff later.
-
-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.
-	(print_todo_details_cb): Likewise.
-	(print_day_summary): Initialize psi.events.  This code was
-	obviously never tested.
-	(print_todo_details): Likewise.
-	(print_day_details): Initialize pdi.slots.
-
-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b
-	confusion.  Fixes bugzilla #644.
-	(range_selector_new): Fix the whole localization mess by making
-	better use of strftime().  Now we generate whole date strings at a
-	time and compose them later.  Fixes bugzilla #643.
-
-2000-10-02  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters
-	in both the GUI and underlying iCal.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for organizers in the meeting
-	scheduler.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added code that makes changes to the underlying
-	iCAL structure of an event, when the user changes meeting information.
-
-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog
-	and accoutrements.
-
-2000-09-29  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c: updated to support RDATE end times or
-	durations. Note that if you have two RDATEs with the same start times,
-	but with different end dates/durations set, the results are
-	unpredictable. So the event editor dialog should check for this.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	make strftime() strings translatable, and changed the formats a bit.
-
-	* NOTE: someone needs to check print.c to make sure strftime strings
-	are OK for i18n.
-
-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
-	include the weekday if possible. Also changed EDayView struct so we
-	store the month & weekdays with the longest names rather than the
-	actual widths. This helps i18n.
-
-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
-	strftime strings, tried to see if weekday fits, and rearranged a
-	bit to make i18n easier.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
-	strftime strings, and updated to use new formats.
-
-	* gui/calendar-model.c: added use_24_hour_format boolean to
-	CalendarModelPrivate so we can display dates in 12-hour format if
-	requested. This meant adding a CalendarModel argument to a few
-	functions. Also added get/set functions to set use_24_hour_format.
-	I suppose ideally we should have an ECellDate renderer and this option
-	should go there.
-
-2000-09-27  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* gui/event-editor.c: changed a menu entry so that it will invoke
-	my meeting editor.
-
-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary
-	support for iTIP meeting scheduling. Currently, only the GUI works;
-	there is not yet any backend support.
-
-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]
-
-2000-09-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
-	window for the description field, since the default window height
-	doesn't seem to be working.
-
-	* cal-util/cal-component.h: added functions to get the actual
-	icalproperty lists for RRULE and EXRULE properties.
-
-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
-	test it a bit. Also fixed the call to generate_instances_for_year() so
-	it uses the chunk dates.
-
-2000-09-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (verbs): Removed the "about calendar"
-	command, since we don't want to have both "About Evolution" and
-	"About Calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler
-	update.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
-	is no map file.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Add since field to context
-
-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility
-	function
-	(map_sax_start_element): Look for the map timestamp as well
-	(map_write): Write the map timestamp
-	(pre_sync): Use the map time stamp when looking for changed entries
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure
-	we are in a valid timestamp
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file
-	name relevant to the actual calendar file, rather than just the
-	directory.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local
-	sax handler.
-
-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile
-	(map_sax_parse): Delete
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly
-	assign the CalObjChange type.
-	(cal_backend_log_sax_parse): Delete
-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function
-	(cal_backend_load): use above
-	(cal_backend_create): use above
-	(cal_backend_log_name): Take a uri instead of a backend param
-
-	* pcs/cal-backend-file.c: Get rid of useless hash functions
-	(cal_backend_file_load): Check to make sure path exists and is
-	local
-	(cal_backend_file_load): Unref the current uri if there is one
-	(cal_backend_file_create): ditto
-
-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before
-	shooting ourselves in the foot
-
-	* pcs/cal-backend-file.c (save): Fully implement backing up the
-	calendar before writing out the new entry.
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some
-	other cases where a slow sync is in order
-	(pre_sync): Pre load the uids, the map and the add/mod/del lists
-	(match_record): Use the map hash to match records
-	(iterate): Iterate using the pre-loaded uid list
-	(iterate_specific): Iterate using the add/mod/del lists
-	(purge): Delete all entries in the del list
-	(set_status): Set status by adding to an appropriate list
-	(set_pilot_id): Set pilot_id by updating map hash
-
-	* conduits/todo/todo-conduit.h: Add lists for added, modified and
-	deleted objects
-
-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id->uid map
-	file name
-	(map_sax_start_element): SAX handler to extract a pilot_id->uid
-	mapping
-	(map_sax_parse): Parse the given file and build a pilot_id->uid hash
-	(map_write_foreach): Write out individual mapping elements
-	(map_write): Write out the pilot_id->uid mapping
-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb
-
-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id
-
-	* conduits/todo/e-todo.conduit.in: A little renaming
-
-	* conduits/todo/Makefile.am: Fix build slightly
-
-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list
-	of CalObjChanges
-	(Cal_get_objects_in_range): Implement new corba function
-
-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL
-	(cal_backend_load): Track the uri so we can write the log file
-	to the same place
-	(cal_backend_log_name): Figure out the log filename/path based on
-	the calendar uri
-	(cal_backend_set_node_timet): Set an xml node property value from
-	a time_t
-	(cal_backend_log_entry): Adds a log entry to list waiting to be written
-	out
-	(cal_backend_log_sync): Syncs the log entries to disk
-	(cal_backend_log_sax_start_element): SAX callback for reading in
-	log entries
-	(cal_backend_log_sax_end_element): ditto
-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log
-	file looking for particular log entries and creating a CalObjChange
-	hash with the last change for each object
-	(cal_backend_get_log_entries): Returns a hash of objects of a given
-	type changed since the given time
-	(cal_backend_update_object): Add appropriate log entries
-	(cal_backend_remove_object): ditto
-	(cal_backend_get_changed_uids): Implement new idl interface call
-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list
-
-	* pcs/cal-backend-imc.[hc]: Remove crufty files
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New
-	function that returns the CalObjType for a uid.
-
-	* cal-client/cal-client.h: Update prototypes.
-
-	* cal-client/cal-client.c (build_change_list): Build a list
-	of CalObjChange items from a corba sequence.
-	(cal_client_get_changed_uids): New accessor method for the
-	similarly named addition to the idl file.
-
-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType
-	enum.
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility
-	method to free a list of CalObjChange objects.
-
-	* idl/evolution-calendar.idl: Add get_changed_uids method
-	and associated types.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
-	gui/e-week-view-event-item.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
-	to deal properly with gal.
-
-	* gui/check-filled.xpm: New file since we can't include it from
-	e-table anymore.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): add datadir
-
-	* gui/calendar-commands.c (calendar_control_activate): use it.
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/.cvsignore: Shush
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* Add headers with GPL notice and credit copyright to those appropriate
-
-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,
-	authors, copyright for about dialog.
-	(activate_sync_type): Tidy
-
-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*
-	to avoid conflicts.
-
-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes
-
-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto
-
-	* conduits/todo/todo.conduit.in: Removed
-
-	* conduits/todo/todo-conduit-control-applet.desktop: Removed
-
-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):
-	The config file will now be called e-todo-conduit
-	(todoconduit_save_configuration): ditto
-
-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.
-	(pre_sync): Remove commented out function that does not exist.
-
-	* conduits/todo/todo-conduit-control-applet.c: ditto
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-	* conduits/todo/todo-conduit.h: ditto
-
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: Re-write most UI handler code.
-
-2000-09-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Removed an unused
-	variable.
-
-	* gui/calendar-model.c (obj_updated_cb): See if the new object
-	matches the type of objects we were told to deal with.
-	(load_objects): Likewise.
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot
-	item from the hash if it exists in the first place.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (add_component): plug leakage
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.
-
-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*
-	for now
-	(cal_backend_file_create): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make
-	this actually fill in the todo record.
-	(find_record_in_repository): Add debug stuff
-	(iterate_specific): Use the already exisiting utility function
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct
-	the status and id types. g_strdup the uid since this is not a
-	constified return
-	(cal_backend_file_get_uid_by_pilot_id): correct the id type
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove `ui.xml' stuff.
-
-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
-
-2000-09-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the
-	"cal_loaded" signal of the client here.
-	(connect_load): Removed function.
-	(disconnect_load): Removed function.
-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal
-	structure instead of in a weird closure.  This gets rid of the
-	connect/disconnect mess as well.
-	(gnome_calendar_open): Store the URI in the GnomeCal.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c: Fixed a warning (removed unused variable
-	gfloat width from e_day_view_get_event_position.)
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup
-
-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to
-	EToDoLocalRecord, header cleanup
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use
-	description list instead of comment list for pilot todo note
-	(transmit): Check for null cal component properties, set priority
-	correctly, use description list instead of comment list.  Make
-	pilot record private when appropriate.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only
-	set the due date only if it exists
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Relying on the status
-	field is somewhat faulty since it is related to group scheduling
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):
-	Make log output a little more sensible
-	(comp_from_remote_record): Minor correction when making a CalComponent
-	from scratch.
-	(update_record): Use comp_from_remote_record for new items, rather
-	than repeating the code here.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function
-	since its no longer useful.  Fix naming of various fields from
-	the header changes.  Use GnomePilotRecord* stuff instead of
-	ICAL_PILOT_SYNC_*
-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes
-	a pilot id and loads the configuration here
-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
-	Unref the client and destroy the configuration if they exist here
-	(start_calendar_server): Change the default calendar name
-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid
-	(local_record_from_compobject): Rename from
-	local_record_from_icalobject.  Properly do the pilot id and status.
-	(comp_from_remote_record): Rename from ical_from_remote_record.
-	Handle due, complete, classification and pilot stuff properly
-	(pre_sync): Remove some old stuff.  We need to figure out how to
-	set some of the field values.
-	(set_status): Reflect pilot status changes from above
-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
-	now done by e_todo_context_destroy
-	(conduit_get_gpilot_conduit): Only set the context as object
-	data of the conduit.
-
-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
-	EToDoConduitContext.  Remove some unused struct fields.
-	For GCalLocalRecord, rename ical to comp.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.c: changed to use EDateEdit.
-
-	* gui/dialogs/task-editor-dialog.glade: added "None" option to
-	Classification option menu, and used custom widgets for the date
-	entries so we can use EDateEdit widgets.
-
-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
-	to be fixed at some point to handle invalid dates, i.e. when
-	e_date_edit_get_time returns -1.
-
-	* gui/calendar-model.c (ensure_task_complete):
-	(ensure_task_not_complete): new functions to set the related properties
-	to make sure a task is marked as complete on not, i.e. "Date Completed"
-	"Status" and "Percent" properties.
-
-2000-09-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): use the status field rather
-	than the completed date, as it is more reliable.
-	(get_is_overdue): use get_is_complete().
-	(calendar_model_mark_task_complete): check if it is already complete,
-	and if so don't update it.
-
-	* cal-util/cal-component.c (cal_component_get_status):
-	(cal_component_set_status): added functions to support the STATUS
-	property. Also added the property to CalComponentPrivate and set it
-	to NULL in free_icalcomponent(). Someone should check my code as I've
-	mainly done a Cut & Paste job.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-	* conduits/todo/todo-conduit.c: Convert "//" style comments
-	(local_record_from_ical_uid): Remove iCalObject cruft
-	(ical_from_remote_record): ditto
-	(free_match): Properly unref the CalComponent
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
-	cal component pilot stuff properly
-	(find_record_in_repository): Remove cruft
-	(ical_from_remote_record): Remove cruft
-	(update_record): Set the vtype immediately after creation. Remove cruft
-
-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff
-
-	* conduits/todo/todo-conduit-config.h: Move all the config stuff
-	here, I need to kill the warnings at some point
-
-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):
-	Set all the state variables correctly on a revert
-	(doSaveSettings): Update original state
-	(doHelp): Rename from about_cb
-	(main): Destroy configurations when done
-
-	* conduits/todo/Makefile.am: Tidy
-
-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
-	pilot ids
-	(cbf_pilot_equal): For hash table of pilot ids
-	(cal_backend_file_destroy): Destroy pilot id hash
-	(add_component): Insert the uid into the pilot hash
-	(remove_component): Remove the uid from the pilot hash
-	(cal_backend_file_load): Create the pilot hash
-	(cal_backend_file_create): ditto
-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash
-	(cal_backend_file_update_pilot_id): ditto
-
-	* cal-util/cal-component.h: Update prototypes
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
-	using ical X properties
-	(cal_component_set_pilot_id): ditto
-	(cal_component_get_pilot_status): ditto
-	(cal_component_set_pilot_status): ditto
-	(cal_component_free_pilot_id): Free a pilot id
-	(cal_component_free_pilot_status): Free a pilot status
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical' so that we get
-	`icalversion.h' from the build directory instead of taking it from
-	the installation directory, which is of course Wrong (tm).
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (cal_loaded_cb): New function with the
-	loading/creation state machine.  It is carefully modelled after
-	the state machine that started the Universe, so bow before it.
-	(gnome_calendar_construct): Do not connect to cal_loaded here.
-	(connect_load): The closure for the cal_loaded callback is a bit
-	tricky, so provide a function to create it and connect to the
-	signal.
-	(disconnect_load): Disconnect from the signal and free the
-	closure.
-	(gnome_calendar_load_cb): Removed obsolete buggy function.
-	(gnome_calendar_open): Use the new mechanism.
-
-	* gui/control-factory.c (set_prop): The default filename is now
-	calendar.ics.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (transmit): Use
-	icaltime_as_timet
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/Makefile.am: Tidy
-
-	* conduits/todo/Makefile.am: Tidy
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fall equinox cleanup!
-
-	OK, I know the equinox is not here yet, but weather has changed
-	enough to warrant it.
-
-	Sigh.  This place is definitely not the tropics.
-
-	* gui/gnome-cal.c (obj_updated_cb): Renamed from
-	gnome_calendar_object_updated_cb(); fixed prototype.
-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();
-	fixed prototype.
-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a
-	private structure so I don't have to rebuild the whole calendar
-	GUI directory every time something changes in the object.
-	(GnomeCalendarPrivate): Removed the property bag and the control
-	fields; they are local to the control-factory now.
-	(gnome_calendar_update_view_buttons): Remove the
-	ignore_view_button_clicks mess and just block the signal.
-	(gnome_calendar_set_view): Added a "focus" argument to indicate
-	whether we want the main widget in the specified view to grab the
-	focus.
-	(gnome_calendar_set_view_internal): Handle the focus argument here.
-	(gnome_calendar_set_view_buttons): Temporary hack to notify the
-	calendar about its buttons.
-	(gnome_calendar_get_selected_time_range): New function.
-	(gnome_calendar_get_cal_client): New function.
-
-	* gui/control-factory.c (calendar_properties_init): Keep the
-	property bag local to here; it does not need to be in the calendar
-	object yet.
-	(control_factory_fn): Renamed from control_factory().  Just use
-	control_factory_new_control().
-	(control_factory_new_control): Moved the stuff over from
-	create_control(), and keep the control local to here.  Check the
-	return value of bonobo_control_new().
-
-	* gui/calendar-commands.c (show_day_view_clicked): Remove the
-	ignore_view_button_clicks mess.
-	(new_calendar): Removed the useless "page" argument.
-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()
-	for now.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* cal-client/Makefile.am: Added -lunicode
-
-	* gui/dialogs/task-editor.c: More UTF-8 wrappers
-	(priority_index_to_value): Kill warning, add assertion
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use new cal_component_has_recurrences convenience function
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	ditto
-
-	* gui/calendar-model.c (calendar_model_value_at): ditto
-	(calendar_model_value_at): ditto
-
-	* gui/e-day-view.c (e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_reshape_day_event): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use
-	new convenience functions and only get the recurrence
-	stuff if needed.  Free the recurrence stuff if used.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.h: Add new prototypes
-
-	* cal-util/cal-component.c (cal_component_has_exrules): Utility
-	function to determine whether a cal component has any exrules
-	(cal_component_has_exdates): Ditto for exdates
-	(cal_component_has_exceptions): Utility function to determine
-	whether a cal component has any exception rules
-	(cal_component_has_recurrences):Utility function to determine
-	whether a cal component has any recurrence rules
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if
-	there are no dates in the box
-
-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special
-	case for when there are exceptions but no rrules or rdates.
-	(cal_obj_remove_exceptions): Use date only compare func
-	(cal_obj_date_only_compare_func): New compare function that
-	compares the date only, not the time.
-
-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the
-	yearly recurrence type
-	(dialog_to_comp_object): We need to allocate icaltimetypes for the
-	exdate list
-	(fill_widgets): Handle a weekly recurrence with no particular day set
-	(dialog_to_comp_object): Kill all rrules if "None" is selected as
-	the recurrence type by the user
-
-2000-09-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
-	TaskEditor dialog.
-
-	* gui/dialogs/task-editor.[hc]:
-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
-	'Status' property (CalComponent doesn't support it yet), and use a
-	replacement for GnomeDateEdit, since we need to support setting 'None'
-	as the date.
-
-2000-09-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c (obj_updated_cb):
-	(obj_removed_cb): compare the updated object's uid with the one we
-	are editing, and just return if it doesn't match.
-
-2000-09-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
-	if the client has loaded successfully. Gets rid of a few warnings.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list
-	is a list of icaltimetypes, not CalComponentDateTimes
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append
-	the exdate to the list AFTER we create the date value.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_recur_list): Free
-	the data, not the list element.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute
-	the event duration using the event start/end times, not the
-	interval times.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check
-	to see if r->enddate is (time_t)-1 and set to 0 if so
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include
-	directories and `$(BONOBO_GNOME_CFLAGS)'.
-	* conduits/todo/Makefile.am (INCLUDES): Likewise.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/event-editor.c: e_utf8 wrappers
-
-	* gui/gncal-todo.c: e_utf8_wrappers
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c,
-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:
-	Fixed some warnings.
-
-2000-09-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new): Use
-	gnome_calendar_construct() so that we can check for proper
-	creation of the client.
-	(gnome_calendar_destroy): Check that the client exists before we
-	unref it.
-	(gnome_calendar_construct): Do the CalClient creation here.  Bind
-	the views to it here as well instead of in setup_widgets().
-	(gnome_calendar_init): Call setup_widgets() here.
-
-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the
-	model.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Update for new libical.
-	Conduits should atleast compile now.
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* Makefile.am: Build the conduits only when they've been
-	enabled.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c: Make toolbar save and close button.
-	We should put a similar menu option in sometime.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (array_to_list): Use
-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(dialog_to_comp_object): Set the weekday start value and use
-	local not UTC time
-
-2000-08-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): No need to spit a warning
-	if removal fails.
-	(event_editor_destroy): Free the exception clist data.  Unref the
-	calendar client here.
-	(close_dialog): Just call gtk_object_destroy() on the event
-	editor; the destroy handler will free everything else.
-
-	* cal-client/cal-client.c (cal_client_object_exists): Removed
-	function; this is not useful because we operate asynchronously.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to
-	spit a warning if removal fails.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(recurrence_toggled): Make an ugly hack to get the recurrence
-	pages showing properly since we don't yet implement all of the
-	recurrence rule stuff.
-
-	* cal-client/cal-client.c (cal_client_object_exists): New function
-	to see if an object exists and is obtainable from the backend
-
-	* cal-client/cal-client.h: Add prototype
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed
-	callback to do hash cleanup
-	(gnome_calendar_edit_object): Set event editor calendar client.
-
-	* gui/event-editor.h: Add new prototype
-
-	* gui/event-editor.c: Trash signal stuff.  We will manipulate
-	the client directly.  Make the toolbar save and menu save items
-	work identically.  Add icons to the toolbar.
-	(save_event_object): Call cal_client_update_object
-	(close_dialog): Unref the client and disconnect signals
-	Actually destroy the event editor object.
-	(obj_updated_cb): New function.  Doesn't really do anything
-	yet but it will inform the user the event has changed elsewhere
-	in the future.
-	(obj_removed_cb): ditto
-	(event_editor_set_cal_client): New function to set the calendar
-	client
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit
-	the sequence to the cal component and use non UTC times.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.[hc]:
-	* gui/e-day-view-main-item.c:
-	* gui/e-week-view.[hc]:
-	* gui/e-week-view-main-item.c:
-	* gui/calendar-commands.c:
-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,
-	and a few other fixes.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.
-
-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the
-	dtstart/dtend on the component before adding it.
-	(e_day_view_on_editing_stopped): No need to check for an UID.
-	Update the summary properly.
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_week_view_key_press): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.c (add_instance): Actually add the
-	comp_instance struct to the instances list.  We now appear
-	to able to keep events and todos between sessions. Yay!
-
-2000-08-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	Now the views monitor the client by themselves; it does not make
-	sense to proxy all notifications through the GnomeCal.  The
-	GnomeCal should just be a meta-widget that holds all the views.
-
-	At some later point we'll want to decouple the views from the
-	GnomeCal so that they can be embedded anywhere; they should emit
-	signals to request appropriate actions from the toplevel GUI
-	instead of calling the GnomeCal directly.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now
-	the day view monitors the client by itself.
-	(cal_loaded_cb): New callback; moved over from
-	e_day_view_update_all_events().
-	(obj_updated_cb): New callback; moved over from
-	e_day_view_update_event().
-	(obj_removed_cb): New callback; moved over from
-	e_day_view_remove_event().
-	(e_day_view_update_all_events): Removed function.
-	(e_day_view_update_event): Removed function.
-	(e_day_view_remove_event): Removed function.
-	(*): Use the day_view->client directly instead of fetching it from
-	the GnomeCal.
-	(e_day_view_destroy): Unref the client.
-	(e_day_view_reload_events): Check if the client is loaded.
-	(e_day_view_key_press): Set the vtype of the new component.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.
-	(cal_loaded_cb): New callback.
-	(obj_updated_cb): New callback.
-	(obj_removed_cb): New callback.
-	(e_week_view_update_all_events): Removed function.
-	(e_week_view_update_event): Removed function.
-	(e_week_view_remove_event): Removed function.
-	(*): Use the week_view->client directly.
-	(e_week_view_destroy): Unref the client.
-	(e_week_view_reload_events): Check if the client is loaded.
-
-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the
-	views.
-	(gnome_calendar_update_all): Do not update the views, since now
-	they do it themselves.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(setup_widgets): Remove all to-do list cruft.
-	(gnome_calendar_colors_changed): Likewise.
-	(gnome_calendar_todo_properties_changed): Likewise.
-
-	* gui/calendar-commands.h (todo_style_changed): Removed variable.
-
-	* gui/gncal-todo.c: Removed old clist cruft; just left in the
-	temporary dialog box for now.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/client-test.c:
-	* cal-client/cal-client.c:
-	* conduits/todo/todo-conduit.h:
-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_set_event_object
-
-	* gui/event-editor.c (event_editor_set_event_object): Rename
-	from event_editor_set_ical_object
-
-	* gui/event-editor.h: Update prototype
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment):
-	Call cal_component_commit_sequence after event changes. Default
-	to these being all day events.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC
-	times
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_is_loaded): New function.
-	We need this from code that dynamically updates from a client and
-	could not have connected to the "cal_loaded" signal right after
-	the client was created.
-
-	* gui/calendar-model.c (load_objects): Do not try to load the
-	objects if the client has not been loaded yet.
-	(cal_loaded_cb): Check the status value.
-
-	* gui/calendar-model.h (CalendarModel): Declare the private
-	structure here so that gdb will give me love.
-
-	* pcs/cal-factory.h (CalFactory): Likewise.
-
-	* pcs/cal.h (Cal): Likewise.
-
-	* cal-client/cal-listener.h (CalListener): Likewise.
-
-	* cal-client/cal-client.h (CalClient): Likewise.
-
-	* pcs/cal-backend.h (CalBackend): This no longer has a private
-	structure, so remove it.
-
-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the
-	vCalendar and old iCalendar cruft.
-	(libcal_utilinclude_HEADERS): Likewise.
-	Removed the obsolete iCalendar test program.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
-	as libical has the API for this
-
-	* cal-util/timeutil.c: ditto
-
-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
-	icaltime_as_timet
-
-	* gui/calendar-model.c: ditto
-
-	* gui/event-editor.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Remove the
-	icalcomponent from the toplevel calendar here.
-	(cal_backend_file_update_object): Do not remove it here.
-	(cal_backend_file_remove_object): Do not remove it here.
-	(add_component): Add the icalcomponent to the toplevel calendar if
-	asked to.
-	(cal_backend_file_update_object): Do not add it here.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to
-	null, only set recurrence rules and exception dates if there
-	are any
-
-2000-08-27  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (save): Write out the calendar object
-	(cal_backend_file_update_object): Remove/add the icalcomponent
-	from our master icalcomponent (the calendar)
-	(cal_backend_file_remove_object): Remove the icalcomponent
-	from our master icalcomponent
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/Makefile.am: Remove gnorba stuff
-
-	* gui/main.c: ditto
-
-	* gui/component-factory.c: ditto
-
-	* gui/control-factory.c: ditto
-
-	* gui/*.gnorba: ditto
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
-	debug code.
-
-	* gui/calendar-model.c (set_complete): Set the completed
-	date to the current date
-	(calendar_model_set_value_at): Handle complete field
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Don't attempt to
-	free this if its null
-	(calendar_model_duplicate_value): Implement for summary field
-	value
-	(calendar_model_initialize_value): Remove debug code
-
-	* gui/e-calendar-table.c: Correct etable init xml
-	(create_column): Pass the id to e_table_header_add_column
-	rather than a hard coded one
-	(e_calendar_table_init): Make sure summary column isn't
-	added twice.  Add an alarms column, else etable won't
-	work with columns who have an ID higher than that
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Properly append to list
-
-	* gui/event-editor.c (dialog_to_comp_object): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base
-	times are not UTC
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* Update for libical 0.19
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:
-	Fixed some warnings.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (save_event_object_cb): Make signal
-	names saner
-	(released_event_object_cb): ditto
-	(gnome_calendar_edit_object): ditto
-
-	* gui/event-editor.h: Make signal names saner
-
-	* gui/event-editor.c (event_editor_class_init): Make signal
-	names saner now that we don't use ical object
-	(save_event_object): ditto with callback names
-	(file_save_cb): ditto
-	(tb_save_and_close_cb): ditto
-	(event_editor_set_ical_object): ditto
-
-	* gui/e-day-view.c (e_day_view_update_event): Umm,
-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove owner field
-
-	* gui/event-editor.c (clear_widgets): Forget about owner field
-	(get_widgets): ditto
-	(fill_widgets): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_initialize_value): Handle
-	summary field
-	(calendar_model_value_is_empty): ditto
-	(calendar_model_free_value): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove status bar
-
-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow
-	a null list
-	(cal_component_set_rdate_list): Allow a null list
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit
-	the CalComponent sequence
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c: #include <e-util/e-cursors.h>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	Initialize time_min_x1 and hour_r to keep gcc happy.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
-	(e_day_view_update_main_canvas_drag): Initialize start_row.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	Initialize time_y_small_min, icon_x.
-
-	* Makefile.am (SUBDIRS): Re-enable the gui directory.
-
-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
-	out.
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
-	CalComponent
-	(e_week_view_on_new_appointment): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/prop.c: #if out some alarm stuff
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Updated
-	function.
-	(e_calendar_table_open_task): Updated function.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated
-	function.
-	(calendar_model_free_value): Updated function.
-	(calendar_model_initialize_value): Updated function.
-	(calendar_model_value_is_empty): Updated function.
-	(remove_object): Updated function.
-	(obj_updated_cb): Updated function.
-	(calendar_model_get_cal_client): Added inline docs.
-	(calendar_model_delete_task): Updated.
-	(calendar_model_mark_task_complete): Updated.
-	(calendar_model_get_cal_object): Updated.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (set_categories): New function.
-	(parse_time): Moved over from the old set_time_t().  This just
-	parses the time and leaves the warning dialog for the caller.
-	(set_datetime): New function.
-	(set_geo): Updated old function.
-	(set_percent): Updated old function.
-	(set_priority): Updated old function.
-	(set_summary): New function.
-	(set_url): New function.
-	(calendar_model_set_value_at): Updated function.
-	(calendar_model_is_cell_editable): Updated function.
-	(calendar_model_append_row): Updated.  Added an ugly hack to
-	accomodate ETable's lack of a real API for adding new items.
-	Also, don't try to set columns that are not editable.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_reload_events):
-	Use CalObjType
-
-	* gui/e-day-view.c (e_day_view_reload_events): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.h: Update prototypes
-
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):
-	Remove commented out portions.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	Tidy.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c
-	(e_day_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_day_view_reshape_long_event): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_reload_events): Use revamped CalClient
-	(e_day_view_update_event_cb): Use CalComponent
-	instead of iCalObject
-	(e_day_view_foreach_event_with_uid): ditto
-	(e_day_view_remove_event_cb): ditto
-	(e_day_view_update_event_label): ditto
-	(e_day_view_find_event_from_uid): ditto
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_new_appointment): ditto
-	(e_day_view_on_edit_appointment): ditto
-	(e_day_view_on_delete_occurrence): ditto
-	(e_day_view_on_delete_appointment): ditto
-	(e_day_view_on_unrecur_appointment): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_free_event_array): ditto
-	(e_day_view_add_event): ditto
-	(e_day_view_key_press): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_update_top_canvas_drag): ditto
-	(e_day_view_update_main_canvas_drag): ditto
-	(e_day_view_on_drag_data_get): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_week_view_reload_events): Use revamped CalClient
-	(e_week_view_reshape_event_span): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_week_view_update_event_cb): Use CalComponent instead of
-	iCalObject
-	(e_week_view_foreach_event_with_uid): ditto
-	(e_week_view_remove_event_cb): ditto
-	(e_week_view_free_events): ditto
-	(e_week_view_add_event): ditto
-	(e_week_view_on_editing_stopped): ditto
-	(e_week_view_find_event_from_uid): ditto
-	(e_week_view_key_press): ditto
-	(e_week_view_show_popup_menu): ditto
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_edit_appointment): ditto
-	(e_week_view_on_delete_occurrence): ditto
-	(e_week_view_on_delete_appointment): ditto
-	(e_week_view_on_unrecur_appointment): ditto
-
-	* gui/e-week-view.h: Update prototypes.
-
-2000-08-18  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.h: Update prototypes.
-
-	* gui/event-editor.c: Need to come back here later to fix the
-	alarm stuff.  The gui also needs to be completely redone to
-	support the fancier CalComponent settings (exrules, rdates, etc)
-	There are some warnings that I put in to mark some of these
-	spots
-	(event_editor_destroy): Use Calcomponent instead
-	of iCalObject
-	(make_title_from_comp): ditto
-	(clear_widgets): ditto
-	(fill_widgets): ditto
-	(classification_get): ditto
-	(dialog_to_comp_object): ditto
-	(save_ical_object): ditto
-	(close_dialog): ditto
-	(event_editor_set_ical_object): ditto
-
-2000-08-17  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of
-	iCalObject
-	(cancel_button): ditto
-	(gncal_todo_edit): ditto
-	(add_todo): ditto
-	(edit_todo): ditto
-	(delete_todo): ditto
-	(insert_in_clist): ditto
-	(gncal_todo_update): ditto
-
-	* gui/gncal-todo.h: Update prototypes
-
-2000-08-16  JP Rosevear  <jpr@helixcode.com>
-
-	Rework gnome-cal.c - alarms are a tad broken ATM so this
-	will need more cleaning later.
-
-	* gui/gnome-cal.c (snooze): Use CalComponent instead of
-	iCalObject
-	(edit): ditto
-	(audio_notification): ditto
-	(display_notification_cb): Use CalComponent member of
-	alarm_notify_closure rather than iCalObject
-	(display_notification): ditto
-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types
-	(gnome_calendar_tag_calendar_cb): New
-	cal_client_generate_instances callback to
-	mark_gtk_calendar_day's
-	(gnome_calendar_tag_calendar): Use above callback
-	(save_ical_object_cb): Use CalComponent instead of
-	iCalObject
-	(gnome_calendar_edit_object): ditto
-	(gnome_calendar_new_appointment): ditto
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/mark.c (mark_month_item_cb): Callback used to mark every
-	event in a month.
-	(mark_month_item): Use cal_client_generate_instances with
-	above callback
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/print.c (print_month_small): Use
-	cal_client_get_objects_in_range
-	(print_day_details_cb): Callback used to create columns and fill
-	events into a day view.  Code should be shared with e-day-view
-	in reality.  Maybe need to go back to layout.[hc] a bit later
-	(print_day_details): Use cal_client_generate_instances with
-	above callback. Iterate over results to expand events to fit.
-	(print_day_summary_cb): Callback to build list of event info
-	for a day
-	(print_day_summary): Use cal_client_generate_instances with
-	above callback to generate the required event info for printing
-	(print_todo_details_cb): Callback used create list of todo info
-	(print_todo_details): Use cal_client_generate_instances with
-	above callback to generate required todo info for printing.
-
-	* gui/layout.[hc]: No longer used.
-
-2000-08-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_is_overdue): Finished implementing.
-	(calendar_model_value_at): Handle the color field.
-
-2000-08-11  Seth Alves  <alves@hungry.com>
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id):
-	(cal_component_set_pilot_id):  stubs for pilot id accessors
-	(cal_component_get_pilot_status):
-	(cal_component_set_pilot_status): stubs for pilot status accessors
-
-	* conduits/calendar/calendar-conduit.c (transmit): start to
-	convert to cal-component interface
-
-	* conduits/todo/todo-conduit.c (transmit): same
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_geo): Generate a prettier string for
-	the geographical position.
-	(get_classification): New function.
-	(get_categories): New function.
-	(get_completed): New function.
-	(get_dtend): New function.
-	(get_dtstart): New function.
-	(get_due): New function.
-	(get_percent): New function.
-	(get_priority): New function.
-	(get_summary): New function.
-	(get_transparency): New function.
-	(get_url): New function.
-	(get_has_alarms): New function.
-	(get_has_recurrences): New function.
-	(get_is_complete): New function.
-	(get_is_overdue): New function.
-
-	* cal-util/cal-component.c (scan_property): Handle the GEO
-	property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_geo): Likewise.
-	(cal_component_set_geo): Likewise.
-	(cal_component_free_geo): Likewise.
-	(cal_component_set_exdate_list): Removed incorrect assertion.
-	(cal_component_set_exrule_list): Removed incorrect assertion.
-	(cal_component_get_next_alarm): Oops, this had not been
-	implemented at all.
-	(cal_component_has_rdates): New function.
-	(cal_component_has_rrules): New function.
-
-	* cal-util/cal-component.h (CalComponentField): Added the GEO
-	property.
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	PERCENT-COMPLETE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_percent): Likewise.
-	(cal_component_set_percent): Likewise.
-	(cal_component_free_percent): Likewise.
-	(scan_property): Handle the PRIORITY property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_priority): Likewise.
-	(cal_component_set_priority): Likewise.
-	(cal_component_free_priority): Likewise.
-
-	* cal-util/cal-component.h (CalComponentField): New enumeration
-	with the list of fields we support for ETable.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Update prototype.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.
-	Mostly moved over from calendar-commands.c:display_objedit().
-
-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!
-	(display_objedit): Removed.
-	(new_appointment_cb): New function.  Just call
-	gnome_calendar_new_appointment().
-	(display_objedit_today): Removed.
-	(calendar_control_activate): Removed the "New appointment for
-	today" option, since it is pretty useless.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): There.
-	A pretty function to generate recurrence instances atomically so
-	that clients don't have to jump through hoops.  Now we can get rid
-	of the ugly calendar_iterate() function.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/calendar-commands.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger
-	time from the current time.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c: Fixed a warning.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
-	Fixed some warnings.
-
-2000-08-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
-	method.  Takes in a time range and the type of component we are
-	interested in; returns a list of UIDs.  The idea is that
-	ocurrences get computed in the client; we can have multiple
-	recurrences in iCalendar and we cannot identify them trivially
-	across the wire.
-	(Cal): Removed the get_events_in_range() method.
-
-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.
-	(cal_backend_get_objects_in_range): New function.
-	(cal_backend_get_events_in_range): Removed.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):
-	Implemented new method.
-	(cal_backend_file_get_events_in_range): Removed.
-
-	* pcs/cal.c (Cal_get_events_in_range): Removed.
-	(uncorba_obj_type): New function.
-	(Cal_get_uids): Use uncorba_obj_type().
-	(Cal_get_n_objects): Likewise.
-	(Cal_get_objects_in_range): Implemented new method.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.
-	(cal_client_get_objects_in_range): Implemented.
-	(corba_obj_type): New function.
-	(cal_client_get_n_objects): Use corba_obj_type().
-	(cal_client_get_uids): Likewise.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_clone): New function.
-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE
-	property does not need incrementing.
-
-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use
-	CalComponent.  Deal with an empty summary property.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,
-	libical owns the string's memory, so do not free it.
-
-	* cal-client/client-test.c (create_client): Connect to the destroy
-	signal of the client here.
-
-	* cal-client/test.ics: New test file, modified from Eric Busboom's
-	test file from RFC 2445.
-
-2000-08-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (dump_component): This was gone for
-	some reason.
-	(main): Load a new test file.
-
-2000-08-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_commit_sequence): New
-	function to commit changes to the SEQUENCE property.
-	(cal_component_get_as_string): Ensure that the sequence has been
-	committed.
-
-	* cal-client/cal-client.c (cal_client_get_object): Use
-	CalComponent instead of the old iCalObject.
-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE
-	property before stringifying the object and piping it over to the
-	Wombat.
-
-2000-08-04  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if
-	oaf isn't initialized by the time the conduit starts, start it
-	up.  we do this because we need to start wombat with oaf, and
-	gpilotd doesn't currently start oaf.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): unref.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):
-	Added stub for now.
-	(cal_backend_file_update_pilot_id): Likewise.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]
-	from the list of sources.  The idea is to move vCalendar importing
-	to the GUI as a convenience function.
-
-2000-08-02  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
-	save (cbimc) after setting the pilot id and status.
-
-2000-08-02  Joe Shaw  <joe@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):
-	Fixed a g_return_if_fail that had two parameters and thus
-	wouldn't build.
-
-2000-08-03  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): updated to match
-	the new ETableModel append_row. This meant we could also get rid of
-	the row_being_added and idle_id hack.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Emit "model_pre_change" signals as
-	appropriate.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file
-	backend.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].
-
-	* cal-util/cal-component.c (cal_component_set_icalcomponent):
-	Return an operation success code for if we are passed a component
-	of a type we don't support.
-
-2000-07-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-recur.c (*): Use CalComponent and the new property
-	types instead of the old iCalObject stuff.
-	(cal_recur_generate_instances): Renamed from
-	cal_object_generate_events().  Ensure that the component has the
-	DTSTART property.
-	(generate_instances_for_year): Renamed from
-	cal_object_generate_events_for_year().
-	(cal_obj_expand_recurrence): Made static.
-	(cal_recur_from_icalrecurrencetype): New function.  We should
-	really convert this whole file to use struct icalrecurrencetype
-	instead.
-	(cal_recur_free): New function.
-
-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.
-	(CalRecurrence): Renamed from CalObjRecurrence.
-
-	* cal-util/timeutil.c (time_from_icaltimetype): New function.
-
-	* cal-util/Makefile.am: Commented out the test-recur program.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* Removed doc directory, since it is the old gnome-pim docs which
-	aren't used any more.
-
-	* Makefile.am (SUBDIRS): removed doc.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* gui/calendar-model.c: compile fix for Solaris
-	(works under Linux, too; don't know about others)
-
-	* this is a test of whether CVS merge does what I
-	think it will do.
-
-2000-07-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, it seems that we have all the interesting properties for
-	single-user calendars now.  RFC 2445 can bite me.
-
-	* cal-util/cal-component.c (scan_property): Handle the RRULE
-	property.  Yay!.
-	(scan_recur): Likewise, yow!
-	(get_recur_list): Likewise, yeehaw!
-	(get_recur_list): Likewise, honk honk!
-	(set_recur_list): Likewise, booooga booooga!
-	(cal_component_get_rrule_list): Likewise, squeek squeek!
-	(cal_component_set_rrule_list): That's it, I ran out of sounds.
-	(cal_component_free_recur_list): Likewise.
-	(scan_property): Handle the EXRULE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exrule_list): Likewise.
-	(cal_component_set_exrule_list): Likewise.
-	(set_period_list): Oops, free the old properties as well as
-	removing them.
-	(set_text_list): Ditto.
-	(cal_component_set_exdate_list): Ditto.
-
-	* cal-util/cal-component.c: Put all the functions used to free
-	returned values all together.
-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be
-	incremented since the RFC requires it.
-	(scan_property): Handle the EXDATE property.
-	(scan_exdate): Likewise.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exdate_list): Likewise.
-	(cal_component_set_exdate_list): Likewise.
-	(cal_component_free_exdate_list): Likewise.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Fixed a typo
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section
-
-2000-07-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_period_list): New function.
-	(scan_property): Handle the RDATE property.
-	(scan_period): Likewise.
-	(free_icalcomponent): Likewise.
-	(get_period_list): Likewise.
-	(set_period_list): Likewise.
-	(cal_component_get_rdate_list): Likewise.
-	(cal_component_set_rdate_list): Likewise.
-	(scan_text): Simplify a bit since we only handle the ALTREP
-	parameter; there is no need to iterate over all parameters.
-	(scan_datetime): Simplify; just handle the TZID parameter.
-	(scan_summary): Simplify; just handle the ALTREP parameter.
-	(cal_component_get_as_string): New function.
-
-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;
-	now we only expose the types of objects we know about.
-
-	* cal-util/cal-util.h (CalObjType): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.
-	(cal_client_get_uids): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.
-	(check_for_slow_setting): Likewise.
-
-	* pcs/cal-backend-imc.c (count_objects): Likewise.
-	(build_uids_list): Likewise.
-
-	* pcs/cal.c (Cal_get_uids): Likewise.
-	(Cal_get_n_objects): Likewise.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view
-	for Todo/Event items.
-
-	* gui/task-assigned-to.xpm:
-	* gui/task-recurring.xpm:
-	* gui/task-assigned.xpm:
-	* gui/task.xpm: new pixmaps (all the same at present) to go in the
-	icon column of the ETable.
-
-	* gui/event-editor.c: hid the silly 'Calendar' labels on the
-	GnomeDateEdits and hid the times when you select 'All day event'.
-	Also adjusted the time_t's so that when an all day event finishes on
-	say midnight 13th May, we show 12th May in the dialog, since it
-	implicitly includes all of that day up to midnight.
-
-	* gui/dialogs/task-editor-dialog.glade:
-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.
-
-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog
-	with our new ETable.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.h: added a few more fields.
-
-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a
-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.
-	For some reason an empty 'URL:' property appears and causes trouble.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Update for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):
-	Finish filling the trigger.  What a pain, again.
-	(cal_component_alarm_free_trigger): Implemented.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-
-	* conduits/calendar/calendar-conduit-control-applet.desktop:
-
-	* conduits/todo/todo-conduit-control-applet.desktop:
-		Added the Turkish desktop entries.
-
-2000-07-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free): Free the
-	icalcomponent if this is an unattached alarm.
-	(scan_alarm_property): Handle the TRIGGER property.
-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.
-	(cal_component_alarm_set_trigger): Ditto.  Less pain.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline
-	docs.
-	(cal_client_new): Ditto.
-	(cal_client_get_n_objects): Added inline docs.
-
-2000-07-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (CalComponentAlarm): New internal
-	represntation for alarm components.  We really don't map them to a
-	CalComponent because it is more convenient to handle them as
-	"child" structures.
-	(make_alarm): New function to create a CalComponentAlarm from an
-	icalcomponent representing a VALARM.
-	(scan_alarm_property): New function to scan a property from an
-	alarm component.  We support ACTION.
-	(cal_component_get_first_alarm): New function to start an iterator
-	over the alarms in a calendar component.
-	(cal_component_alarm_get_action): New function.
-	(cal_component_alarm_set_action): New function.
-
-2000-07-13  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.
-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"
-	events.
-
-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control
-	based on value from ical object during edit.
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c: Revert Michael's GnomeFont patch until the
-	gnome-print API stabilizes.
-
-2000-07-12  Michael Meeks  <michael@helixcode.com>
-
-	* gui/print.c (titled_box, print_text, print_month_small),
-	(bound_text): GnomeFont update.
-
-2000-07-12  Seth Alves  <alves@hungry.com>
-
-	* conduits/calendar/calendar-conduit.c: fixed various problems
-
-	* cal-client/Makefile.am: build a static version of the library
-	to link with the conduits
-
-	* cal-util/Makefile.am: same
-
-2000-07-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_completed): Ditto.
-	(cal_component_set_completed): Ditto.
-	(scan_property): Handle the TRANSPARENCY property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_transparency): Ditto.
-	(cal_component_set_transparency): Ditto.
-	(scan_property): Handle the URL property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_url): Ditto.
-	(cal_component_set_url): Ditto.
-
-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded
-	check for the URI.
-	(load_fn): Be more paranoid about the URI and notify the listener
-	if we got passed a bad URI.  Simplify the termination code a bit.
-	(create_fn): Likewise.
-	(queue_load_create_job): Be more paranoid about the URI.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove pilot stuff for now.
-
-	* Makefile.am (SUBDIRS): Remove `conduits'.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
-
-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want
-	calendar.conduit.in, not calendar.conduit.
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (SUBDIRS):
-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
-	the gui directory to here.
-
-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Remove
-	"close calendar" command.
-
-2000-07-08  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.
-
-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle
-	mouse wheel scrolling.
-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.
-
-2000-07-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_sequence): Ditto.
-	(cal_component_set_sequence): Ditto.
-	(cal_component_free_sequence): Ditto.
-	(cal_component_set_last_modified): Removed incorrect assertion.
-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence
-	number must be incremented when certain properties change, so we
-	store a flag that says if we need to bump it when piping the
-	object over the wire.
-	(free_icalcomponent): Reset need_sequence_inc.
-	(cal_component_set_dtstart): Set need_sequence_inc.
-	(cal_component_set_dtend): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	LAST-MODIFIED property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_last_modified): Ditto.
-	(cal_component_set_last_modified): Ditto.
-	(get_icaltimetype): New function to get struct icaltimetype
-	values.
-	(cal_component_get_created): Use get_icaltimetype().
-	(set_icaltimetype): New function to set struct icaltimetype
-	values.
-	(cal_component_set_created): Use set_icaltimetype().
-
-	* cal-util/cal-component.c (scan_property): Handle the CREATED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_free_icaltimetype): Ditto.
-	(cal_component_get_created): Ditto.
-	(cal_component_set_created): Ditto.
-	(cal_component_init): Do not create an UID here.
-	(ensure_mandatory_properties): New function to ensure that the
-	mandatory RFC properties are indeed in the component.  If they are
-	not, we create them on the fly.
-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().
-	(cal_component_set_icalcomponent): Ditto.
-	(cal_component_get_uid): Return the UID in a parameter, not as a
-	function return value, for consistency's sake.
-	(scan_property): Handle the DTSTAMP property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_dtstamp): Ditto.
-	(cal_component_set_dtstamp): Ditto.
-
-2000-07-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-todo.c (gncal_todo_update): Use &obj instead of &ico in
-	the call to cal_client_get_object(). The ToDo list should work now.
-
-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible
-	so it doesn't appear and then resize.
-
-2000-07-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): Use
-	CalComponentText instead of CalComponentPropSummary.  Removed the
-	latter typedef.
-	(cal_component_set_summary): Likewise.
-	(scan_property): Handle the CLASSIFICATION property.
-	(cal_component_get_classification): Ditto.
-	(cal_component_set_classification): Ditto.
-
-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed
-	from cal_component_free_description_list().  We can share this
-	function since both comments and descriptions have the same form.
-	(scan_text): Ditto.
-	(get_text_list): New function.
-	(set_text_list): New function.
-	(cal_component_get_description_list): Use get_text_list().
-	(cal_component_set_description_list): Use set_text_list().
-	(cal_component_set_uid): Add sanity check.
-	(cal_component_get_summary): Ditto.
-	(cal_component_get_description_list): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_get_due): Ditto.
-	(scan_property): Handle the COMMENT property.
-	(cal_component_get_comment_list): Ditto.
-	(cal_component_set_comment_list): Ditto.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.
-	This can appear multiple times, so we maintain a list.  We
-	compress them later to a single property with multiple values.
-	(cal_component_get_categories_list): Ditto.
-	(cal_component_set_categories_list): Ditto.
-	(cal_component_free_categories_list): Ditto.
-	(free_icalcomponent): Properly free the mappings.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_datetime): Handle date/time and
-	timezone pairs.
-	(scan_property): Handle DTSTART and DTEND.
-	(cal_component_free_datetime): Ditto.
-	(get_datetime): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(set_datetime): Ditto.
-	(cal_component_set_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_set_dtend): Ditto.
-	(scan_property): Handle DUE date.
-	(cal_component_get_due): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_description_list):
-	Handle the DESCRIPTION property.  There can be multiple
-	descriptions with parameters each, so we deal with a list instead
-	of a single structure.
-	(cal_component_set_description_list): Ditto.
-	(cal_component_free_description_list): Ditto.
-	(scan_property): Ditto.
-	(scan_description): Ditto.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): To avoid
-	passing a million parameters to setters/getters for properties
-	that support parameters, we now pass client-side structures
-	instead.  Here we use CalComponentPropSummary.
-	(cal_component_set_summary): Ditto.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component-factory.c: Make calendar die when evolution quits.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c: Change of plans.  We use an
-	icalcomponent from libical as our core representation so that we
-	can preserve extension fields and fields that we don't (yet)
-	support.  CalComponent is just a wrapper with a nice API that
-	provides non-iterative, random access to the ical's fields.
-	(cal_component_destroy): Free the thing correctly.
-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.
-	(cal_component_set_icalcomponent): New function to set the
-	CalComponent's data from an existing icalcomponent.
-	(cal_component_get_icalcomponent): New function.
-	(cal_component_set_new_vtype): New convenience function to create
-	an empty component.
-	(scan_icalcomponent): Core scanning function.
-	(scan_property): Another core scanning function.
-	(cal_component_get_uid): Use the property directly.
-	(cal_component_get_summary): Ditto.  Handle the altrep parameter
-	as well.
-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.
-	It is ridiculous how much code this involves.
-	(scan_summary): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Do not link and include the pilot stuff for the
-	calendar component, just for the Pilot conduit.  Commented out the
-	Pilot part so that Evolution can build.  Sigh, we'll have to
-	modify gnome-pilot to use OAF.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync
-	program conditional on HAVE_GNOME_PILOT, and add
-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the
-	appropriate places.
-
-2000-06-29  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal.c (Cal_get_uid_by_pilot_id):
-	(Cal_update_pilot_id):
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):
-	(cal_backend_imc_get_uid_by_pilot_id):
-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):
-	(cal_backend_update_pilot_id):  server code to service these:
-
-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.
-	also uses dirty bits on both sides to aid in syncing.
-
-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new
-	function -- ask the cal server to return uid given an object's
-	pilot id.
-	(cal_client_update_pilot_id): new function -- inform the
-	cal server of an objects pilot id and pilot dirty-flag.
-
-2000-06-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.[ch]: New files for the new iCalendar
-	component object.  Today's properties: basic component type, UID,
-	SUMMARY.
-
-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of
-	sources.
-
-2000-06-27  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler
-	assignment.
-
-2000-06-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value):
-	Implement.
-	(calendar_model_initialize_value): Implement.
-	(calendar_model_value_is_empty): Implement.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
-	using it!
-	(e_day_view_init): used new colors from tigert.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"
-	and "y" arguments.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
-	selection range. It just moves it on one day/week etc. This makes
-	it very handy for the keyboard shortcut code.
-
-	* gui/calendar-commands.c (calendar_control_activate): fixed bug
-	setting the radio button active.
-
-	* gui/e-day-view.[hc]: added support for keyboard navigation and
-	selection of the time range.
-
-2000-06-20  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.
-	(calendar_model_is_cell_editable): Implemented.
-
-	* cal-client/cal-client.c (cal_client_update_object): Take in an
-	iCalObject instead of a stringified version.
-
-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.
-	(gnome_calendar_remove_object): Removed.
-	(save_ical_object_cb): Use the CalClient function.
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-	(e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-	(e_week_view_key_press): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-	(e_week_view_on_delete_appointment): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-2000-06-19  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
-	space etc.
-
-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
-
-2000-06-18  Ettore Perazzoli <ettore@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Include from
-	`$(top_builddir)/libical/src/libical' too.  [For the generated
-	libical `icalversion.h' header.]
-	* cal-client/Makefile.am (INCLUDES): Likewise.
-
-2000-06-18  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fixed a DnD bug.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on
-	installed ical.h
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c: added little buttons which are shown when there
-	are more events than will fit in a day. Clicking on the button takes
-	the user to the 1-Day view and shows the full day.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText
-	items so we get tooltips automatically. Though we may want to use our
-	own code to show tooltips so we can show the tips when the mouse is
-	around the edges of the event box, and we may want to show the start
-	and end times of the event in full.
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the
-	radio buttons in the code easily. We need this if we want to jump to
-	another view programmatically.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.
-
-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out
-	references to functions which don't exist yet, so evolution still
-	compiles.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/test-recur.c: updated.
-
-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the
-	iCalObject struct being updated to support more of iCalendar.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* pcs/.cvsignore: added icalendar-test.
-
-2000-06-15  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate
-	noinst_PROGRAMS declarations into one so automake accepts it.
-	(INCLUDES): include libical src dir so we don't depend on having
-	ical.h already installed
-
-2000-06-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the
-	middle of the array (!), so use plain GArray everywhere.  Sigh.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar
-	again.
-
-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make
-	it use vCalendar again.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in
-	asynchronous fashion.  Finished implementing.
-	(obj_removed_cb): Implemented.  This one needs no juggling.
-	(calendar_model_set_cal_client): Only load the objects if we have
-	a client.
-	(calendar_model_destroy): Disconnect from the client's signals.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	calendar-model.[ch] to the list of sources.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,
-	return the computed value.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of
-	objects and the hash table of UID->array index.
-	(calendar_model_row_count): Return the length directly from the
-	array instead of asking the Wombat.
-	(calendar_model_value_at): Implemented.
-	(calendar_model_new): Create an empty model.  We provide a new
-	setter function now.
-	(calendar_model_construct): Removed function.
-	(calendar_model_set_cal_client): New function to set the calendar
-	client and object type at any time.  This lets us reuse a calendar
-	model object.
-
-	* cal-util/calobj.h (iCalObjectField): Just report whether the
-	object has alarms; not every single alarm.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_calendar_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL for the new args
-	@create_folder_fn and @remove_folder_fn.
-	(create_view): Updated to match the new
-	`EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not
-	"calendar".
-
-2000-06-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()
-	method.
-
-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):
-	Implemented.
-
-	* pcs/cal.c (Cal_get_n_objects): Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.
-	(cal_client_get_n_objects): Implemented.
-
-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify
-	the fields in an iCalObject.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL
-	summaries.
-
-2000-06-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still
-	need icons, though.
-
-2000-06-07  Seth Alves  <alves@hungry.com>
-
-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,
-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object
-
-	* cal-client/cal-client.c (cal_client_get_object): instead of
-	returning a text representation, decode the text and return an
-	iCalObject.  Also added CalClientGetStatus which indicates
-	success or type of failure.
-
-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out
-	ical_object_find_in_string since it is unused now.
-
-	* cal-client/client-test.c (list_uids): track get_object change
-	* gui/calendar-commands.c (calendar_iterate): same
-	* gui/e-day-view.c (e_day_view_update_event): same
-	* gui/e-week-view.c (e_week_view_update_event): same
-	* gui/print.c (print_day_details): same
-	(print_day_summary): same
-	(print_todo_details): same
-	* gui/gnome-cal.c (trigger_alarm_cb): same
-	* gui/gncal-todo.c (gncal_todo_update): same
-
-2000-06-06  Seth Alves  <alves@hungry.com>
-
-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems
-	* cal-util/calobj.c (ical_object_find_in_string): use libical
-	instead of libversit
-	(ical_object_to_string): same
-	(dump_icalobject): prints the contents of an icalobject for debugging
-
-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la
-	so we don't have to modify the build system of the released libical
-	* cal-client/Makefile.am (client_test_LDADD): same
-	* cal-util/Makefile.am (icalendar_test_LDADD): same
-
-2000-06-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_destroy): Removed from the public
-	header; made static.  Now everyone should use refcounting.
-
-	* pcs/cal-backend-imc.c (free_ical_object): Use
-	ical_object_unref().
-	(remove_object): Likewise.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (print): New function to call the print
-	engine.
-	(calendar_toolbar): Added the Print button.
-	(calendar_control_activate): Added the File/Print item.
-
-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow
-	start_time and end_time to be NULL.
-
-	* gui/e-week-view.c (e_week_view_get_selected_time_range):
-	Likewise.
-
-	* gui/print.c (range_selector_new): Show the range selector
-	widgets.  Use the correct radio group for all of them!
-	(print_calendar): Do the dialog box here.  We may want to split
-	this function later into smaller chunks.
-
-2000-06-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):
-	allow the right button to popup the menu, even when the event is
-	being edited.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView
-	when the right button is clicked, so that any event being edited is
-	saved before any action (e.g. opening the Event Editor dialog) is
-	started. Note that this won't work if we switch to asynchronous
-	notification.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.
-	(toolbar): Added an icon for the Save and Close command.
-	(save_ical_object): Recompute the title of the window here.  Maybe
-	it would be better to do it when we actually get the
-	"object_changed" signal from the CalClient.
-	(file_close_cb): Implemented.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
-	(gnome_calendar_add_object): Removed function, since it was
-	identical to gnome_calendar_update_object().  Modified the rest
-	of the code to use only the latter.
-	(gnome_calendar_remove_object): Be more paranoid about the UID.
-	(gnome_calendar_update_object): Ditto.  Also, renamed this
-	function from gnome_calendar_object_changed(), for consistency
-	with the lower-level CalClient interface.
-
-	* gui/event-editor.c (event_editor_class_init): New
-	"save_ical_object" signal to ask that our parent store the
-	calendar object to the backend.
-	(save_ical_object): New function to save the calendar object,
-	actually if just emits the signal.
-	(file_save_cb): Implemented.
-	(dialog_to_ical_object): We want priv->
-	alarm_program_run_program_entry (i.e. the entry inside the
-	GnomeFileEntry), not the file entry itself.
-	(dialog_to_ical_object): Only insert the recurrence ending date if
-	the event is recurrent!
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Fixed EXTRA_DIST.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Handler for the
-	"editor_closed" signal of the event editor; we just destroy it
-	then.
-
-	* gui/event-editor.c (app_delete_event_cb): Callback used when the
-	dialog is closed.  Release the iCalObject here instead of the
-	event editor's destroy handler, and emit the new "editor_closed"
-	signal.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
-	GnomeApp is now generated with Glade instead of being created in
-	the program code.  Otherwise we can't migrate the accelerators to
-	the new toplevel and they won't work.
-
-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
-	This lets us use the GnomeApp created by libglade and still have
-	signals and stuff.
-
-	* gui/event-editor.c (create_menu): Tell the UI handler that the
-	menubar is the GnomeApp's existing one, not to create a new one.
-	(create_toolbar): Tell the UI handler to use the GnomeApp's
-	existing toolbar.
-	(event_editor_focus): New function to raise/focus an event editor.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_focus().
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Put the
-	toolbar into a frame to make it look like standard GNOME toolbars.
-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
-	do evil things when its moved to the left or the right of the
-	window.
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
-	calendar objects to their respective event editors.
-
-	* gui/gnome-cal.c (gnome_calendar_init): Create the
-	object_editor_hash.
-	(gnome_calendar_destroy): Free the object_editor_hash.
-	(gnome_calendar_edit_object): New function to centralize the
-	launching of event editors; if one already exists for a particular
-	calendar object, we just raise its window.
-	(edit): Use gnome_calendar_edit_object().
-
-	* gui/calendar-commands.c (display_objedit): Use
-	gnome_calendar_edit_object().
-	(display_objedit_today): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_edit_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_edit_appointment): Likewise.
-
-	* gui/event-editor.c (event_editor_new): Do not take in an
-	iCalObject; rather provide an event_editor_set_ical_object()
-	function.  We need this because a single editor may be switched
-	between different calendar objects.  Also, do not show the event
-	editor; leave it up to the client code.
-	(event_editor_construct): Likewise.
-	(clear_widgets): New function to clear the widgets to default
-	values.
-	(fill_widgets): New function to fill in the widgets from the
-	iCalObject.  We don't do this in init_widgets() anymore.
-	(free_exception_clist_data): New function to free the exceptions
-	clist data.  We were leaking the row data.
-	(init_widgets): Hook to the destroy signal of the exceptions
-	clist.
-	(event_editor_set_ical_object): New function.  Now it also makes a
-	copy of the calendar object for the event editor; clients do not
-	need to copy it anymore.
-	(event_editor_destroy): Unref the UI handler as well.
-	(event_editor_class_init): New "ical_object_released" signal to
-	notify the parent that we are no longer editing the calendar
-	object.
-	(make_title_from_ico): Handle NULL objects.
-
-	* gui/event-editor.h (EventEditor): Removed fields that are no
-	longer used.
-
-2000-05-31  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am: added test-recur test program.
-
-	* cal-util/test-recur.c: new file to test the recurrence code.
-
-	* cal-util/.cvsignore: added test-recur.
-
-	* cal-util/cal-recur.c: updated.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_construct): Create the UI
-	handler after we have constructed the parent GnomeApp.
-	(main_menu): Menu template is now in place.
-	(toolbar): Tollbar template is now in place.
-	(create_toolbar): Turn off labels in the toolbar since it sucks;
-	it should support non-homogeneous buttons with horizontal icons
-	and text.
-
-2000-05-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the
-	flags argument, since now we just proxy the calendar object to the
-	calendar client.
-
-	* gui/event-editor.c (alarm_unit_get): Moved over from
-	event-editor-utils.c.
-
-	* gui/event-editor-utils.[ch]: Removed files, since the two
-	functions that were left there (i.e. the ones not present in
-	e-dialog-widgets) can simply be moved to event-editor.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	event-editor-utils.[ch] from the list of sources.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-utils.c: Moved many functions to
-	e-util/e-dialog-widgets.c.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Put the main notebook directly
-	under a simple GtkWindow.  We are going to pull out the notebook
-	and slap it into our custom-built GnomeApp, anwyays.
-
-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.
-	Added a BonoboUIHandler for its menu and toolbar.
-	(make_title_from_ico): Create a nice title for the window.
-	(get_widgets): Fetch the Glade widgets here instead of all over
-	the place.
-	(event_editor_new): Temporary hack to show the dialog here, just
-	so that I can test it.
-
-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (init_bonobo): Do not initialize libglade twice.
-
-	* gui/component-factory.c (create_view): Set the folder_uri
-	property, otherwise the calendar will not get loaded into the
-	view.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/main.c: Make it so that warnings don't crash calendar.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c: Removed.
-
-	* gui/main.c: New.
-
-	* gui/control-factory.c: New.
-	* gui/control-factory.h: New.
-
-	* gui/calendar-component-factory.c: New.
-	* gui/calendar-component-factory.c: New.
-
-	* gui/evolution-calendar-control.c (calendar_control_factory):
-	Renamed from `calendar_factory'.
-	(calendar_control_factory_init): Renamed from
-	`calendar_factory_init'.
-
-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.
-
-	* gui/evolution-calendar.gnorba: New.
-	* gui/evolution-calendar.oafinfo: New.
-
-2000-05-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (range_selector_new): New function to create the
-	custom range selector.
-	(print_dialog): New function to show the print dialog.
-	(print_calendar): Use the print dialog.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added libepaned.a.
-
-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.
-
-2000-05-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed
-	function.
-
-	* gui/mark.c (mark_month_item): Use
-	cal_client_get_events_in_range().
-
-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,
-	since we don't have a year view.
-
-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.
-	(gnome_calendar_get_current_view_name): Likewise.
-	(gnome_calendar_update_view_times): Likewise.
-	(gnome_calendar_direction): Likewise.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(gnome_calendar_time_format_changed): Likewise.
-	(gnome_calendar_get_current_time_range): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],
-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they
-	are no longer used.  Removed all the old Pilot crap.
-
-2000-05-20  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence
-	rules. These are only part finished, but people may like to check that
-	the architecture seems OK.
-
-2000-05-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of
-	the iCalObject so we detect the change in the "update_event" callback.
-	Maybe we should just update the view ourselves and then we wouldn't
-	need to detect any change in the callback.
-
-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to
-	get rid of any recurrence rules. Used when we 'unrecur' an event.
-
-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it
-	won't fit, or we end up adding a new event for each key press.
-	(e_day_view_update_event_label): don't update it if it doesn't have
-	an EText item (i.e. it isn't visible).
-
-	* gui/e-day-view-time-item.c: allow selection of times using this
-	column.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.
-	(time_add_day): Likewise.
-	(time_add_month): Likewise.
-	(time_add_year): Likewise.
-	(time_from_day): Of all functions, *this* one had to have a bug.
-	Set the tm.tm_isdst to -1 to specify that we don't know whether
-	the time is in DST or not.  This fixes *many* bugs upstream.
-	(time_week_begin): Likewise.  We never noticed this since the week
-	functions are never used.
-	(time_week_end): Likewise.
-
-2000-05-17  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c: hooked up more widget signals to callbacks
-	to the gladified dialog acts more like the original one.
-
-2000-05-16  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons
-	to the pages of the notebook.
-	(append_exception):
-	(recurrence_exception_added):
-	(recurrence_exception_deleted):
-	(recurrence_exception_changed): code to deal with the recurrence
-	exception list.
-
-2000-05-15  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c
-
-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c
-
-	* gui/event-editor-dialog.glade: glade file used by event-editor.c
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (display_notification): Use the alarm
-	notification dialog.
-	(display_notification_cb): New callback for the result of the
-	alarm notification dialog.
-
-	* gui/dialogs/alarm-notify.glade: New file with the alarm
-	notification dialog.
-
-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.
-
-	* gui/dialogs/Makefile.am: New file.
-
-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.
-
-2000-05-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and
-	plug leaks of str_ico and ico.
-
-	* gui/evolution-calendar-control.c (main): Initialize libglade.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-05-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to
-	compute the ending time of the occurrence.  This takes care of
-	recurring events that span multiple days.  Also, removed the DST
-	condition since it did not look right at all:  if you have a daily
-	appointment at 18:00, it still should happen at 18:00 even during
-	daylight savings.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil
-	functions instead of calculating the month's times by hand.  Use
-	cal_obj_instance_list_free() instead of freeing the list by hand.
-	Clip the range we pass to mark_gtk_calendar_day().
-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the
-	month by adding real day offsets.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (add_alarms_for_object): New function to add
-	today's alarms for a single object.
-	(gnome_calendar_object_updated_cb): Update the object's alarms.
-
-	* idl/evolution-calendar.idl (Cal): Added a
-	get_alarms_for_object() method.
-
-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New
-	function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):
-	Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New
-	function.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Now that we
-	depend on current gnome-libs we can make the toolbar detachable
-	again.
-
-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone
-	variable to make this compile on BSD systems (where timezone is
-	the name of a function)
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused
-	arguments.  Load the initial alarms here.
-	(load_alarms): New function to load a day's worth of alarms.
-	(gnome_calendar_class_init): Eeeek!  This was taking in an
-	incorrect argument type.
-	(gnome_calendar_init): Now the calendar keeps a hash table of
-	UIDs->queued alarms.  Create the hash table here.
-	(gnome_calendar_destroy): Destroy the alarms hash table.
-	(gnome_calendar_object_updated_cb): Remove the alarms for the
-	object and regenerate them.
-	(gnome_calendar_object_removed_cb): Remove the alarms for the
-	object.
-
-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just
-	the trigger time, the callback and the closure data.  Return an
-	opaque identifier for the alarm so that it can be removed by the
-	client code if needed.  Use the queue_alarm() helper function.
-	(queue_alarm): Helper function to actually queue the alarm and set
-	up the itimer.  Deal with a nonzero return value from
-	setitimer().
-	(alarm_remove): New function to remove an alarm based on its ID.
-	(pop_alarm): New helper function; pops the first alarm of the
-	queue and resets the timer as appropriate.
-	(alarm_ready): Simplified a lot by using pop_alarm().
-
-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().
-
-	* pcs/cal.c (build_instance_seq): New function to build a CORBA
-	sequence from the internal list of instances.
-	(Cal_get_events_in_range): Use build_instance_seq().
-	(Cal_get_alarms_in_range): Implemented new method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New
-	function with the get_alarms_in_range() engine.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):
-	Implemented the get_alarms_in_range() method.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New
-	client-side function for getting the alarms.
-	(build_instance_list): New helper function to build the
-	CalObjInstance list from the CORBA sequence.
-	(cal_client_get_events_in_range): Use build_instance_list().
-
-	* gui/calendar-commands.h: #include <cal-util/calobj.h>.  #include
-	"gnome-cal.h".
-
-	* gui/e-week-view.c: #include "calendar-commands.h" instead of
-	main.h; the latter is an obsolete file and will be killed.
-
-	* gui/evolution-calendar-control.c (main): Call init_bonobo()
-	before anything else.  We need the GTK+ object system initialized.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Move
-	"about" menuitem to the help menu.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST
-	sections.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-backend-imc.c: Set the format when creating a new
-	calendar.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-factory.c: Removed double free of method_string in
-	uri->method_string.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
-	of "evolution-calendar.h".
-
-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"
-	instead of "evolution-calendar.h".
-
-2000-05-08  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call
-	e_day_view_stop_editing_event here to avoid a divide by zero
-	a bit further on.  i'm not sure if this is the best fix for this.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just
-	an interface for calendar backends; this is an abstract class.
-	Put in the vtable for the backend methods.
-
-	* pcs/cal-backend.c (cal_backend_new): Removed function, since
-	CalBackend is not just an abstract class.
-	Removed implementation-specific functions and made public
-	functions call the virtual methods instead.
-
-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC
-	implementation; this implements a backend for iCalendar and
-	vCalendar files.  Moved the implementation-specific stuff from
-	cal-backend.[ch] to here.
-
-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to
-	here.  Added a CAL_UNKNOWN value for when the backend is not
-	loaded yet.
-	(cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN.
-	(save_to_vcal): Use the same VCProdIdProp value as in
-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the
-	vCalendar spec.
-	(ensure_uid): Return nothing, since the result value need not be
-	used anymore.
-	(add_object): Since we mark the calendar as dirty anyways, we do
-	not need to check the result value of ensure_uid() anymore.
-	(remove_object): Asssert that we know how to handle the object's
-	type.  We do this in add_object() anyways.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].
-
-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()
-	so that we can see the line number where they occur.
-
-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the
-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the
-	switch.
-
-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed
-	enumeration; it is stupid to translate all values for the
-	CalClient when it is going to translate them again.
-	(CalListenerClass::cal_loaded): This signal now passes the
-	LoadStatus directly from the CORBA side.
-
-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not
-	translate the status value.
-
-	* cal-client/cal-client.h (CalClientLoadStatus): Added the
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.
-
-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA
-	version of the LoadStatus result code.
-
-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the
-	hash table from method strings to the GtkTypes for backend class
-	types.
-	(cal_factory_init): Create the priv->methods hash table.
-	(cal_factory_destroy): Free the priv->methods hash table.
-	(cal_factory_register_method): New function to register a backend
-	class for a particular URI method.
-	(launch_backend_for_uri): New function to launch a backend for a
-	particular URI's method.
-	(load_backend): Use launch_backend_for_uri().  Move the error
-	notification code from load_fn() to here.
-	(create_backend): Use launch_backend_for_uri().  Move the error
-	notification code form create_fn() to here; it is #ifdefed out
-	since currently cal_backend_create() does not have any error
-	reporting capabilities.
-
-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a
-	PROTOCOL_NOT_SUPPORTED error code.
-
-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed
-	functions, since they were supposed to be internal only.
-	(CalFactory_load): Call queue_load_create_job() directly.
-	(CalFactory_create): Likewise.
-
-2000-05-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid
-	to NULL or we won't find any other occurrences of the event. Set the
-	editing_event_day/num to -1 instead.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the
-	positioning of the icons for long events.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to
-	terminate the string.
-
-2000-05-07  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,
-	just in case it hasn't moved, otherwise it won't appear.
-
-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to
-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH
-	since it must be >= the BAR_WIDTH.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):
-	Changed to "folder_uri" from "calendar_uri".
-	(set_prop): The uri given to us is a directory, so we append a
-	filename onto the end before we use it.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/timeutil.c (time_day_begin):
-	(time_day_end): changed these so they just do a simple localtime(),
-	update the struct tm, then do a mktime(). I don't know why it used to
-	look at the tm_isdst flags etc. From a little test program I wrote
-	which steps through testing every hour for a year it wasn't working
-	correctly, and the new code does.
-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.
-	My test program now works better.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	* gui/.cvsignore: ignore evolution-calendar.pure
-
-	* gui/Makefile.am: add support for building evolution-calendar.pure
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: finish editing event when user hits Return key.
-	(e_week_view_on_text_item_event): stop event signals after doing any
-	other calls, since otherwise it will also stop any other resulting
-	event signals.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the start/end times while editing.
-
-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we
-	now only want a single line of text.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): new function to
-	convert the summary field to a single line of text, by converting any
-	sequence of CR & LF characters to a single space.
-	(ical_object_create_from_vobject): call the above function. I think
-	all functions that load iCalObjects go through this.
-	(ical_new): called it here as well just in case.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/week-view.[hc]: removed.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-day-panel.[hc]:
-	* gui/gncal-day-view.[hc]:
-	* gui/gncal-full-day.[hc]:
-	* gui/gncal-week-view.[hc]:
-	* gui/layout.[hc]:
-	* gui/view-utils.[hc]: removed old calendar view files.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,
-	and ical_object_ref/unref() functions. I've updated all the gui/
-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe
-	just using ical_object_destroy() is OK there.
-
-	* gui/gncal-todo.c:
-	* gui/calendar-commands.c:
-	* gui/eventedit.c:
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use refcounting for iCalObjects.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c: try not to ever draw outside the event, even when
-	the event is very small.
-
-2000-05-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: don't allow recurring events to be resized or
-	dragged, and don't show the resize/drag cursors. Actually it may be
-	better to let the user do the resize/drag and then ask them what they
-	want to do - change the single occurrence or the entire series.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.
-
-	* gui/popup-menu.c: include e-gui-utils.h
-
-2000-05-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.
-
-	* gui/calendar-commands.c: when we switch views, grab the focus.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
-	cal_client_get_events_in_range(), and doesn't load any objects.
-	Also just return if it isn't visible.
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): call
-	g_list_sort() to sort the list rather than g_list_insert_sorted() for
-	each element. It is much more efficient.
-	Also changed it so that the co->ev_start/end fields are copied from
-	the CalObjInstance rather than the parameters to the function
-	(that is right, isn't it?)
-	Also freed the list elements, and finally the list.
-	(calendar_iterate): changed this to use cal_client_get_events_in_range
-	since that is more efficient than getting all the uids and then loading
-	and parsing all the events.
-
-	* pcs/cal-backend.c (save): output the '... saved' message before
-	freeing the string!
-
-	* gui/gncal-todo.c (gncal_todo_update):
-	* gui/e-week-view.c (e_week_view_update_event):
-	* gui/e-day-view.c (e_day_view_update_event):
-	* gui/calendar-commands.c (calendar_get_events_in_range):
-	(calendar_iterate): free obj_string after it is parsed.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): set the active
-	radio button here. Oops - it wasn't a Bonobo problem after all.
-
-	* gui/popup-menu.c (popup_menu): added call to
-	e_auto_kill_popup_menu_on_hide() to destroy the menu.
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu):
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
-	isn't useful any more, since the event editor keeps its own iCalObject.
-	So for now we make the menu commands available even when the event is
-	being edited in the event editor.
-	Also corrected misspellings of 'occurance' -> 'occurrence'.
-
-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
-	The event editor now uses its own independent iCalObject.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
-	uid for the new single instance. I'm not sure what we should do about
-	the creation/last modification times of the objects.
-
-	* gui/e-week-view.c (e_week_view_on_edit_appointment):
-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
-	iCalObject before passing it to the event editor, since it will change
-	the fields. If we don't duplicate it we won't know what has changed
-	when we get the "update_event" callback.
-
-	* gui/e-week-view.c (e_week_view_key_press):
-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
-	times of the new iCalObject. We may want to set the default alarm as
-	well.
-
-	* cal-util/calobj.c (ical_gen_uid): made this function public so we
-	can generate new uids if necessary.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new
-	function to get the currently seleted time range form the current view.
-
-	* gui/calendar-commands.c (display_objedit): use the above function
-	to get the time for the new appointment.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use a shallow copy of the ico when we update the
-	times (when resizing/dragging). Otherwise we won't detect that the
-	time has changed in the "update_event" callback.
-
-	Also added functions to get the currently selected time range.
-
-2000-04-30  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set
-	attendee and contact address correctly.
-
-	* pcs/cal-backend.c (icalendar_calendar_load): init priv->object_hash
-	when loading.
-	(cal_get_type_from_filename): if file extension is .ical, consider
-	the file an ical file.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_compare_dates): new function to see
-	if the event dates have changed (including any recurrence rules).
-	It is used for optimization when we get the "object_changed" signal.
-	We have to do far less work if the dates are unchanged.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: only draw the selection when we have the keyboard
-	focus, since the user expects to be able to type in a new event when
-	the selection is shown. Also keep the selection when we lose focus,
-	but just don't show it.
-
-	Also quite a few changes to cope with the new client/server
-	architecture.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	only draw the selection if the widget has the keyboard focus.
-
-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with
-	events longer than one day. And changed the code for updating events
-	in the new views.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c
-	(init_bonobo): OAFized.
-
-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.
-
-	* gui/evolution-calendar-control.c: New #define
-	`CONTROL_FACTORY_ID', varying according to whether we are
-	`USING_OAF'.
-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* gui/Makefile.am: Updated for OAF.
-
-	* pcs/cal-factory.h: Explicitly #include
-	"calendar/pcs/evolution-calendar.h" instead of just
-	"evolution-calendar.h".
-
-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use
-	OAF.
-
-	* cal-client/client-test.c (init_corba): New function, implemented
-	differently depending on `USING_OAF'.
-
-2000-04-27    <alves@hungry.com>
-
-	* pcs/cal-backend.c (cal_backend_load): fix memory leak
-	(save_to_vcal): same
-	(save): same
-	(cal_backend_load): same
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la
-
-	* pcs/.cvsignore: Added *.la and *.lo.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from
-	backend_destroy_cb.  Now we use it for the "last_client_gone"
-	signal from the backend.  Also, unref the backend to destroy it.
-	(add_backend): Connect to the "last_client_gone" signal of the
-	backend.
-	(cal_factory_get_n_backends): New function to query the number of
-	running backends.
-
-	* pcs/cal-backend.c (cal_backend_class_init): Register the new
-	"last_client_gone" signal.  It is emitted when the last Cal client
-	goes away.  It is used to notify the factory when a backend may be
-	safely destroyed.
-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last
-	client disconnects from the backend.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
-	iCalObjects by their UIDs instead of by their pointers.
-
-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* cal-client/Makefile.am: Add `$(datadir)/idl'.
-
-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
-	destroy -- used to unref the CalClient so wombat knows we are gone.
-	(gnome_calendar_class_init): added a class init for this widget.
-
-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico
-
-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico
-
-2000-04-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (main): The path to the test calendar
-	changed when we moved stuff around.  Users will have to tweak this
-	for their CVS setup, anyways.
-	(create_client): Create or load the calendar as appropriate.
-	(client_destroy_cb): Exit the main loop if both clients are gone.
-	(main): Connect to the "destroy" signal of the clients so that we
-	can terminate the test program.
-
-2000-04-24  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar.c (parse_person): allow for null CN
-	(parse_person): allow for null sent_by
-
-	* pcs/Makefile.am: build icalendar-test
-
-	* pcs/icalendar-test.c: a test which loads an ical file and
-	converts it to our internal format, and then saves it back out.
-
-2000-04-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files and pixmaps, and removed
-	old source files, which can be deleted.
-
-	* gui/e-week-view-titles-item.[hc]:
-	* gui/e-week-view-main-item.[hc]:
-	* gui/e-week-view-event-item.[hc]:
-	* gui/e-week-view.[hc]: new files implementing the week/month views.
-
-	* gui/yearview.xpm:
-	* gui/monthview.xpm:
-	* gui/weekview.xpm:
-	* gui/workweekview.xpm:
-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
-	intended to be the final pixmaps.
-
-	* gui/calendar-commands.c: added radio buttons to the toolbar to
-	switch between the calendar views, and moved the am_pm_flag here so we
-	can get rid of view-utils.c.
-
-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
-	widgets into 2 notebooks, and added the	selection_start_time and
-	selection_end_time fields.
-
-	* gui/goto.c: updated to use new selection time range.
-
-	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.
-
-	* gui/e-day-view.[hc]: changed the interface to support the new
-	selection time range, got rid of a few debugging messages and changed
-	a few bits.
-
-2000-04-21  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c: start on code to do the opposite of
-	icalendar.c (convert from iCalObjects to libical's icalcomponents).
-
-	* gui/calendar-commands.c (calendar_control_activate): moved
-	"About Calendar" into the View menu so it shows up.
-
-2000-04-20  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback
-	for listener's object updated signal.
-	(gnome_calendar_object_removed_cb): new function: callback for
-	listener's object removed signal.
-	(gnome_calendar_new): hook up listener's "obj_updated" and
-	"obj_removed" signals so if evolution is running twice,
-	they will both see changes right away.
-	(gnome_calendar_object_changed): don't call update_all, since
-	it will be called by the listener.
-	(gnome_calendar_remove_object): don't call update_all
-	(gnome_calendar_add_object): don't call update_all
-
-	* gui/gncal-full-day.c (child_realize): create fullday's gcs
-	even if pixmap_bell has already been created.  this was
-	causing crashes if the calendar was run twice.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* gui/eventedit.c (ee_rp_init_rule): changed the order around
-	a bit to avoid a Gtk-CRITICAL crash
-
-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate
-	the todo clist
-
-	* cal-client/cal-client.c (cal_client_get_uids): don't check
-	type against CALOBJ_TYPE_ANY since it will always match.
-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (remove_object): don't call save from here
-	because in all cases the caller of remove_object calls save
-
-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open
-	instead of checking on disk and calling load or create.
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use
-	cal_client_update_object -- editing and dragging events works again
-	(gnome_calendar_open): collapsed gnome_calendar_load and
-	gnome_calendar_create into this function.  added new type
-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or
-	CALENDAR_OPEN_OR_CREATE.
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): create
-	a property bag for this control
-	(set_prop): callback for property sets
-	(get_prop): callback for proprety gets
-
-	* gui/calendar-commands.c (calendar_set_uri): new function,
-	called when the "calendar_uri" property is set on the calendar-
-	control's property bag.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Fix include path.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.h (CalFactoryClass): We have a new
-	"last_calendar_gone" signal that Wombat can use to terminate
-	itself properly.
-
-	* pcs/cal-factory.c (cal_factory_class_init): Register the
-	"last_calendar_gone" signal.
-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead
-	of killing the factory.
-
-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.
-	(INCLUDES): Make the log domain be "wombat-pcs".
-
-2000-04-17  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (add_object): removed implicit save, since
-	we don't want to save as we load from disk.
-	(cal_backend_update_object): added a call to save, since it
-	isn't done by add_object now.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am: Renamed library from libcalutil to
-	libcal-util, to be consistent with libcal-client.  Install header
-	files in $(includedir)/evolution/cal-util.
-	(INCLUDES): Add "cal-util" log domain for glib.
-	(libcal_clientincludedir): The header files are now installed in
-	$(includedir)/evolution/cal-client.
-
-	* cal-util/cal-util.h: Fix includes.
-
-	* cal-client/client-test.c: Fix includes.
-
-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
-	it is for internal use by Wombat only.  The header files should
-	not be installed, either.  Removed all the old Tlacuache stuff.
-
-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
-	gncal.desktop.
-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
-	domain.
-
-	* gui/*.[ch]: Fix cal-util and cal-client includes.
-
-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.
-
-	* pcs/*.[ch]: Fix cal-util includes.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch
-	between linux's timezone variable and *bsd's method of getting the
-	gmt offset.
-
-2000-04-10  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (save_to_vcal): create and save an actual
-	vcalendar instead of a list of vcal objects.
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
-	we search headers in the evolution tree before installed headers.
-	(Otherwise when you do 'make install' lots of files in gui/ get
-	rebuilt, since they depend on the installed cal-client.h which has just
-	been updated.)
-
-2000-04-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
-	on the cal client.
-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved
-	gnome_calendar_update_all from gnome_calendar_load to here.
-
-	* gui/calendar-commands.c: minor cleanups
-
-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim
-	to write vcal to a file
-	(save): filled it with more gnome-pim code
-	(add_object): call save () after changing
-	(remove_object): same
-	(cal_backend_create): same
-	(cal_backend_remove_object): same
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Removed linking with libetable and libeminicard
-	since they weren't being used.
-
-2000-04-08  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_create): new function:
-	friendly wrapper for cal_client_create_calendar
-
-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create
-	if no filename is provided
-
-	* gui/prop.c (properties): calendar is a frame
-
-	* gui/calendar-commands.c (calendar_control_activate): sort out the
-	menus a bit, more of them show up now.
-
-	* gui/Makefile.am: don't build library or test, just the bonobo control
-
-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead
-	of a window, now.
-
-	* gui/gnome-cal.c (gnome_calendar_new): same
-
-	* gui/goto.c (goto_dialog): same
-
-2000-04-06  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): removed
-	uih from the argument list, added cal.  use cal as user_data
-	in callbacks rather than the control.
-	(calendar_control_deactivate): removed uih from argument list
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (setup_menu): removed
-	(setup_appbar): removed
-	(calendar_control_activate): new function -- does the work
-	that setup_appbar and setup_menu used to do.
-	(calendar_control_deactivate): undoes what calendar_control_activate
-	does by removing the toolbar items and menu items.
-
-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
-	common stuff is in a library
-
-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
-	based on a gtk_frame rather than a gnome_app
-
-	* gui/calendar-commands.c: split out some of main.c
-
-	* gui/evolution-calendar-control.c: bonobo bung so evolution
-	can use the calendar widget
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* pcs/.cvsignore: Added *.lo.
-
-2000-03-30  Seth Alves  <alves@hungry.com>
-
-        * gui/main.c (calendar_get_events_in_range):
-        cal_client_get_events_in_range returns a list of CalObjInstance *, not
-        a list of (char *) uid.
-
-	* Makefile.am (SUBDIRS): readded the gui directory
-
-	* gui/main.c: temporarily added alarm_defaults back in,
-	since the calendar doesn't link without it
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: remove the gui directory, which doesn't compile.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* pcs/Makefile.am: create a libpcs.la library, for use in the
-	wombat.
-
-2000-03-28  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
-
-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to
-	ical_object_find_in_string
-	(calendar_get_events_in_range): same
-	(session_save_state): commented out references
-	to gcal->client->filename
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object): Use
-	ical_object_to_string().
-
-	* cal-util/calobj.c (ical_object_to_string): Moved over from
-	pcs/cal-backend.c (was string_from_ical_object).
-	(get_calendar_base_vobject): Likewise, moved over from
-	pcs/cal-backend.c.
-
-	* cal-util/cal-util.c: Removed string_to_ical_object(); the
-	correct function is in calobj.[ch], called
-	ical_object_find_in_string().  Removed ical_object_to_string,
-	since we now implement it in calobj.c.
-
-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see
-	above.
-
-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object
-	instances now contain only the UID for the object, not the whole
-	string representation of the object.  This allows clients to
-	implement caching of objects if they wish.
-
-	* pcs/cal.c (Cal_get_events_in_range): Likewise.
-
-	* pcs/cal-backend.c (build_event_list): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range):
-	Likewise.
-
-	* cal-util/cal-util.h (CalObjInstance): Likewise.
-
-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.
-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not
-	NULL.
-
-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also
-	supports the Unknown interface.
-
-2000-03-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c: Fix includes.
-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().
-	(e_day_view_on_delete_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-2000-03-13  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.
-
-2000-03-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (gnome_calendar_locate): Removed function now that it
-	is no CORBA server in the GUI.
-	(save_default_calendar): Removed function.  Now the personal
-	calendar server will take care of saving modified calendars when
-	appropriate.
-	(close_cmd): Do not call unregister_calendar_services().
-
-	* gui/eventedit.c (ee_ok): Do not save the calendar.
-
-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-	* gui/gncal-full-day.c (delete_occurance): Likewise.
-	(delete_appointment): Likewise.
-	(unrecur_appointment): Likewise.
-	(child_focus_out): Likewise.
-	(update_from_drag_info): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to
-	create the CORBA server.
-
-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to
-	`client'.
-
-	* cal-client/cal-client.h (CalClient): Removed filename and
-	corba_server fields.
-
-2000-03-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (main): Do not pass the INIT_SERVER flag to
-	gnome_CORBA_init_with_popt_table().  Check for exceptions
-	properly.
-	(main): Initialize Bonobo.
-	(main): Call process_dates() to parse the dates from the command
-	line before we dump the events or the TODOs.
-	(main): Use bonobo_main() instead of gtk_main().
-
-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.
-	Do not call default_alarm() anymore, since that is a GUI issue.
-	(default_alarm): Removed function.
-	(alarm_defaults): Removed defaults data.
-
-	* pcs/tlacuache.c (calendar_notify): Removed stubs for
-	alarm_defaults, calendar_notify(), debug_alarms.
-
-2000-03-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the
-	Pilot conduit stuff for now.
-
-	* gui/calendar.c: Random #ifdefs to make it build, although this
-	file is going away.
-
-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
-
-	* gui/calendar-conduit.c: Fixup includes.
-
-	* gui/calendar-conduit.h: Fixup includes.
-
-2000-03-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
-	in the GnomeCalendar struct.
-
-	* gui/*.c: tracked change from Calendar * to CalClient
-
-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
-	(calendar_get_events_in_range): pulled this out of calendar.c and
-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.
-
-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also
-
-2000-03-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the
-	list of sources.  This was a miscommunication on our part.
-
-2000-03-05  Seth Alves  <alves@hungry.com>
-
-	* cal-client/cal-client-alarm.c: stubs for client side
-	access to alarm structures.  this will probably change,
-	since i don't know what i'm doing.
-
-	* cal-util/alarm-enums.h: enums for alarms needed by
-	both the client and the server
-
-	* remaining source files in calendar/... have been moved
-	to calendar/gui.
-
-	* gui/alarm.c: start to decouple the view from the model
-	in the alarm editing code
-
-2000-03-03  Seth Alves  <alves@hungry.com>
-
-	* cal-util/Makefile.am: new file -- things shared between
-	the client and server go in this directory
-
-	*  calobj.c calobj.h icalendar.c icalendar.h
-	timeutil.c timeutil.h cal-util.c cal-util.h where moved
-	backend stuff went into pcs.  shared stuff went into
-	cal-util.
-
-2000-03-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	At this point the calendar client and personal calendar server
-	files were moved to the idl/, cal-client/, and pcs/ directories.
-
-	* idl/Makefile.am: New file.
-
-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff
-	from calendar/Makefile.am to here.
-
-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from
-	calendar/Makefile.am to here.
-
-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
-
-	* calendar.h: Removed the references to cal-backend.h and its
-	stuff.  This file is going away soon!
-
-	* icalendar.c: #include <config.h>.  Also, we don't need to
-	include cal-backend.h or gnome.h.
-
-	* icalendar.h: Protect from multiple inclusions.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Use the gnome-config flags for orbit-idl.
-	Create a libcal-client library with the calendar client object.
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Removed stale rule for the conduit.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added *.lo.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added tlacuache and tl-test.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of
-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.
-
-2000-02-17  Seth Alves  <alves@hungry.com>
-
-	* cal-backend.h: moved CalendarFormat type def here
-
-	* cal-backend.c (cal_backend_load): if extension suggests
-	an ical file, attempt to load an iCal file.
-	(cal_get_type_from_filename): returns CAL_ICAL if file
-	extension is 'ics' or 'ifb', else returns CAL_VCAL
-	(icalendar_calendar_load): moved this here from
-	icalendar.c because it needs to call the static function
-	add_object.
-
-2000-02-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_remove_object): Implemented.
-
-	* cal.c (cal_notify_remove): Implemented.
-	(Cal_remove_object): Implemented.
-	(cal_get_epv): Fill in the remove_object field in the epv.
-
-	* cal-backend.c (cal_backend_remove_object): Implemented.
-	(notify_remove): New function to notify clients that an object was
-	removed.
-
-2000-02-16  Russell Steinthal  <rms39@columbia.edu>
-
-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer
-	from char* to iCalPerson*
-
-	* calobj.[ch]: Change iCalObject.related from list of char* to
-	list of iCalRelation*; assorted related fixes
-
-	* icalendar.c: interface between libical and the gnomecal
-	internal representation
-
-2000-02-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_update_object): Implemented.
-
-	* cal.c (cal_notify_update): New function to notify the listener
-	about an updated object.
-	(Cal_update_object): Implemented.
-	(Cal_get_uids): set_release() the sequence to TRUE.
-	(Cal_get_events_in_range): Likewise.
-
-	* cal-backend.c (remove_object): New function to remove objects
-	from a calendar backend.
-	(cal_backend_update_object): New public function to update an
-	object and notify clients about it.
-
-	* evolution-calendar.idl (Cal): Added update_object() and
-	delete_object() methods.
-	(Listener): Removed the obj_changed method and renamed obj_added
-	to obj_updated.  We now only have updated and removed notifiers.
-
-	* cal-listener.[ch]: Removed the "changed" notification code.
-	Changed the "added" notification code to the "updated"
-	notification.
-
-	* cal-client.c: Likewise.
-
-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the
-	factory and exit the main loop when the factory is destroyed.
-
-	* cal-factory.c (backend_destroy_cb): New callback used when a
-	backend is destroyed.  Removes the backend from the factory's hash
-	table and unrefs the factory if all backends go away.
-	(add_calendar_client): Free the environment.
-
-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to
-	initialize.
-
-	* cal-listener.c (cal_listener_new): Likewise.
-
-	* layout.c (layout_events): Plug li.partition memory leak.
-
-2000-02-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's
-	destroy signal.
-	(cal_backend_remove_cal): Killed function now that removal of Cal
-	objects is done in their destroy callback.
-	(cal_destroy_cb): New callback to remove a Cal from the backend's
-	list of clients.  Also, the backend destroys itself when there are
-	no more clients connected to it.
-	(save): New placeholder function to save a backend.
-	(destroy): New function to destroy a backend's data.
-	(cal_backend_destroy): Save the calendar and destroy it.
-
-	* cal.c (cal_destroy): Reset the priv->backend to NULL.
-
-	* cal-factory.c (add_calendar_client): There is no need to call
-	cal_backend_remove_cal(); we can now just destroy the Cal object.
-	(create_fn): Make sure we always unref the URI.
-	(load_fn): Move the URI unref to the end of the function for
-	safety.
-
-	* cal-factory.c (add_calendar_client): Unref the Cal only if
-	notification of the listener was unsuccessful.  Otherwise, the
-	calendar user agent (Listener side) keeps the reference.
-
-	* tl-test.c (list_uids): Free the calobj.
-
-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get
-	rid of the listener.
-	(load_or_create): Likewise.
-	(destroy_factory): New function to get rid of the factory.
-	(destroy_listener): New function to get rid of the listener.
-	(destroy_cal): New function to get rid of the calendar client
-	interface object.
-	(cal_client_destroy): Free all resources.
-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I
-	love memprof.
-
-	* cal-listener.c (cal_listener_destroy): Reset the priv->cal to
-	CORBA_OBJECT_NIL.
-
-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,
-	since the calendar user agent owns it.
-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user
-	agent owns it.
-
-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()
-	to get rid of the calendar client interface object.
-
-	* calobj.c (ical_object_create_from_vobject): Duplicate the
-	default "PUBLIC" string.
-
-2000-02-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Added documentation comment.
-	(load_fn): Do not print a message if the backend could not be
-	loaded due to a non-fatal error.
-	(queue_load_create_job): Moved the stuff from cal_factory_load()
-	to here.  Now this function serves to queue load or create
-	requests.
-	(cal_factory_load): Use queue_load_create_job().
-	(cal_factory_create): Implemented; use queue_load_create_job().
-	(create_fn): New job handler for creating new calendars.
-	(create_backend): New function to create a new backend with a new
-	calendar.
-	(add_backend): New helper function to add backends to the
-	factory's hash table.
-	(load_backend): Use add_backend() instead of adding the backend by
-	ourselves.
-
-	* cal-client.c (load_or_create): Moved the functionality from
-	cal_client_load_calendar() to here, and added an option to create
-	a new calendar instead of loading an existing one.
-	(cal_client_load_calendar): Use load_or_create().
-	(cal_client_create_calendar): Implemented.
-
-	* cal-backend.c (cal_backend_create): Implemented.
-
-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for
-	create requests.
-
-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.
-
-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.
-
-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.
-
-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.
-
-	* tl-test.c: New test program for the calendar client side; it
-	also exercises the server side by sending commands to it.
-
-	* Makefile.am: Added the tl-test program.
-
-	* tlacuache.gnorba: Updated.
-
-	* tlacuache.c (create_cal_factory): Use the right GOAD id.
-
-	* cal-client.c (cal_client_construct): Use the right GOAD id.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added get_uids() method to get a
-	list of UIDs based on object types.
-
-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in
-	the backend.
-
-	* cal.c (Cal_get_uids): Implemented get_uids() method.
-
-	* cal-client.c (cal_client_get_uids): Implemented client-side
-	function.
-
-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,
-	not the last link.
-	(cal_obj_uid_list_free): New function to free a list of UIDs.
-
-	* GnomeCal.idl (Repository): Removed unused method
-	get_object_by_id_list().  This is just for cleanup purposes and to
-	remind me exactly of what needs to be moved over to
-	evolution-calendar.idl.
-	(Repository): Removed unused get_objects() method.
-
-	* corba-cal.c (init_calendar_repo_class): Removed the unused
-	get_objects method.
-
-	* calobj.h (CalObjFindStatus): New status value enumeration for
-	the find function.
-
-	* calobj.c (ical_object_find_in_string): New function to parse a
-	complete calendar and find a calendar object in it.  This should
-	be used instead ical_object_new_from_string() in the future.
-
-	* evolution-calendar.idl (CalObjInstance): Added an uid field.
-	Now the idea is that whenever calendar object strings are passed
-	around, their UIDs are passed along with them so that the actual
-	object can be pulled from the whole VCAL object using its UID to
-	identify it.
-
-	* cal-util.h (CalObjInstance): Added uid field.
-
-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.
-
-	* cal-backend.c (build_event_list): Store the object's UID in the
-	instance structure.
-
-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA
-	structure.
-
-	* cal-client.c (cal_client_get_events_in_range): Copy the UID
-	field from the CORBA structure.
-
-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.
-
-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.
-
-	* gnome-cal.c: #include "alarm.h"
-	(mail_notify): Made static.
-
-	* alarm.h: #include "calobj.h"
-
-	* corba-cal-factory.h (init_corba_server): Fixed prototype.
-
-	* quick-view.c (create_items_for_event): Made static.
-
-	* gncal-todo.c (column_resized): Made static.
-
-	* layout.c (find_index): Made static.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (CalObjInstance): New struct to wrap
-	instances of calendar objects for recurrencies and alarms.
-	(Cal::get_events_in_range): New method to get ocurring and
-	recurring events by time range.
-
-	* cal-backend.c (cal_backend_get_events_in_range): New function to
-	get a list of event instances in a time range.
-	(string_from_ical_object): New internal function.
-	(cal_backend_get_object): Use string_from_ical_object() instead of
-	doing everything ourselves.
-	(cal_backend_get_events_in_range): New function to get a list of
-	the events that occur or recur in a specified time range.
-
-	* cal-client.c (cal_client_get_events_in_range): Implemented
-	client-side function.
-
-	* cal-util.h:
-	* cal-util.c: New files with utilities and types common to the
-	client and server parts.
-	(CalObjInstance): New structure to hold an instance of an actual
-	occurrence, recurrence, or alarm trigger of a calendar object.
-	(cal_obj_instance_list_free): New function to free a list of
-	calendar object instances.
-
-	* cal.c (Cal_get_events_in_range): Implemented new method.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
-	free(), not g_free(), since calendar_get_as_vcal_string() uses
-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
-	well.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (get_calendar_base_vobject): New function to
-	create the base VObject for a calendar.
-	(cal_backend_get_object): Create the base calendar and add the
-	sought object to it, then stringify it.
-
-	* evolution-calendar.idl (Listener::obj_added
-	Listener::obj_changed): Now these pass in just the UIDs, not the
-	complete objects.
-
-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,
-	not the object.
-	(Listener_obj_changed): Likewise.
-
-	* cal-client.h (CalClientClass): Made the obj_added and
-	obj_changed signals take in the UIDs, not the full objects.
-
-	* cal-client.c (obj_added_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field
-	to object_hash.  Now we hash all the calendar's objects here based
-	on their UIDs.
-	(ensure_uid): New function to create UIDs for calendar objects
-	that don't have them.
-	(add_object): Ensure the object has an UID before inserting it in
-	the calendar.
-	(cal_backend_get_object): New function.
-
-2000-02-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added the get_object() method.
-
-	* cal-client.c (cal_client_get_object): New function to get a
-	calendar object by its UID.
-
-	* cal.c (Cal_get_object): Implemented.
-
-	* cal-backend.c (cal_backend_get_object): New unfinished backend
-	function.  We need some reorganizing of how the calendar objects
-	are stored.
-
-2000-02-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated
-	sources.
-
-2000-02-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the
-	listener.  Store the calendar client interface object, and emit
-	our own cal_loaded signal.
-	(cal_client_load_calendar): Connect to the listener's signals.
-	(cal_client_class_init): Added the "obj_added", "obj_removed",
-	öbj_changed" signals.
-	(obj_added_cb): Handle the signal from the listener.
-	(obj_removed_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
-	cal-listener.[ch].
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl: Changed the namespace from
-	GNOME::Calendar to Evolution::Calendar.
-	(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo.  And I
-	never noticed it in the implementation.  Ain't M-/ grand?
-
-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to
-	evolution-calendar.idl.
-
-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to
-	Evolution_Calendar_foo.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c cal-client.h: New files with the calendar client
-	object.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (CalFactory_load): Check that the listener is not
-	nil and emit and exception if it is.
-
-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now
-	these raise the NilListener exception.
-
-	* tlacuache.c (calendar_notify): Error stub for alarms.
-	(alarm_defaults): Stub array.
-	(debug_alarms): Stub variable.
-	(main): Initialize gnome-vfs.
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* tlacuache.c: New main module for the Tlacuache personal calendar
-	server.
-
-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME
-	personal calendar server.
-
-	* Makefile.am: Added the stuff necessary to build Tlacuache.
-
-	* cal.c (Cal_get_uri): Convert the URI to a string before
-	returning it.
-
-	* cal-factory.c (CalFactory_create): Doh, this function is void.
-
-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_remove_cal): New function to remove a
-	calendar client interface object from a backend.
-	(cal_backend_load): Convert the URI to string and use
-	Parse_MIME_FromFileName().  The conversion is not very smart,
-	though.
-
-	* cal-factory.c (load_backend): Moved most of the error handling
-	upstream to load_fn().
-	(load_fn): Handle failure in case the backend could not be loaded.
-	(cal_factory_destroy): Free the backends and the backend hash
-	table.
-	(add_calendar_client): Implemented.  We create a Cal client
-	interface object and attach it to the backend, and we notify the
-	listener.
-
-2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().
-	Also, return a backend instead of a Cal client object.
-
-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a
-	string.
-
-	* cal-listener.c (Listener_cal_loaded): Pass the load status to
-	the signal.
-	(cal_listener_destroy): Better error checking.
-	(cal_listener_new): Better error checking.
-
-	* cal-listener.h (CalListenerLoadStatus): New enum for the load
-	status of a calendar.
-	(CalListenerClass): Added the status argument to the cal_loaded
-	signal.
-
-	* gnome-calendar.idl (cal_loaded): Added a load status code.
-
-	* cal-backend.h (CalBackendLoadStatus): Renamed from
-	CalBackendLoadResult.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c cal-backend.h: Moved the calendar backend here.
-	This is the actual calendar-handling object.
-	(load_from_vobject): Moved over from calendar.c.  Modified to use
-	a CalBackend instead of the old Calendar structure.
-	(add_object): Likewise.
-
-	* cal.c: Now the Cal object is just a calendar client interface
-	object; we use it as a "viewport" onto a CalBackend.  This also
-	lets us do correct resource management.
-
-	* cal-common.h: New file with common forward declarations; we
-	can't have circular dependencies between headers.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Queue a load job.
-	(load_fn): Load job handler.  Lookup the calendar by URI, load it
-	if it is not loaded, or just report it to the new listener if it is.
-
-	* job.c job.h: New files with a simple job queue manager.
-
-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the
-	whole calendar object string.  The client will be able to query
-	the calendar for the events it needs.
-
-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME
-	object.  We unref it when the listener is destroyed.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	The files from the gncal directory of the gnome-pim module on CVS
-	were moved here, to evolution/calendar, in preparation for the
-	Evolution work.  The calendar is being split into a model/view
-	architecture.  The model is a personal calendar server (PAS):  it
-	provides storage, notification, and event generation; the
-	views/controllers are the calendar user agents and things like
-	Pilot synchronizers.
-
-2000-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal.c: Removed the CORBA listener methods, adjusted for the new
-	IDL.
-
-	* cal-listener.c (cal_listener_init): Create the private
-	structure.  In it we hold a reference to the calendar the listener
-	is watching.
-	(cal_listener_destroy): Destroy the private structure and unref
-	the calendar.
-	(Listener_cal_loaded): Stuff the calendar into our private data.
-	(Listener_obj_added): Adjusted for new IDL.
-	(Listener_obj_removed): Likewise.
-
-	* gnome-calendar.idl: New IDL for the personal calendar server.
-
-	* cal.h cal.c: New files with the calendar object.
-
-	* cal-listener.h cal-listener.c: New files with the calendar
-	listener object.
-
-	* cal-factory.h cal-factory.c: New files with the calendar factory
-	object.
-
-2000-01-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Changes to remove todo capplet stuff from distro.
-
-2000-01-08  Vadim Strizhevsky  <vadim@optonline.net>
-
-	* calendar-conduit-control-applet.c: Added pilotID argument to
-	gpilotd_conduit_mgmt_new.
-
-
-2000-01-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you
-	can choose which state the object should have
-	(any/new/modified/...). Will also add one to choose type
-	(event/journal etc).
-
-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the
-	new version of get_number_of_objects.
-
-	* calendar-conduit.c (pre_sync): Calls various
- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.
-
-2000-01-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (start_calendar_server): Let's not call
-	g_error, but g_warning instead.
-	(pre_sync): Get record numbers info, total, new, deleted etc, and
-	tell gpilotd.
-
-1999-12-31  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1
-	day) to the date chooses by the user. This ensures the recurrence
-	also occurs on that date.
-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to
-	redisplay the box.
-
-	* calendar.h: Added an argument to calendar_new, to enable certain
-	features, such as initing alarms or nor.
-
-	* calendar.c (calendar_new): Implemented support for the
-	CALENDAR_INIT_ALARMS option to calendar_new.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Added
- 	CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This
- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess
- 	steintr should check it.
-
-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.
-
-1999-12-10  Russell Steinthal  <rms39@columbia.edu>
-
-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to
-	create default alarm box (widgets in that box should always be
-	sensitive, even if the enabled checkbutton is not set)
-
-1999-12-08  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (setSettings): Capplets now
-	sets first_sync on enable, this should make the conduit copy old
-	entries from the pilot to gnomecal.
-
-1999-12-07  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Check if local store is
-	empty. If, force slow sync.
-
-	* GnomeCal.idl (GNOME): Added get_number_of_objects.
-
-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the
- 	get_number_of_objects.
-
-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that
-	caused the capplet to always set the sync action to Disable upon start.
-
-1999-12-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (Conduits_second_DATA): Also install .desktop files
-	for conduit capplets in the gnome/apps menu dir.
-
-1999-12-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.
-
-1999-10-12  Clifford R. Conover  <rusty@zootweb.com>
-
-	* gncal-todo.c Todo List improvements.
-
-	Cleaned up todo item highlighting, added support for highlighting
- 	events due today, and events not due yet.  Colors are configurable
- 	on the Colors Tab of the properties window.
-
-	Renamed Frame in Properties window to Colors rather then Month
- 	Colors since we are now asking for Todo item colors.
-
-	Added ability to display time until todo item is due in list, it
- 	automatically selects the best denomination of time (up to weeks)
- 	and down to seconds to display.  This should be made configurable
- 	in a future version.
-
-	Changed Todo dialog to ask for time that event is due.  This
- 	allows more accurate tracking of then the item is due, before the
- 	dialog was only asking for the date of the todo item.
-
-1999-12-03  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.
-
-1999-12-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c: Enhanced debug support: can be toggled on and off by
-	SIGUSR1, reports alarms which could not be added
-
-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio
-	and display alarms.  Snooze interval can be configured in the
-	Properties box.
-
-1999-11-30  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up
-	some of the if's in set_status.
-
-1999-11-22  Russell Steinthal  <rms39@columbia.edu>
-
-	* Merged todo list coloring patch from stable
-	* Added myself to AUTHORS, about box (per Miguel)
-
-1999-11-22  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Writes some warning
- 	messages when pre_sync fails.
-
-1999-11-14  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an
-	install gnome-pilot... fixed... sorry.
-
-1999-11-12  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,
-	using solution suggested by James Henstridge, appears to be caused
-	by a (by now fixed) bug in my automake.
-
-1999-11-12  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Config code for timeout, make Alarms property page use a
-	vbox instead of an hbox so that the propbox stays a reasonable width.
-
-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load
-	from config file
-
-	* eventedit.c: Give some static functions external linkage so they
-	can be used elsewhere (make_spin_button); add some prototypes to
-	appease gcc.
-
-1999-11-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_day_change): Add call to
-	calendar_init_alarms() to schedule another day change alarm.
-
-1999-11-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,
-	now version 0.8.5. Consistent use of GSList/GList. Implemented
-	compare, default uses one that compares the contents of a struct
-	Appointment, but also has #ifdeffed code that does a field level
-	comparison, not complete, but perhaps educational.
-
-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
-	unwanted conditional on libcalendar_conduit_la_LDFLAGS
-
-1999-11-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (readStateCfg): Commented the
-	code out, thus the capplet works again.
-
-1999-11-04  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install
- 	dirs for their pilot-link. Also install a pretty icon for the
- 	calendar-conduit.
-
-	* calendar-conduit-control-applet.c: Modfied the
-	try/revert/ok/cancel scheme to be more intuitive, also uses a
-	GtkOptionMenu for the possible sync methods.
-
-	* calendar-conduit-control-applet.desktop: use the nice icon...
-
-	* calendar-conduit.c: Ack, had to define debug_alarms and
-	alarm_default, otherwise they are undefined. Is gncal code messy
-	or is this considered a way of configuring the cal engine ?
-	Implemented delete_all syncabs methods.
-
-	* calendar-pilot-sync.c: also had to declare debug_alarms and
- 	alarm_defaults, just as ugly.
-
-1999-11-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Add new alarm page to properties box
-
-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default
-	alarms, configurable in the properties box.
-
-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display
-	alarms
-
-1999-10-23  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_new): Correctly initialize calendar_day_end
-	and calendar_day_begin *before* installing day-change alarm.
-
-1999-10-21  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c, main.c: Added alarm debugging code
-
-	* main.c (open_ok): Show an error box if the user tries to open a
-	non-existent file; fixes bug #1818
-
-1999-10-19  Russell Steinthal  <rms39@columbia.edu>
-
-	* gnome-cal.c (calendar_notify): Fix typos which were causing
-	invalid times in audio notification dialogs; fixes Bug #2561
-
-1999-10-18  Russell Steinthal  <rms39@columbia.edu>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various
-	elements of the day view in paned windows so that the user can
-	adjust the relative sizes of the daily schedule, monthly calendar,
-	and to-do list.
-
-1999-10-18  Martin Norbäck  <norpan@bigfoot.com>
-
-	* gncal.desktop: Added swedish translation
-
-1999-10-13  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Hopefully the fixes the much-hated
-	gnome-pilot dependency.
-
-1999-10-07  Eskil Olsen   <deity@eskil.dk>
-
-	* calendar.c (calendar_object_changed): moved the pilot_status =
-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.
-
-	* calendar-conduit.c: more _free calls, vamped the noise on output.
-
-1999-10-06  Eskil Olsen   <deity@eskil.dk>
-
-	* *conduit*[ch]: checks return values from gpilotd_init/connect.
-
-	* calender.c (vcalendar_create_from_calendar): removed a set
- 	of cleanVObject cleanStrTbl, since the freed memory that the
-	function returned.
-
-1999-09-27  Timur Bakeyev  <mc@bat.ru>
-
-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get
-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.
-	See also 1999-07-19  Matt Martin <matt@abacusnet.net>
-
-1999-09-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* month-view.c (add_event): ditto
-	(mark_current_day): ditto
-	(month_view_set): ditto
-
-	* goto.c (goto_dialog): ditto.
-
-	* gnome-month-item.c (gnome_month_item_init): ditto.
-
-	* gncal-day-panel.c (gncal_day_panel_new): ditto.
-
-	* getdate.c (RelativeDate): ditto.
-
-	* eventedit.c (set_all_day): ditto.
-	(ee_rp_init_rule): ditto.
-
-	* calendar.c (vcalendar_create_from_calendar): ditto.
-
-	* calendar-conduit.c (update_record): ditto.
-
-	* calobj.c (ical_object_generate_events): Get rid of pointers to
-	values returned from localtime, as it uses a static buffer.
-
-1999-09-26  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: the g_free that was commented out since glib said
-	was a duplicate free, was supposed to be a free.
-
-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a
-	get_objects_by_id_list. Latter is not done.
-
-	* calendar-conduit.c: rewrote the way the conduit iterates over
-	records. It no longers fetches all entries (since that didn't work
-	with more then 285 entries. It now fetches the id list, and gets
-	each record. (will be using get_objects_by_id_list to get records
-	in amounts of 10 or so later, to reduce amount of corba calls).
-
-	* calendar-conduit.c: now sets alarm parameters when transferring
-	from gnomecal to pilot.
-
-1999-09-23  Eskil Olsen <deity@eskil.dk>
-
-	* calendar-conduit.c: better merge of summary/description
- 	when doing ical_from_remote (update_record), also handles
-	import from gnomecal to pilot better, and on both ways, repeat
-	events are much better now.
-
-1999-09-22  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: commented out a g_free that glib reported
-	as being a duplicate free.
-	* calendar-conduit.c: got gnomecal->pilot up and runnning.
-
-1999-02-06  Lauris Kaplinski <lauris@ariman.ee>
-
-	* gncal.desktop: Added Estonian translations.
-
-1999-09-14  Federico Mena Quintero  <federico@redhat.com>
-
-	* gncal-full-day.c (child_popup_menu): Set the data pointers for
-	all the items.
-
-1999-09-14  Kjartan Maraas  <kmaraas@online.no>
-
-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest
-	user-guide.
-
-1999-09-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* eventedit.c (ee_create_buttons): Make the OK button the default
-	button per Russell's suggestion.
-
-1999-08-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_object_changed): Modify the
-	object->last_mod field.
-	(calendar_add_object): Ditto.
-
-	Closes bug #676
-
-	* main.c (save_calendar_cmd): Fix problem in which we warned the
-	user about the calendar being modified the first time the calendar
-	was used.
-
-1999-08-22  Tomas Ogren  <stric@ing.umu.se>
-
-	* gnomecal.gnorba: "GenericFactoy" is wrong...
-
-1999-08-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Fix the hostname part.
-
-1999-08-07  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects
-	created on the pilot, but not dirty (because they have been synced
-	with some other program in the past)
-
-1999-07-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* month-view.c (month_view_init): Release points here.
-
-1999-08-02  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):
-	libcalendar_conduit now installs
-
-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments
-	correctly, when they are deleted on the pilot
-	(conduit_free_Appointment): protect against double-freeing parts
-	of the Appointment structure
-	(update_record): all-day events from the pilot are handled a bit
-	more reasonably
-
-1999-08-01  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day
-	appointment corruption bug is dead. Whoo!
-
-1999-07-31  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am: fixed this up slightly with respect to pilot conduits
-
-1999-07-30  Jonathan Blandford  <jrb@redhat.com>
-
-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
-
-1999-07-29  Jonathan Blandford  <jrb@redhat.com>
-
-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
-
-1999-07-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is
-	not set, set the repeatForever to 1.  This fixes all of the
-	birthdays problems I had.
-
-	Make the code not take arguments
-	(sync_cal_to_pilot): Nice event update information
-
-	* calendar.c (calendar_new): Add Event UID hash table.
-	(calendar_add_object): Add events to the hash table here.
-	(calendar_remove_object): Remove events here.
-	(calendar_object_find_event): Use the hash table here.
-
-	* main.c (save_calendar_cmd): The object is already destroyed by
-	gnome_dialog_run.
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn
-	archived bit on.
-
-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.
-	(ical_gen_uid): Add a serial number.  Isodates can be small.
-
-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the
-	pilot status.
-	(cal_repo_get_updated_objects): New method.  Returns a list of
-	modified and not-sycned objects
-
-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync
-	from the GnomeCalendar to the pilot.
-	(sync_object_to_pilot): Sync a single event to the pilot.
-	(try_alarm): Alarm syncing code.
-
-1999-07-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: New file.  Implements PalmPilot
-	syncronization with the Gnome Calendar.
-
-	* calobj.c (ical_object_new_from_string): New function.  Creates
-	an iCalObject from a vCalendar string that is supposed to contain
-	only one vEvent.
-
-	* calendar.c:
-	(calendar_save): Split this routine in two.
-
-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.
-
-	* main.c: Include gnorba.h, and corba-cal-factory.h here
-	(close_cmd): Kill the calendar server on shutdown.
-
-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE
-	need to handle intervals in the years.
-
-	* calendar.c (calendar_object_find_in_list, calendar_object_find,
-	calendar_object_find_todo, calendar_object_find_event): New
-	functions for looking up information.
-
-	* main.c (gnome_calendar_locate): New function.
-
-	* corba-cal.c (calendar_create_object): New file.  Implements the
-	corba server.
-
-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.
-
-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.
-	(ical_object_create_from_vobject): Load syncing information for
-	pilot.  Do it in a way compatible with KOrganizer.
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-19  Matt Martin <matt@abacusnet.net>
-
-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the
-	ISO date format to convert from GMT time.
-
-1999-07-17  Nat Friedman  <nat@gnome-support.com>
-
-	* calendar.c (calendar_add_object): Copy the new UID into the
- 	iCalObject structure.
-
-1999-07-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from
-	gnome-pim-1-0: Fixed cut&paste bug for day fontsets.
-
-1999-07-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Returns a UID.
-	(ical_object_new): Use a UID when creating an event.  Should get
-	syncing done easier.
-
-1999-07-14  Nicholas J Kreucher <nick@poetic.com>
-
-	* calobj.c (skip_numbers): Actually skip over the numbers.
-	(ical_object_to_vobject): Test the proper variable for storing the
-	proper information.
-
-1999-07-14  Jean-Noel Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>
-
-	* timeutil.c (time_add_month): Fixed the problem with next month
-	going from a 31-day to a 30-day by adjusting the date to the
-	closest day at the end of the month.
-
-1999-06-07  Mike McEwan  <mike@lotusland.demon.co.uk>
-
-        * timeutil.c (time_add_month): Tell ktime' that we don't know
-        about daylight saving time so that it does *not* make adjustments
-        when we traverse a DST boundary.
-        (time_year_begin): ditto.
-        (time_year_end): ditto.
-        (time_month_begin): ditto.
-        (time_month_end): ditto.
-
-1999-06-16  Anders Carlsson  <anders.carlsson@tordata.se>
-
-	* main.c (new_calendar): Realize the toplevel widget when
-	--hidden is passed to gnomecal. This fixes a segfault.
-
-1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.
-	(Bug #1367). Thanks to Owen Cliffe <oc197@ecs.soton.ac.uk> for
-	helping track it down.
-
-1999-06-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.
-
-1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU
-	extension, not available in other systems.
-
-1999-06-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): Work around broken software that
-	writes a broken month-of-day as "zero".  Use the dtstart date for
-	this on this event.
-
-1999-05-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (install-data-local): help files be gone.  They are
-	now installed from the Docbook stuff.
-
-1999-05-26  Russell Steinthal  <steintr@condor.penguinpowered.com>
-
-	* gncal-todo.c main.c main.h prop.c: Added support for priorities
-	for todo items.  Doesn't do much, but you can set them and sort by
-	them.  (Use the properties box to enable them; should they be on
-	by default?)
-
-1999-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Added missing break here.  It was causing
-	core dumps when invoked with --userfile.
-
-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,
-	to pin point the bug reported on gnome-list.
-
-	* calobj.c (load_recurrence): Make intervals always exist.  a 0
-	interval is wrong.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Set the canvas scroll region here,
-	not in size_allocate().  Also, use the correct width and height
-	based on the allocation and the precomputed minimum width/height
-	values.
-
-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the
-	scrolled window.
-
-	* main.c (setup_appbar): Use the correct type for the appbar.
-
-	* gncal-day-view.c: Removed unused function switch_to_day().
-
-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.
-
-1999-05-25  Nat Friedman  <nat@nat.org>
-
-	* doc/C/gnomecal.sgml: Fixed a typo.
-
-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into
- 	which the year view is placed.
-
-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view
- 	inside the scrolled window.
-	(idle_handler): Set the height of the year view to
- 	CALENDAR_HEIGHT.
-	(year_view_size_allocate): Set the scroll region of the year view
- 	canvas to allocation->width, CALENDAR_HEIGHT.
-
-1999-04-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (dump_todo): Add --todo flag to dump the todo contents.
-
-1999-04-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (add_activated): Use same hack used in edit_activated
-
-1999-04-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (edit_activated): Kill all grabs from the CList
-	before running the new dialog box.
-
-	This fixes the problem of button-3/Edit on the todo item blocking
-	the GUI (actually, the main window responds, but not the todo
-	window).
-
-1999-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for
-	button3.  The code for the nice popup menu was there but was not
-	getting invoked.
-
-1999-04-01 Steve Murphy <murf@e-tools.com>
-
-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences
-	use the weekday field as a simple integer for a single weekday.
-
-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of
-	weekdaylist. The interface only lets the user input a single value
-	anyway.
-
-	* calobj.c (ical_object_to_vobject): instead of code to output day
-	names from a bit array, use instead the value as an int and output
-	a single dayname.
-
-	* calobj.c (ical_object_generate_events): first_week_day gets the
-	day int instead of the first entry in the bit field. I inserted a
-	fair chunk of code to avoid calling generate if the day is out of
-	range for a month. It may be unneccessary, because mktime will
-	turn the extra days into a valid date the next month. But not all
-	mktimes are equal, I fear.
-
-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,
-	(Monthly), I added code to set the interval slot of the recur
-	struct; without this value, selecting a monthly recursing, by
-	date, would lead to an infinite loop broken only by a failure to
-	alloc more memory. Also, in the "by position" case, both
-	u.month_pos and u.month_day were being assigned values. This is a
-	mistake, as they are both part of an union, and the same
-	thing. The weekday field should get the recur_rr_month_weekday
-	value.
-
-	* eventedit.c (ee_rp_init_rule): set default day from the weekday
-	field instead of the u.month_day field, which is really the
-	month_pos value.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with
-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime
-	will generate a time corresponding to the end of the previous
-	month, which may have a mday anywhere from 28 to 31. The end time
-	just adds 1 to the month, so your end time may not cover the last
-	few days of this month, depending on what the biggest mday of last
-	month was. I changed it so tm_mday is set to 1 instead.
-
-1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use
-	the full year format for strftime().
-
-1999-03-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* calobj.c: Include <config.h> So that strings get translated.
-
-1999-03-26  Tomas Ogren  <stric@ing.umu.se>
-
-	* prop.c (build_hours_menu): Made it respect 12/24h settings..
-	Doesn't show until next time you open the dialog.. yet..
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work
-	* eventedit.c (get_exception_string): Did some i18n work
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
-	* main.c (poptOption): Added which views that are possible for
-	--view in the --help text (closes #367)
-	* main.c (dump_events): Added (short) month to the strftime and made
-	the strings i18n:able
-
-1999-03-23  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal/calobj.c: Added 2 paranthesis..
-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
-	which caused heavy alarm-corruption with alarms between 2 hrs and
-	2 days.
-
-1999-03-23  Nat Friedman  <nat@nat.org>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Set the
- 	recur->interval to the value of the recur_rr_month_period spin
- 	button if the event is being set "by day."  This closes bug #675
- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!
-
-1999-03-10  Clifford R. Conover <rconover@montana.edu>
-
-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when
-	adding a TODO item here.
-	(column_resized): New function
-	(init_column_sorting): New function.
-	(todo_click_column): New function.
-	(convert_time_t_to_char, make_overdue_todo_style): New functions.
-
-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New
-	function used to update the TODO when the properties have been
-	chagned for it.
-
-	* prop.c (prop_apply_todo): Apply TODO properties.
-
-	* gncal-day-panel.c (todo_list_properties_changed): Update the
-	TODO display here.
-
-	* eventedit.c (date_edit_new): Made public
-
-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)
-
-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support
-	for daylight time savings.
-
-1999-02-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP
-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently
-	has the focus.
-
-1999-02-27  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the
-	fontset string.
-	* mark.h (*_FONTSET): Likewise.
-
-1999-02-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of
-	the event.
-	(ical_object_create_from_vobject): Load the owner/organizer of the event.
-
-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes
-	crash on "delete this occurrance").
-
-1999-02-22  Timur Bakeyev  <mc@bat.ru>
-
-	* calendar.c: According to configured values, use either tm.tm_zone
-	or tzname. In last case, also declare it extern.
-
-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works
-	fine without it.
-
-1999-02-20  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c (init_username): Made use of g_get_{user,real}_name() instead
-	of our own home-brew...
-
-1999-02-17  Sergey Panov <sipan@mit.edu>
-
-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,
-	month-view.c,prop.c,quick-view.c,year-view.c: will define
-	fonts via fontset. Friendlier to locales that use iso8859-[^1]
-	and koi8-r encodings. Does not solve problem for Asian languiges
-	--- better solution is needed (e.g. standart GNOME fontstyles
-	defined in gtkrc).
-
-1999-02-16  Sergey Panov <sipan@mit.edu>
-
-	* main.c: Use N_() macro for color settings labels in
-	color_props structure.
-
-1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (goto_dialog): Indentation fixes.
-
-1999-02-15  Tomas Ogren  <stric@ing.umu.se>
-
-	* goto.c: Made a private copy of what localtime() returns, to be able
-	to keep the data after more calls to localtime().
-
-1999-02-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_default_calendar): New function.  Saves the
-	calendar if it is the user's default calendar
-
-	* gncal-full-day.c (unrecur_appointment):
-	* gncal-day-panel.c (day_view_range_activated):
-	* eventedit.c (ee_ok):
-	* gncal-todo.c (ok_button): Added autosave for the default
-	calendar.
-
-1999-02-09  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: Removed the gtk_widget_realize call.
-
-1999-02-06  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* gncal.desktop: Added Korean translations.
-
-1999-02-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (date_edit_new): New convenience function to create
-	a properly-configured date editor widget.
-
-1999-02-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_week_view_time_format_changed): New function to notify the
-	week view that the time format has changed.
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_day_panel_time_format_changed): New function to notify the
-	day panel that the time format has changed.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day
-	and week views that the time format has changed.
-
-1999-02-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_init): Set the title of the event
-	editor window.
-
-1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the
-	clipping rectangle here.
-
-	* view-utils.c (view_utils_draw_events): Remove the clipping
-	rectangle here, since the user of this function should not know
-	about it.
-
-1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Improve this draw
-	routine.  Now it can split the text in lines and fit as many
-	events as possible.
-	(nicetime): Return strings without spaces at the beginning.
-
-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear
-	operation here.
-
-1999-01-29 Jason Tackaberry <tack@dok.org>
-
-	* gncal-full-day.c (child_popup_menu): if the user clicks on an
-        event that is an occurance, the menu will allow the user to delete
-        all occurances of this event, or just the selected occurance.
-        (delete_occurance): added.
-
-        * eventedit.c (append_exception): force the clist to select the
-        new exception.  (fixes segfault)
-        (delete_exception): if the last exception in the clist is deleted,
-        move the selection index up. (fixes segfault)
-
-1999-01-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at
-	startup. Only works with GNOME window managers though :-(
-
-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.
-
-	(calendar_init_alarms): Schedule an alarm for midnight to change
-	the calendar_day_begin/calendar_day_end.
-
-	* alarm.c (alarm_ready): If we reschedule, there is no need to
-	activate any pending alarms.
-
-1999-01-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_new): Insert the summary text here.
-	(child_focus_in): No need to raise the window, since we have
-	Spiffo(tm) layout code.  Boy, this is old code.
-	(gncal_full_day_focus_child): Now that GtkText works better, we
-	can avoid synthesizing a click which was causing grief, anyway.
-	(child_button_press): Grab the focus before popping up the menu.
-
-	* layout.c (find_index): Added a sanity check.
-
-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child
-	before unparenting/destroying it.
-	(child_unrealize): Unrealize the widget.  What was I thinking?
-	(child_new): Save the focus_out_event signal connection id in
-	Child structure (in a new field).
-	(child_destroy): Disconnect from the focus_out_event signal, since
-	we don't want to get such an event when the widget is destroyed.
-	(gncal_full_day_destroy): Destroy the children properly; it was
-	leaking memory.
-
-1999-01-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_calendar_cmd): Warn if the calendar file has
-	changed.
-
-	* calendar.c (calendar_load, calendar_save): Keep track of the
-	modification time for the calendar file.
-
-1999-01-20  Nat Friedman  <nat@nat.org>
-
-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable
- 	characters such that hotkeys work.
-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.
-
-	* prop.c (properties): Connect gnome_help_pbox_display to the
- 	GnomePropertyBox help button.
-
-1999-01-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here
-	(it was being grabbed incorrectly, anyways).
-	(quick_view_map_event): Grab the mouse when the window is mapped.
-	This avoids the ugly "while (xGrabPointer () != Success)" hack.
-	(quick_view_button_release): Handle button releases here.
-
-1999-01-19  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: do gtk_widget_realize on the toplevel window..
-
-1999-01-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the little
-	calendar start up with the correct date.
-
-	* gncal-week-view.c (gncal_week_view_set): Add the month to the
-	date range display label.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c: Converted some more stuff to use the standards.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c (setup_appbar): New function to create the status bar.
-	(setup_menu): Install menu hints.
-
-	Menu items updated to match the standards.  New Settings menu
- 	created.
-
-1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
-
-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
-	  gncal/quick-view.c:
-	s/g_copy_strings/g_strconcat/
-
-1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	Rewrote the old and broken alarm system.  It never actually
-	worked properly.  Now it works properly, and I figured a nice way
-	to get the Audio alarm do something nicer (it is now like an alarm
-	clock :-).
-
-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to
-	actually distinguish which alarm was triggered.
-
-	* alarm.c (alarm_ready): The code was only activating the first
-	alarm.  Reschedule the timer upon delivery of an alarm.
-
-1998-12-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Use the allocation size instead of
-	the old fields in the canvas structure.
-
-	* goto.c (create_days): Use gtk_widget_set_usize() instead of
-	gnome_canvas_set_size().
-	* quick-view.c (setup_event_list): Likewise.
-
-1998-12-09  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.
-	* goto.c (goto_dialog): ditto
-	* prop.c (properties): ditto.
-
-1998-11-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.
-
-1998-11-23  Andrew T. Veliath  <andrewtv@usa.net>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Use
-	gtk_scrolled_window_add_with_viewport instead of
-	gtk_container_add (gtk changes).
-
-1998-11-23  Herbert V. Riedel <hvr@hvrlab.ml.org>
-
-	* eventedit.c: use GPOINTER_TO_INT
-
-	* gncal-todo.c: same.
-
-1998-11-22  Matthew Wilson  <msw@redhat.com>
-
-	* main.c: Fixed the popt event parsing callback to have the
-	correct number of arguments.  This stops it from segfaulting.
-
-1998-11-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug
-	where the classification buttons were not being set correctly.
-	(ee_store_general_values_to_ical): Take into account the fact that
-	radio group lists are stored in reverse order of insertion.
-
-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the
-	clist into.
-
-1998-11-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Backup the old file before saving
-	the caledar.
-
-1998-11-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c: Add ctype.h
-
-1998-10-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the
-	beginning of the current time unit (day/month/etc), otherwise it
-	does not work right, for example, you are on the 31st day of a
-	month and the next month is a 30-day one and you jump to the next
-	month.
-
-1998-10-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c: Changed a lot of stuff not to use the layout code
-	-- the month view's days are too small to display layout
-	usefully.  Now they display a little list of the events in each
-	day.  We also have a popup menu for the days in the month view.
-
-	* calendar.c (calendar_get_objects_in_range): Reverse the list so
-	that it is returned in increasing order.
-
-	* eventedit.c (event_editor_new_whole_day): New public function to
-	create an event for the complete span of day_begin to day_end.
-
-	* year-view.c (new_appointment): Use event_editor_new_whole_day().
-
-	* year-view.c (yv_popup_menu): Mark strings for i18n.
-
-1998-10-12  Ji Lee <g@ucsd.edu>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was
-	never being loaded from the spin button.
-
-1998-10-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_update): Create a list of children and
-	lay them out nicely.  Lots of functions added for this purpose.
-	(adjust_segment): Main event segment adjustment routine.
-	(adjust_children): Adjusts all the children in the month view.
-	(child_create_segments): Creates the segments for a particular event.
-	(layout_children): Uses the generic layout engine to organize the children.
-
-1998-10-08  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the
-	edit/delete buttons.
-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the
-	bug report.
-
-	* layout.c: Do some cleanup; now we pass a struct with the layout
-	algorithm's state instead of passing a trillion parameters around.
-
-	* gncal-full-day.c (layout_children): Use the new generic layout
-	engine.
-	(child_compare): Sort keys are start time then end time, not just
-	start time.  This produces somewhat nicer results for the layout
-	algorithm.
-
-	The new layout code uses a partition of the time range occupied by
-	the events, rather than using a fixed time granularity.  This is
-	better since the different parts of the program that use the
-	layout module will have different semantics regarding snapping the
-	event bounds to a fixed "time grid".
-
-1998-10-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* layout.[ch]: New files that abstract the event layout code from
-	gncal-full-day.c into something useful for other parts of the
-	program.  Now all event layout is done here.
-
-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of
-	sources.
-
-1998-10-07  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* main.c (main): Replaced the 'gnome_client_new_default' call with
-	'gnome_master_client'.
-
-1998-10-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* timeutil.c (time_day_begin): Changed name from
-	time_start_of_day() to be consistent with the other begin/end functions.
-	(time_day_end): Likewise.
-
-	* calobj.c (ical_object_get_first_weekday): New public function to
-	get the first toggled day in a weekday mask.  Since we do not
-	support multiple weekdays in a monthly-by-pos rule, we just fetch
-	the first toggled one.
-	(ical_object_generate_events): Added a missing break statement.
-
-	* timeutil.c (time_month_end): Made it consistent with the rest of
-	the time begin/end functions -- now it returns the first second of
-	the *next* month.
-	(time_week_end): Actually implemented this function.  It will be
-	used when the week view is rewritten.
-
-	* calobj.c (time_in_range): Fix off-by-one in the comparison of
-	the time against the end time.
-
-	* gncal-full-day.c (expand_space): Fixed bug where the columns not
-	were being expanded due to a missing "slot + j".
-
-1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_init): Use the font #defines.
-	(month_view_new): Set the colors of the month view upon creation.
-	(mark_current_day): New function to mark the current day in the
-	month view.
-	(month_view_set): Mark the current day.
-	(month_view_colors_changed): Mark the current day and colorify the
-	month item appropriately.
-
-	* month-view.h: Added year and month fields to the MonthView
-	structure.
-
-	* main.c: Renamed the Appointments color property, since it will
-	be used by the month view as well.
-
-	* goto.c (update): Set the current day's font and color.
-
-	* year-view.c (year_view_init): Set the fonts of the month items
-	when creating them.
-
-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.
-
-	* year-view.c (year_view_init): Use the new font #defines.
-
-	* prop.c (prop_apply_colors): Fixed to work with the
-	I-am-paranoid-and-I-need-to-size-my-ints changes to
-	GnomeColorPicker.
-	(color_spec_from_picker): Likewise.
-
-1998-09-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Colorify the month item and prepare it for
-	prelighting here.
-
-	* main.c (color_props):  Changed the default colors to something
-	not dull.
-
-	* year-view.c (compute_min_size): New function to compute the
-	minimum size of the year view properly.
-	(year_view_size_request): Added two new fields to the year view
-	structure that contain the minimum size.  Return this in the
-	size_request method.
-	(year_view_new): Call compute_min_size to save the minimum size
-	for later use.
-	(idle_handler): Make it resize the items correctly.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when
-	necessary.  This is needed becaues we now actually calculate a
-	minimum size for the month item based on the font sizes and paddings.
-	(check_heading_sizes): New function to calculate a minimum size
-	based on the headings' dimensions.
-	(check_day_sizes): New function to calculate a minimum size based
-	on the day number labels' dimensions.
-	(check_sizes): New function that computes a minimum size for the
-	month item.
-	(reshape): Now calls check_sizes() to ensure a minimum size for
-	the month item.
-
-	* year-view.c (mark_current_day): New function to mark the current
-	day in the year view.
-
-	* mark.c: Removed mark_current_day from here.
-
-1998-09-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec
-	and made it conform to the new prelighting mechanism.
-	(fake_mark_days): Set the proper day attributes.
-	(reconfigure_month): Use colorify_month_item().
-	(fake_mark_days): Use mark_month_item_index().
-
-	* mark.c (colorify_month_item): New public function to reset the
-	colors in a month item.
-	(get_attributes): New internal function that creates an array of
-	attributes for the days in a month item.  This is the basis of all
-	the new optimizations to month item marking.
-	(unmark_month_item): Now it uses the attributes array to unmark
-	only the days that need unmarking.
-	(mark_event_in_month): Update the day attributes array.
-	(month_item_prepare_prelight): Changed the definition of the
-	prelight color query function.  Use the new function.
-	(day_event): Do color changes based on the day attributes array.
-	(mark_month_item_index): New public function to mark a single day
-	by index.
-	(mark_event_in_month): Use mark_month_item_index().
-
-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an
-	int, not a GnomeMonthItemChild.
-	(gnome_month_item_child2num): Now returns an int, not a
-	GnomeMonthItemChild.
-	(gnome_month_item_num2day): Now takes an int, not a
-	GnomeMonthItemChild.
-
-	* goto.c (goto_dialog): Create the days before the year spin
-	button, because the year_changed callback expects the month item
-	to be created.  The new semantics of the spin button cause it to
-	emit a value_changed signal on the adjustment upon creation -- is
-	this the behavior we want from it?
-	(goto_dialog): Use gtk_window_set_modal() instead of the
-	deprectaed gnome_dialog_set_modal().
-
-	* quick-view.c (quick_view_new): Make it look not as crappy by
-	putting the title inside the frame.
-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.
-	(create_items_for_event): Query the text width/height from the
-	text item using the new object arguments, so that the size of the
-	popup window can be set properly.
-
-	* year-view.c (do_quick_view_popup): Calculate a nice date string
-	for the popup window.
-
-1998-09-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.[ch]: New file that presents a quick view of the
-	events in a particular day when the mouse is clicked on the year
-	view.  Work in progress.
-
-	* year-view.c (do_quick_view_popup): New function that creates a
-	quick view for the events in a day.
-
-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the
-	list of sources.
-
-1998-09-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Hotkey for File/Exit should be C-q, not C-x.
-
-1998-09-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (do_popup_menu): New function to execute the popup
-	menu in the year view.
-	(day_event): Invoke the popup menu with the context set to days.
-	(new_appointment): New function to create a new appointment from
-	the year view.
-	(do_jump): New function to do the appropriate view/date jumping
-	from the popup menu.
-
-	* main.c: Fixed two icons in the File menu.
-
-1998-09-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Added underlined shortcuts and accelerators to the main menu.
-
-1998-09-16  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal-week-view.c (<gtk/gtklabel.h>): Include.
-	* gncal-week-view.h (<gtk/gtkvbox.h>): Include.
-
-1998-09-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail
-	notification not beint sent until the program was terminated.
-
-1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach ->
-	forall from Gtk changes, bleah.
-
-	* year-view.c (day_event): New function to handle events from
-	days.  Jumps to the day that is clicked.
-
-	* main.c: Use a watch cursor while the previous/today/next
-	functions are doing their job.
-
-	* mark.c (month_item_prepare_prelight): New public utility
-	function to prepare a month item for prelighting.  It will store
-	the proper prelight information and attach the appropriate signals.
-	(mark_current_day): Make the current day bold as well (useful for
-	color-blind people, I guess).
-
-	* prop.c (set_current_day): Reset the date in the sample calendar
-	and mark the current day.
-	(fake_mark_days): Mark fake events in the sample calendar.
-
-	* year-view.c (year_view_set): Use the general prelighting engine.
-
-	* goto.c (day_event): Just process button presses, as prelighting
-	is done behind the scenes now.
-	(update): Use the general prelighting engine.
-
-	* prop.c (create_colors_page): We can now configure the colors of
-	the monthly calendars!  Wheeeeee!  There are still some nits to be
-	fixed, which are listed in the TODO file.
-	(build_color_spec): New function to build color specifications.
-	(parse_color_spec): New function to parse color specifications.
-
-	* mark.c: Modified all functions to use the configured colors.
-	* goto.c: Likewise.
-
-	* main.c (colors_changed): New function that notifies all
-	calendars that colors have changed.
-
-	* gnome-cal.c (gnome_calendar_colors_changed): New function that
-	notifies all the views that the colors have changed.
-
-	* month-view.c (month_view_colors_changed): New function that
-	notifies the month view that colors have changed.
-
-	* year-view.c (year_view_colors_changed): New function that
-	notifies the year view that colors have changed.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	outline and day box colors.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Added
-	outline_color, outline_color_gdk, day_box_color, and
-	day_box_color_gdk arguments to month items.  These are convenient
-	to quickly set the colors of the month item.
-	(gnome_month_item_get_arg): Likewise.
-
-	* main.[ch]: Added a global array of structures for color preferences.
-
-1998-08-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c: Small code cleanup.
-	(day_event): Upon receiving a LeaveNotify event, Reset the day's
-	background to the correct color.
-
-1998-08-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* mark.[ch]: New files with utility functions to mark calendars
-	with their events.
-
-	* mark.c (mark_month_item): New public function to mark a month
-	item with events.
-	(unmark_month_item): New public function to unmark all the days in
-	a month item to their default appearance.
-
-	* year-view.c (year_view_set): Use the new unmark_month_item() and
-	mark_month_item() to mark the months with events.
-
-	* goto.c (update): New function that updates the calendar in the
-	Go-to dialog by marking the days.
-
-	* timeutil.c (time_year_begin): Modified to take a time_t value.
-	(time_year_end): Likewise.
-	(time_month_begin): Actually implemented this function, which was
-	in the header file but not here.
-	(time_days_in_month): New public function that returns the number
-	of days in a month.
-
-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.
-
-	* year-view.c (unmark_days): Use unmark_month_item().
-
-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when
-	destroying the full day view.  The full day's destroy method is
-	unusual in that it destroys the list of child widgets itself, as
-	it does not have a remove method, so it needs to reset the list to
-	NULL.
-
-1998-08-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (build_month): Now does the correct thing
-	when the user wants weeks to start on Monday.  Now all the Monday
-	special casing, as far as day numbering is concerned, is only in
-	this function.
-
-	* year-view.c (mark_days): This function marks the days that have
-	events in them.  It also fixes a memory leak in the old
-	implementation (it was leaking the whole list).
-	(unmark_days): New function used to unmark all the days in the
-	year view.
-	(mark_event): New function that marks all the days that are
-	spanned by a time range.  It also fixes the bug in the old
-	implementation where it could possibly mark days past the ends of
-	the year (if the event crosses year boundaries, for example).
-
-	* timeutil.c (time_year_begin): Take the year parameter since year
-	1, not 1900.
-	(time_year_end): Likewise.
-
-	* year-view.c (year_view_size_allocate): Now changing the size of
-	the calendars is done in the idle loop.
-	(idle_handler): This function actually does the resizing of the items.
-
-	* year-view.h (struct _YearView): Added idle_id and need_resize
-	fields.
-
-1998-08-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Beginning of the new year view.  Sizing and event
-	marking needs to be finished.
-
-	* gnome-cal.c: Updated for year-view.
-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().
-
-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to
-	year-view.[ch].
-
-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the
-	list of source files.
-
-1998-08-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Set the heading color of the month item.
-
-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,
-	instead of goto.xpm.  Also, removed goto.xpm from cvs.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	the heading and day number fonts.  Added fields for heading and
-	day number label colors.
-
-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES
-	should be write-only.  Also, added arguments for heading and day
-	number fonts.  Added arguments for heading and day number colors.
-
-1998-08-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio
-	buttons properly.
-
-	* month-view.c (month_view_time_format_changed): New public
-	function that notifies the month view of a time format change.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): New public
-	function that notifies the calendar of a time format change.
-
-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().
-
-	* month-view.c (month_view_update): New public function to update
-	the month view when an event changes.  This is still unfinished.
-	(month_view_set): New public function to set the month in the
-	month view.
-
-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-
-	* timeutil.c (time_add_week): Implemented the time_add_week()
-	function, which was on the header file.
-	(time_add_month): Added public month-adding routine.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for
-	month view.
-	(gnome_calendar_goto): Likewise, and set the time on the month view.
-
-	* month-view.c (month_view_new): Now it takes the calendar plus
-	the time_t representing the month.
-
-	* gnome-month-item.h: Added documentation on the object arguments
-	for the month item.
-
-	* month-view.c (month_view_init): Added a month/year heading to
-	the month view.
-
-	* TODO: Updated the TODO list a bit.
-
-	* main.c (gnome_cal_file_menu): The preferences menu option should
-	go in the File menu.
-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.
-	(gnome_cal_menu): Renamed the Calendar menu to Edit.
-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".
-
-	* prop.c (hour_activated): Notify the property box that it has changed.
-
-	* main.c: Changed the Properties menu item to Preferences.  These
-	are global application preferences, not a single calendar's
-	properties.
-
-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the
-	configuration file.
-	(properties): Added a check button for weeks starting on Monday.
-	(properties): Beautified the Preferences dialog.
-
-	* month-view.c (month_view_init):
-	* goto.c (create_days): Set the month item to start weeks on
-	Monday if appropriate.
-
-	* main.c (init_calendar): A boolean is not an hour, so don't
-	range_check_hour() on it.
-	(init_calendar): Added a global week_starts_on_monday flag.
-
-	* main.h: Added global week_starts_on_monday flag.
-
-1998-08-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): If mail alarm or
-	program alarm are missing the action, then set an empty default.
-
-1998-08-18  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_day2index): New public
-	function to get the displayed day index of the specified date.
-
-	* gnome-cal.c (gnome_calendar_goto_today): New public function to
-	jump to the current day.
-
-	* goto.c (day_event): Jump to the selected day when the user
-	clicks the mouse, and prelight days as appropriate.
-
-	* timeutil.c (time_from_day): New public function to build a
-	time_t from a year/month/day triplet.
-
-	* gnome-month-item.c (gnome_month_item_num2child):
-	(gnome_month_item_child2num): New public functions to convert an
-	index into a child and vice-versa, respectively.
-	(gnome_month_item_num2day): New public function to convert a child
-	number into a displayed day number.
-
-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)
-
-	* gnome-month-item.c (create_items): Use g_strdup()ed day names
-	from the start.
-
-1998-08-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (gnome_toolbar): Made it use goto.xpm.
-
-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.
-
-1998-08-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually
-	recalculate the days using the month and year.
-
-	* main.c: Added "Go to" button to quickly jump to a specific date.
-
-	* goto.c: New file that defines the quick go-to date dialog.
-
-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.
-
-1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* main.c (new_calendar): Made title i18n friendly. This was bug
-	#215.
-
-	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
-	recur->_enddate, not to itself, when adding recurring event and
-	supplying an end date. This fixes (at least part of) bug #99.
-
-1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.[ch]: Start of the month view widget.  This will use
-	the generic month item and extend it to have the semantics desired
-	for the gnomecal month view.
-
-	* gnome-month-item.[ch]: New generic canvas item for the month
-	view and the "small calendars".  This is intended to be a
-	high-level display engine for monthly calendars.  This is a work
-	in progress.
-
-	* gnome-cal.h (GnomeCalendar): Added a month_view field.
-
-	* gnome-cal.c (setup_widgets): Create the month view and insert it
-	into the notebook.
-
-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to
-	the sources.
-
-1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (about_calendar_cmd): Use an array of const strings to
-	keep gcc happy.
-
-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
-	* calendar.c (calendar_object_compare_by_start): Likewise.
-	* gncal-full-day.c (child_compare_by_start): Likewise.
-
-1998-07-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: Add support for --view flag.
-	(session_save_state): Save the view mode;
-	(new_calendar): Now takes a view mode flag.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): New
-	function for enhancing the session management support for
-	gnomecal.
-	(gnome_calendar_set_view): New function that makes a given page
-	active.
-
-1998-07-01  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* gncal.desktop: Added Portuguese translation.
-
-Mon Jun 22 13:01:16 1998  Havoc Pennington  <hp@pobox.com>
-
-	* main.c (session_save_state): Use gnome_geometry_string to get
-	the geometry string.
-
-1998-06-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from
-	tm->tm_mday for the default_day.
-
-	* gnome-cal.c (gnome_calendar_new):
-	(gnome_calendar_goto): Use the start of the day -- things expect
-	it to be that way.
-
-1998-05-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in
-	ical->recur->interval from value in spin_button. This ixed an
-	infinnite loop.
-
-1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_draw): Paint the decorations correctly.
-	(child_draw_decor): Paint the recurrence/bell icons correctly.
-
-1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Use the contents of
-	ee->ical->dtstart for computing the predefined values of the recurrence.
-
-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc
-	destruction in the unrealization code and fix the pixmap unrefing.
-
-	* main.c (close_cmd): Remove a bad hack that disabled calendar
-	widget destruction.
-
-	* calobj.c (ical_object_generate_events): Fix for the weekly event
-	generation.  Was reported on the bug tracking system.
-
-1998-05-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_children): Implemented ultra-cool
-	layout for the events that share the same time range.  Gals and
-	guys you can now drop Outlook on the recycle bin.
-
-	Which reminds me.  We do not have a recycle bin.  How could that
-	happen in a project as cool as this one?  Someone explain this to
-	me.
-
-1998-05-18  Federico Mena  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.
-
-Sun May 17 17:55:03 1998  Havoc Pennington  <hp@pobox.com>
-
-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.
-
-1998-05-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the
-	range computation in place.
-
-	* gncal-year-view.c (year_view_mark_day): Use the same new version
-	of the range computation here.
-
-	* calobj.c (ical_object_generate_events): Fix the begin/end
-	condition.
-
-1998-05-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not add the spurious
-	padding.
-
-	* calobj.c (store_date_list): Bug fix:  I was using the wrong
-	pointer when saving the exception date list.
-	(set_date_list): Bug fix:  load correctly the complete exception
-	date list.
-	(set_date_list): Use ',' for the exception date separator as the
-	versit people can not get their standard right.
-
-	* gncal-full-day.c (unrecur_appointment): Support for making an
-	existing recurrent event `movable' for a day.
-
-	* calobj.c (ical_object_add_exdate): New routine, used to add
-	exception dates.
-	(ical_object_duplicate): New routine:  used to do the magic
-	recur->no-recur event.
-
-1998-05-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw
-
-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.
-
-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to
-	avoid the ugly warning.
-
-	* main.c (display_objedit): Default to the day the user is looking
-	at.
-
-1998-05-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value
-	changed signal if the value is the same.
-
-1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Only run the apply code once.
-
-1998-05-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (update): Draw the day at startup.
-	(gncal_day_panel_set): Fix selected-day display.
-	(gncal_day_panel_new): Switch day on double clicks, not on single
-	clicks.
-
-	* calobj.c (ical_object_compute_end): Removed debug messages.
-
-1998-04-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using
-	GnomePropertyDialog.
-
-1998-04-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to
-	fill a gtk_calendar with the events on a GnomeCalendar object.
-
-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day
-	we double clicked.
-
-1998-04-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (calendar_notify): Apply black magic to get mail
-	notifications to work.
-
-	* gncal-full-day.c (child_focus_out): Temporary optimization, the
-	child_focus_out is constantly calling the
-	gnome_calendar_object_changed when the property editor has been
-	invoked.  This happens every time the mouse moves crosses the main
-	window.
-
-	* calendar.c (calendar_object_changed): Reschedule alarms when a
-	calendar object has changed its times.
-
-Sat Apr 25 22:20:45 1998  Havoc Pennington  <hp@pobox.com>
-
-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox
-	out of class structure; use GnomeDialog vbox
-	instead. gnome_dialog_set_destroy instead of destroying in button
-	callbacks. Don't create buttons, separator, or vbox manually.
-	#include <libgnomeui/gnome-dialog.h>.
-
-1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;
-	Load snooze time and snooze count
-
-1998-04-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Actually save the to-do entries.
-
-	* gncal-todo.c (simple_todo_editor): Now you can add and edit
-	to-do entries.
-
-1998-04-22  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: Made it use popup_menu().
-
-	* popup-menu.c: New file with utility functions for creating popup
-	menus.  Maybe such a thing would be useful in libgnomeui, a la
-	gnome-app-helper?
-
-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.
-
-1998-04-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (properties): Added Calendar properties editor.
-	(properties): Make the code use a propery box.
-
-	* main.c: Save/load properties (fix to old commit).
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c: New widget for editing TODO lists.  This will be
-	worked on a lot.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.
-
-	* gncal-day-panel.c: Make it use the new TODO widget.
-
-1998-04-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not save with the global
-	time flag (Z at the end of the isodate).  When we figure out a way
-	to load times in GMT time, we will add this back
-
-	* view-utils.c (popup_menu): Moved this routine here as there are
-	more users of this code.
-
-	* gncal-day-view.c (gncal_day_view_class_init): Add button press
-	handler.
-	(new_appointment): New routine for creating appointments on a day.
-
-
-
-	* main.c (save_ok): Added call to gtk_window_set_wmclass.
-
-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime
-	should substract 1900 and gtk_calendar stores years relative to
-	year 0.
-
-	* gncal-week-view.c (gncal_week_view_new): Make the week view
-	descend from VBox so that we can add a label to it.
-	(gncal_week_view_set): Display the ending day of the week
-	correctly.
-
-	Added a label that displays the week range.
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c: Made it use GncalDayPanel.
-
-	* gncal-day-panel.c: New widget for the day view in the main
-	calendar toplevel.  It basically takes care of everything
-	gnome-cal did by hand with respect to the day view.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to
-	the rules.
-
-	* main.c: Added a separator between the About menu item and the
-	help topics.
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.
-
-1998-04-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New
-	public function that returns the y offset for the row
-	corresponding to the "day begin" time.
-
-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable
-	keystroke (not just Return) will activate the selected range.
-
-	* gncal-full-day.c (paint_back): Made it use the new paint_row
-	function instead of painting everything directly.  We calculate
-	areas in a smarter way so there is even less flicker than before,
-	especially when selecting regions.
-
-	* eventedit.c: Sensitize recurrence widgets properly.
-
-	* calobj.c (duration_callback): Pass the correct pointer type to
-	is_date_in_list().
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (duration_callback): Take exception dates into
-	account.
-
-	* gncal-full-day.c (new_appointment): Setup the event editor dates
-	to those of the currently displayed day.
-	(gncal_full_day_selection_range): Use sensible values in the case
-	no range is selected.
-	(new_appointment): Events now use the current day for event creation.
-
-	* view-utils.c: Pretty up the time display.
-
-	* calobj.c (ical_object_compute_end): Initialize
-	ico->recur->enddate, otherwise we loop forever during final date computation.
-
-	* eventedit.c: Now recurrence is toggled by a radio button in the
-	recurrence page, as the checkbox is confusing.
-
-	* calobj.c (is_date_in_list): Add support for the exclussion
-	dates.
-
-1998-04-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-year-view.c (double_click): Fix this routine as well.
-
-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to
-	the week.
-
-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the
-	proper range.  Now the year view actually matches this year.
-
-	* gnome-cal.html: Added small documentation.
-
-	* main.c: Add more icons to the menus;  Rename some menubar
-	entries;  Add `new' icon to the toolbar.
-	(dump_events): Added argument handling and dumping of events from
-	the command line.  Extremely cool.
-
-	* getdate.y: Taken from the CVS source code.  Used for date
-	parsing in the command line.
-
-	Internationalized getdate.y.  Wee!  It even works with spanish.
-
-	* calobj.c (ical_object_to_vobject): Add Quoted printable property
-	to items containing new lines.
-	(duration): Use unsigned integers, to work around buggy calendar
-	files generated by korganizer.
-
-	* main.c (save_calendar_cmd): Do not ask for file name if we are
-	saving.
-	(save_as_calendar_cmd): New command.
-
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm
-	management framework.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calobj.c (ical_new): Added mandatory status property.
-	(ical_object_to_vobject): Only store "related" list if it exists.
-	(store_list): Add terminating null char and free the correct data.
-
-	* main.c (save_calendar_cmd): Implemented calendar saving.
-	(open_calendar_cmd): Implemented calendar loading.
-	(new_calendar_cmd): Implemented calendar creation.
-	(new_calendar): Don't load our test calendar by default.
-
-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.
-
-	* eventedit.c (ee_store_recur_values_to_ical): Free/create
-	ical's recurrence appropriately.
-	(ee_rp_init_rule): Initialize all missing parameters from ical.
-	(ee_rp_init_ending_date): Initialize missing fields from ical.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_remove_object): Add support for
-	removing objects.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_init_recurrence_page): New function that creates
-	the recurrence page in the toplevel notebook.
-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_generate_events): Implement
-	RECUR_MONTHLY_BY_POS implemented.
-	(ical_object_create_from_vobject): Fix the alarm
-	initialization code.
-	(save_alarm): Save alarms.
-	(ical_object_generate_events): Fixed the recurrent code to take
-	into account the recur->endate field (if at all specified).
-
-	(ical_object_to_vobject): Implement recurrence rule saving.
-
-1998-04-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_store_alarm): Use menu_shell->children, not
-	menu->children.  Why does GtkMenu have a children field in the
-	object structure?
-	(check_dates): New function that insures that start_date < end_date.
-	(check_times): In addition to checking whether the event spans the
-	whole day, now it insures that start_time < end_time.
-
-	* gncal-full-day.c (child_set_size): Now children get bigger
-	temporarily while they are focused.  This allows the handles not
-	to "overlap" the rows used by the child and thus allow editing of
-	very thin events.
-	(recompute_motion): Fix for new child coordinates.
-	(gncal_full_day_expose): Make it use find_child_by_window()
-	instead of looking for it by hand.
-
-	* bell.xpm recur.xpm: XPM files for events with alarm and
-	recurrence, respectively.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.
-
-	* gncal-full-day.c (child_draw): Now children have a vertical
-	handle as well.  This can be used to move the child anytime, not
-	only when it is focused.
-	(recompute_motion): Modified for new drag behavior.
-
-	* eventedit.c (ee_init_general_page): The general_owner may be
-	null.  Do the proper thing when creating the label.
-	(ee_ok): Update the gnome calendar appropriately.
-
-	* timeutil.h:
-	* gncal-year-view.h: Add some missing prototypes.
-
-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu
-	items according to whether the ical object is being edited or not.
-
-	* eventedit.c (event_editor_new): Set the "being edited" flag on
-	the ical object (stored as the ical object's user data).
-	(event_editor_destroy): Release the flag.
-
-	* calobj.h: The iCalObject structure now has a generic user_data pointer.
-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):
-	Functions to set this data.
-
-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.
-
-	* main.c (about_calendar_cmd): Fixed my address and added Arturo
-	to the authors in the about box.
-
-	* gncal-full-day.c (find_child_by_window): Compare child's widget
-	windows by user_data (which will be the parent widget, that is,
-	the text widget).  We cannot assume that child->widget->window
-	will be *the* window we are interested on because there may be
-	child widgets with multiple windows.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_foreach): Define iterator routine.
-
-1998-04-15  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: Now using time_t for new and set.
-	  Random fixes, as well.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_3): New popup menus activated with
-	mouse button 3.
-	(create_appointment): Create a new appointment from the popup
-	menus.  See the FIXME.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows
-	array properly.
-
-	* gncal-year-view.c (gncal_year_view_new): Add missing year in
-	call to strftime.
-
-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks
-	from the return values of versit's fakeCString.
-
-1998-04-14  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: New widget for the year view.
-	* Makefile.am: added required compilation of the new files.
-
-1998-04-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_setup_time_frame): Fixed some table
-	expansions to make the dialog look nicer when resized.
-
-	* calobj.c (ignore_space): Fixed compiler warning about unused
-	computed value.
-	(ocurrencelist): Replace str by p confusion.  Removed unused
-	variables value and q.
-	(daynumber): Fixed a couple of warnings about unused values.
-	(load_recurrence): Removed unused variable c.  Added a default
-	clause to the switch(type).
-
-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.
-	Fixed a compiler warning by adding a missing cast.
-
-	* calobj.c (ical_object_create_from_vobject): Make the
-	load_recurrence() part work correctly.  Eliminated use of
-	syntax_error variable.
-
-1998-04-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_key_press): Unfocus the child and focus
-	the parent fullday widget when the user presses Esc.
-
-	* gncal-week-view.c (gncal_week_view_update): Now takes object and
-	flags parameters.
-	* gncal-day-view.c (gncal_day_view_update): Likewise.
-	* gncal-full-day.c (gncal_full_day_update): Likewise.
-	(child_focus_in): New function.  In conjunction with
-	child_focus_out(), these only display the handles in the child
-	when it is focused.  The result is that the user can see more of
-	the child's text when nothing is focused, and we can also display
-	fatter and nicer drag handles.
-
-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an
-	additional flags parameter
-	(gnome_calendar_update_all): Made function static.  Now takes
-	changed object and flags parameters as well.
-	(gnome_calendar_object_changed): Now takes additional flags
-	parameter to indicate what changed in the specified object.
-
-	* calobj.h (CalObjectChange): New enum with flags to describe what
-	has been changed in an object.
-
-	* gncal-full-day.h:
-	* gncal-full-day.c (gncal_full_day_focus_child): New function to
-	let the outside world decide which child to focus.
-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a
-	click because GtkText will not set the cursor when you focus it.
-
-	* gnome-cal.c (day_view_range_activated): Focus the new child in
-	the full day widget.
-
-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some
-	widgets to make it look prettier.
-	(ee_alarm_widgets): Likewise.
-	(ee_init_general_page): Likewise.
-	(ee_classification_widgets): Likewise.
-	(event_editor_init_widgets): Likewise.
-
-	* gnome-cal.c (day_view_range_activated): Create new object and
-	add it to the calendar.  You can now select a range in the
-	full-day view, hit Return, and a new event will be added at the
-	selected range.  I still have to figure out how to focus this new child.
-
-	* gncal-full-day.c (paint_back): Rewrote function to avoid
-	painting an area more than once -- eliminate flicker.
-	(paint_back_rows): New function that calls paint_back() only for
-	the area of the specified rows.
-	(gncal_full_day_button_press):
-	(gncal_full_day_button_release):
-	(gncal_full_day_motion): Made these functions use
-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!
-
-1998-04-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (setup_day_view): We now connect to the
-	range_activated signal of the fullday widget instead of catching
-	key presses ourselves.
-	(day_view_range_activated): New function that creates a new
-	iCalObject and inserts it into the calendar, not finished yet.
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (get_time_from_rows): New function, calculates
-	a pair of time_t values from the specified start and number of rows.
-
-	* gncal-full-day.h (GncalFullDayClass): New signal
-	"range_activated".  It is emitted when a range is selected and the
-	user hits Return.
-	(gncal_full_day_selection_range): New function, returns the
-	selected range.
-
-	* gncal-full-day.c (struct drag_info): Moved selection information
-	to their own fields instead of sharing the child's drag fields.
-	This allows us to keep the selection when a child is moved.
-	(recompute_motion): Made the case when (row < di->sel_click_row)
-	work correctly.
-
-1998-04-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating
-	on the day view.
-
-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):
-	New time manipulation functions.
-
-	* eventedit.c (ee_rp_init_frequency): Add the different frequency
-	editors to a notebook.  Make the notebook startup on the entry
-	selected recurrence type;
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (recompute_motion): Now we support selecting a
-	range in the main window (by clicking+dragging).  It flickers
-	horribly and is not perfect, but it is a start.
-
-1998-04-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: #include <string.h>
-
-	* gncal-full-day.c (child_map): Show instead of just map the child
-	widget (otherwise the text widget gets confused and will not focus).
-
-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".
-
-	* calobj.h: Added prototype for ical_object_to_vobject().
-
-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This
-	should be called when a calendar object is changed.
-
-	* gncal-full-day.c (update_from_drag_info): Call
-	gnome_calendar_object_changed() instead of updating manually.
-
-	* calendar.c (calendar_add_object):
-	(calendar_remove_object): Set the modified flag to true.
-
-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing
-	this function.
-
-1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.
-
-1998-04-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c: Removed unused global variable parent_class.
-
-	* eventedit.h: Renamed gtk_window field to window.
-	Made the parent_class field in the EventEditorClass structure be a
-	GtkWindowClass, not a gnome property box class.
-	Added prototype for event_editor_get_type().
-
-1998-04-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Use the new
-	gtk_table_set_homogeneous() instead of setting the variable directly.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_create_ae): Make it return void.
-	(ee_alarm_widgets): Remove some unused variables.
-	(ee_store_alarm): Make it return void.
-	#include <string.h>
-
-	* eventedit.h: #include "gnome-cal.h"
-
-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.
-
-	* calendar.h: Add prototype for calendar_load().
-
-	* timeutil.h: Add prototypes for time_add_*().
-
-	* calendar.c:
-	* calobj.c:
-	* eventedit.c:
-	* gnome-cal.c: #include "timeutil.h"
-
-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
-	width equal or larger to the title width.
-
-	* main.c: #include "eventedit.h"
-	(main): Add a return statement.
-	(new_calendar): Show stuff *after* the calendar has been loaded.
-
-	* gnome-cal.c (gnome_calendar_load): Update the day view.
-	(setup_widgets): Hackish setup of a day view widget - will fix later.
-	(gnome_calendar_init): Initialize all fields.
-
-	* gnome-cal.h: Added day_view field.  Maybe this should be changed
-	when the a complete day view panel is complete.
-
-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not
-	before.
-
-1998-04-06  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* versit/.cvsignore: New file.
-
-Fri Apr  3 22:31:54 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* calendar.c: Include <config.h>.
-
-1998-04-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (time_add_year, time_add_year, time_add_week):
-	Routines for time manipulation.
-
-	* calobj.c (ical_object_destroy): Full destruction of the object.
-
-	* eventedit.c: Finished the main event editor form;  It still
-	lacks the details and the recurrence bits.  It now adds events
-	and cancels.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): The "better" format
-	string for strftime() wasn't better, after all :-(
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: New full-day widget.  It is still a work in
-	progress.  It will be similar to M$ Schedule's nifty full day view
-	widget, but with Gtk's elegance :-)
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c: Object editor widget.  We dropped ObjEdit.
-
-	* timeutil.c (time_from_isodate): Fix.
-
-	* view-utils.c (view_utils_draw_events): Changed the display
-	formats.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Use better format
-	specifier for strftime().
-	(view_utils_draw_textured_frame): Ultra-nifty function to draw
-	textured "metal" frames, like Netscape's handles.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_update): Day events are now
-	cached inside the widget.  They get initialized at this time.
-
-	* view-utils.c (view_utils_draw_events): Use the list of events.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization
-	function.  We can't decide on a stupid border type :-)
-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default
-	shadow type.  Looks good.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: New main program that uses our new datatypes and
-	objects.
-
-	* calendar.c (calendar_load_from_vobject, calendar_load):
-	Implement loading of vCalendar objects and vCalendar files.
-
-	* calobj.c (ical_object_create_from_vobject): Implement loading of
-	vCalendar event and todo objects.
-
-	* timeutil.c (isodate_from_time_t): New function.
-
-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
-	from GnomeApp.  It holds all of the day views and arbitrates the
-	display.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.[ch]: New week view composite widget.  This
-	provides a full week view (7 day views plus busy time display --
-	the latter is currently unimplemented).
-
-1998-04-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c: New day view widget.  It is intended to be a
-	child widget of the week view composite widget.
-
-	* calendar.c (calendar_get_objects_in_range):
-	(calendar_get_events_in_range):
-	(calendar_get_journal_in_range):
-	(calendar_get_journal_in_range): These functions now take a
-	sort_func parameter, which is of type GCompareFunc.  If the
-	specified value is non-NULL, it will return a sorted list.
-	Otherwise, it will return an unordered list.
-	(calendar_compare_by_dtstart): Provide a generic sorting routine
-	for calendar objects.
-
-1998-04-01 Miguel de Icaza <miguel@kernel.org>
-
-	* Start from scratch
-
-Tue Mar 31 23:46:50 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* timeutil.c (format_simple_hour): `buf' now static.
-
-1998-03-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes
-	from libgnomeui.
-
-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.
-
-	* timeutil.c (format_simple_hour): New function, formats an
-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",
-	"19h", etc.  It is used by the day view widget for its labels.
-
-1998-03-31 Craig Small <csmall@small.dropbear.id.au>
-
-	* Now has (non working) session maangement
-	* Uses a clist for the dailylist like gtt
-
-Sat Mar 21 15:43:20 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.
-
-1998-03-12  Craig Small <csmall@small.dropbear.id.au>
-
-	* Now linked (in some horrible way) to the gtkcalendar widget.
-
-Sun Mar  8 16:38:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.
-	(gncal_LDADD): Don't include libsupport.a.
-
-	* gncal.c (main): Use new gnome_init.
-
-1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c (main): Added app_id "gncal".
-
-1998-02-19  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'
-
-1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.
-
-	* calcs.c (month_atoi): Replace buggy explicit loop string compare
-	with strcasecmp.
-	(day_atoi): Likewise.
-
-Sun Jan 25 23:38:30 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* menus.c: Replace "Quit" with "Exit".
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
deleted file mode 100644
index 76851cc008..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl gui importers $(CONDUIT_DIR)
-
-EXTRA_DIST =			\
-	ChangeLog.pre-1-4	\
-	zones.h
-
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 7bf53a7aed..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# Calendar Conduit
-privconduit_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c
-
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
-libecalendar_conduit_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la	 			\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-calendar-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-calendar.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index 47b3755ea5..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1908 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#define G_LOG_DOMAIN "ecalconduit"
-
-#include <libecal/e-cal-types.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-#include <e-config-listener.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.6"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-#define PILOT_MAX_ADVANCE 99
-
-typedef struct _ECalLocalRecord ECalLocalRecord;
-typedef struct _ECalConduitCfg ECalConduitCfg;
-typedef struct _ECalConduitGui ECalConduitGui;
-typedef struct _ECalConduitContext ECalConduitContext;
-
-/* Local Record */
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	ECalComponent *comp;
-
-        /* pilot-link appointment structure */
-	struct Appointment *appt;
-};
-
-static void
-calconduit_destroy_record (ECalLocalRecord *local)
-{
-	g_object_unref (local->comp);
-	free_Appointment (local->appt);
-	g_free (local->appt);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _ECalConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	gboolean multi_day_split;
-	
-	gchar *last_uri;
-};
-
-static ECalConduitCfg *
-calconduit_load_configuration (guint32 pilot_id) 
-{
-	ECalConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
- 	gchar prefix[256];
-	
-	c = g_new0 (ECalConduitCfg, 1);
-	g_assert (c != NULL);
-
-	/* Pilot ID */
-	c->pilot_id = pilot_id;
-
-	/* Sync Type */
-	management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->multi_day_split = gnome_config_get_bool ("multi_day_split=TRUE");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix (); 
-
-	return c;
-}
-
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", c->pilot_id);
-	gnome_config_push_prefix (prefix);
-
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_bool ("multi_day_split", c->multi_day_split);
-	gnome_config_set_string ("last_uri", c->last_uri);
-
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->pilot_id = c->pilot_id;
-	retval->sync_type = c->sync_type;
-	retval->secret = c->secret;
-	retval->multi_day_split = c->multi_day_split;
-	retval->last_uri = g_strdup (c->last_uri);
-	
-	return retval;
-}
-
-static void 
-calconduit_destroy_configuration (ECalConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _ECalConduitGui {
-	GtkWidget *multi_day_split;
-};
-
-static ECalConduitGui *
-e_cal_gui_new (EPilotSettings *ps) 
-{
-	ECalConduitGui *gui;
-	GtkWidget *lbl;
-	gint rows;
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (ECalConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Split Multi-Day Events:"));
-	gui->multi_day_split = gtk_check_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-	gtk_table_attach_defaults (GTK_TABLE (ps), gui->multi_day_split, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->multi_day_split);
-	
-	return gui;
-}
-
-static void
-e_cal_gui_fill_widgets (ECalConduitGui *gui, ECalConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui->multi_day_split),
-				      cfg->multi_day_split);
-}
-
-static void
-e_cal_gui_fill_config (ECalConduitGui *gui, ECalConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->multi_day_split = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gui->multi_day_split));
-}
-
-static void
-e_cal_gui_destroy (ECalConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _ECalConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	ECalConduitCfg *cfg;
-	ECalConduitCfg *new_cfg;
-	ECalConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct AppointmentAppInfo ai;
-
-	ECal *client;
-
-	icaltimezone *timezone;
-	ECalComponent *default_comp;
-	GList *comps;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static ECalConduitContext *
-e_calendar_context_new (guint32 pilot_id) 
-{
-	ECalConduitContext *ctxt;
-
-	ctxt = g_new0 (ECalConduitContext, 1);
-	g_assert (ctxt != NULL);
-	
-	ctxt->cfg = calconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-	ctxt->ps = NULL;
-	ctxt->dbi = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->default_comp = NULL;
-	ctxt->comps = NULL;
-	ctxt->changed = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-	
-	return ctxt;
-}
-
-static gboolean
-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		calconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		calconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_cal_gui_destroy (ctxt->gui);
-
-	if (ctxt->client != NULL)
-		g_object_unref (ctxt->client);
- 	if (ctxt->default_comp != NULL)
- 		g_object_unref (ctxt->default_comp);	
-	if (ctxt->comps != NULL) {
-		for (l = ctxt->comps; l; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->comps);
-	}
-	
-	if (ctxt->changed != NULL)
-		e_cal_free_change_list (ctxt->changed);
-	
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_calendar_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			calconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-}
-
-/* Debug routines */
-static char *
-print_local (ECalLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->appt && local->appt->description) {
-		g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-			    mktime (&local->appt->begin),
-			    mktime (&local->appt->end),
-			    local->appt->description ?
-			    local->appt->description : "",
-			    local->appt->note ?
-			    local->appt->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Appointment appt;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
-		    mktime (&appt.begin),
-		    mktime (&appt.end),
-		    appt.description ?
-		    appt.description : "",
-		    appt.note ?
-		    appt.note : "");
-
-	free_Appointment (&appt);
-
-	return buff;
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	char *uri;
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	/* FIXME Need a mechanism for the user to select uri's */
-	/* FIXME Can we use the cal model? */
-	uri = g_strdup_printf ("file://%s/local/Calendar/", g_get_home_dir ());
-	ctxt->client = e_cal_new (uri, CALOBJ_TYPE_EVENT);
-	g_free (uri);
-	
-	if (!ctxt->client)
-		return -1;
-
-	if (!e_cal_open (ctxt->client, FALSE, NULL))
-		return -1;
-
-	return 0;
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (ECal *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)		 
-		 e_cal_get_timezone (client, tzid, &timezone, NULL);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	EConfigListener *listener;
-	icaltimezone *timezone = NULL;
-	char *location;
-
-	listener = e_config_listener_new ();
-
-	location = e_config_listener_get_string_with_default (listener,
-		"/apps/evolution/calendar/display/timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	g_object_unref (listener);
-
-	return timezone;	
-}
-
-
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-calendar-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static icalrecurrencetype_weekday
-get_ical_day (int day) 
-{
-	switch (day) {
-	case 0:
-		return ICAL_SUNDAY_WEEKDAY;
-	case 1:
-		return ICAL_MONDAY_WEEKDAY;
-	case 2:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 3:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 4:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 5:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 6:
-		return ICAL_SATURDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static int
-get_pilot_day (icalrecurrencetype_weekday wd) 
-{
-	switch (wd) {
-	case ICAL_SUNDAY_WEEKDAY:
-		return 0;
-	case ICAL_MONDAY_WEEKDAY:
-		return 1;
-	case ICAL_TUESDAY_WEEKDAY:
-		return 2;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		return 3;
-	case ICAL_THURSDAY_WEEKDAY:
-		return 4;
-	case ICAL_FRIDAY_WEEKDAY:
-		return 5;
-	case ICAL_SATURDAY_WEEKDAY:
-		return 6;
-	default:
-		return -1;
-	}
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static gboolean
-is_all_day (ECal *client, ECalComponentDateTime *dt_start, ECalComponentDateTime *dt_end) 
-{
-	time_t dt_start_time, dt_end_time;
-	icaltimezone *timezone;
-
-	if (dt_start->value->is_date && dt_end->value->is_date)
-		return TRUE;
-	
-	timezone = get_timezone (client, dt_start->tzid);
-	dt_start_time = icaltime_as_timet_with_zone (*dt_start->value, timezone);
-	dt_end_time = icaltime_as_timet_with_zone (*dt_end->value, get_timezone (client, dt_end->tzid));
-
-	if (dt_end_time == time_add_day_with_zone (dt_start_time, 1, timezone))
-		return TRUE;
-
-	return FALSE;
-}
-
-static gboolean
-process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp, GList **multi_ccc)
-{
-	ECalComponentDateTime dt_start, dt_end;
-	icaltimezone *tz_start, *tz_end;
-	time_t event_start, event_end, day_end;
-	struct icaltimetype *old_start_value, *old_end_value;
-	const char *uid;
-	gboolean is_date = FALSE;
-	gboolean last = FALSE;
-	gboolean ret = TRUE;
-
-	*multi_ccc = NULL;
-	*multi_comp = NULL;
-	
-	if (ccc->type == E_CAL_CHANGE_DELETED)
-		return FALSE;
-
-	/* Start time */
-	e_cal_component_get_dtstart (ccc->comp, &dt_start);
-	if (dt_start.value->is_date)
-		tz_start = ctxt->timezone;
-	else
-		tz_start = get_timezone (ctxt->client, dt_start.tzid);
-	event_start = icaltime_as_timet_with_zone (*dt_start.value, tz_start);
-
-	e_cal_component_get_dtend (ccc->comp, &dt_end);
-	if (dt_end.value->is_date)
-		tz_end = ctxt->timezone;
-	else
-		tz_end = get_timezone (ctxt->client, dt_end.tzid);
-	event_end = icaltime_as_timet_with_zone (*dt_end.value, tz_end);
-
-	day_end = time_day_end_with_zone (event_start, ctxt->timezone);			
-	if (day_end >= event_end) {
-		ret = FALSE;
-		goto cleanup;
-	} else if (e_cal_component_has_recurrences (ccc->comp) || !ctxt->cfg->multi_day_split) {
-		ret = TRUE;
-		goto cleanup;
-	}
-
-	if (dt_start.value->is_date && dt_end.value->is_date)
-		is_date = TRUE;
-	
-	old_start_value = dt_start.value;
- 	old_end_value = dt_end.value;
-	while (!last) {
-		ECalComponent *clone = e_cal_component_clone (ccc->comp);
-		char *new_uid = e_cal_component_gen_uid ();
-		struct icaltimetype start_value, end_value;
-		ECalChange *c = g_new0 (ECalChange, 1);
-		
-		if (day_end >= event_end) {
-			day_end = event_end;
-			last = TRUE;
-		}
-
-		e_cal_component_set_uid (clone, new_uid);
-
-		start_value = icaltime_from_timet_with_zone (event_start, is_date, tz_start);
-		dt_start.value = &start_value;
-		e_cal_component_set_dtstart (clone, &dt_start);
-		
-		end_value = icaltime_from_timet_with_zone (day_end, is_date, tz_end);
-		dt_end.value = &end_value;
-		e_cal_component_set_dtend (clone, &dt_end);
-
-		/* FIXME Error handling */
-		e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (clone), NULL, NULL);
-
-		c->comp = clone;
-		c->type = E_CAL_CHANGE_ADDED;
-		
-		*multi_ccc = g_list_prepend (*multi_ccc, c);
-		*multi_comp = g_list_prepend (*multi_comp, g_object_ref (c->comp));
-
-		event_start = day_end;
-		day_end = time_day_end_with_zone (event_start, ctxt->timezone);
-	}
-	dt_start.value = old_start_value;
-	dt_end.value = old_end_value;
-	
-	e_cal_component_get_uid (ccc->comp, &uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	ccc->type = E_CAL_CHANGE_DELETED;
-
- cleanup:
-	e_cal_component_free_datetime (&dt_start);
-	e_cal_component_free_datetime (&dt_end);
-
-	return ret;
-}
-
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert ((pos > 0 && pos <= 5) || (pos == -1));
-
-	return ((abs (pos) * 8) + weekday) * (pos < 0 ? -1 : 1);
-}
-
-static GList *
-next_changed_item (ECalConduitContext *ctxt, GList *changes) 
-{
-	ECalChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		e_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)
-{
-	ECalChange *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 E_CAL_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case E_CAL_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-		
-	case E_CAL_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static gboolean
-rrules_mostly_equal (struct icalrecurrencetype *a, struct icalrecurrencetype *b)
-{
-	struct icalrecurrencetype acopy, bcopy;
-	
-	acopy = *a;
-	bcopy = *b;
-	
-	acopy.until = bcopy.until = icaltime_null_time ();
-	acopy.count = bcopy.count = 0;
-	
-	if (!memcmp (&acopy, &bcopy, sizeof (struct icalrecurrencetype)))
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-find_last_cb (ECalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	time_t *last = data;
-	
-	*last = start;
-
-	return TRUE;
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a ECalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	ECalComponentText summary;
-	GSList *d_list = NULL, *edl = NULL, *l;
-	ECalComponentText *description;
-	ECalComponentDateTime dt_start, dt_end;
-	ECalComponentClassification classif;
-	icaltimezone *default_tz = ctxt->timezone;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	g_object_ref (comp);
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Appointment appt;		
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&appt, 0, sizeof (struct Appointment));
-			unpack_Appointment (&appt, record, 0xffff);
-			local->appt->alarm = appt.alarm;
-			local->appt->advance = appt.advance;
-			local->appt->advanceUnits = appt.advanceUnits;
-			free_Appointment (&appt);
-		}
-	}
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = e_pilot_utf8_to_pchar (summary.value);
-
-	e_cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (ECalComponentText *) d_list->data;
-		if (description && description->value)
-			local->appt->note = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	/* Start/End */
-	e_cal_component_get_dtstart (comp, &dt_start);
-	e_cal_component_get_dtend (comp, &dt_end);
-	if (dt_start.value) {
-		icaltimezone_convert_time (dt_start.value, 
-					   get_timezone (ctxt->client, dt_start.tzid),
-					   default_tz);
-		local->appt->begin = icaltimetype_to_tm (dt_start.value);
-	}
-	
-	if (dt_start.value && dt_end.value) {
-		if (is_all_day (ctxt->client, &dt_start, &dt_end)) {
-			local->appt->event = 1;
-		} else {
-			icaltimezone_convert_time (dt_end.value, 
-						   get_timezone (ctxt->client, dt_end.tzid),
-						   default_tz);
-			local->appt->end = icaltimetype_to_tm (dt_end.value);
-			local->appt->event = 0;
-		}
-	} else {
-		local->appt->event = 1;
-	}
-	e_cal_component_free_datetime (&dt_start);
-	e_cal_component_free_datetime (&dt_end);	
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-
-	if (!e_cal_component_is_instance (comp)) {
-		if (e_cal_component_has_rrules (comp)) {
-			GSList *list;
-			struct icalrecurrencetype *recur;
-		
-			e_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 = 0;
-				local->appt->repeatEnd = icaltimetype_to_tm_with_zone (&recur->until, 
-										       icaltimezone_get_utc_timezone (), 
-										       default_tz);
-			} else if (recur->count > 0) {
-				time_t last = -1;
-				struct icaltimetype itt;
-
-				/* The palm does not support count recurrences */
-				local->appt->repeatForever = 0;
-				e_cal_recur_generate_instances (comp, -1, -1, find_last_cb, &last, 
-							      e_cal_resolve_tzid_cb, ctxt->client, 
-							      default_tz);
-				itt = icaltime_from_timet_with_zone (last, TRUE, default_tz);
-				local->appt->repeatEnd = icaltimetype_to_tm (&itt);
-			} else {
-				local->appt->repeatForever = 1;
-			}
-		
-			e_cal_component_free_recur_list (list);
-		}
-
-		/* Exceptions */
-		e_cal_component_get_exdate_list (comp, &edl);
-		local->appt->exceptions = g_slist_length (edl);
-		local->appt->exception = g_new0 (struct tm, local->appt->exceptions);	
-		for (l = edl, i = 0; l != NULL; l = l->next, i++) {
-			ECalComponentDateTime *dt = l->data;
-
-			icaltimezone_convert_time (dt->value, 
-						   icaltimezone_get_utc_timezone (),
-						   default_tz);
-			*local->appt->exception = icaltimetype_to_tm (dt->value);
-		}
-		e_cal_component_free_exdate_list (edl);
-	}
-	
-	/* Alarm */
-	local->appt->alarm = 0;
-	if (e_cal_component_has_alarms (comp)) {
-		GList *uids, *l;		
-		ECalComponentAlarm *alarm;
-		ECalComponentAlarmTrigger trigger;
-
-		uids = e_cal_component_get_alarm_uids (comp);
-		for (l = uids; l != NULL; l = l->next) {
-			alarm = e_cal_component_get_alarm (comp, l->data);
-			e_cal_component_alarm_get_trigger (alarm, &trigger);
-			
-			if ((trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START
-			     && trigger.u.rel_duration.is_neg)) {
-				local->appt->advanceUnits = advMinutes;
-				local->appt->advance = 
-					trigger.u.rel_duration.minutes
-					+ trigger.u.rel_duration.hours * 60
-					+ trigger.u.rel_duration.days * 60 * 24
-					+ trigger.u.rel_duration.weeks * 7 * 60 * 24;
-
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advHours;
-					local->appt->advance = 
-						trigger.u.rel_duration.minutes / 60
-						+ trigger.u.rel_duration.hours
-						+ trigger.u.rel_duration.days * 24
-						+ trigger.u.rel_duration.weeks * 7 * 24;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE) {
-					local->appt->advanceUnits = advDays;
-					local->appt->advance =
-						trigger.u.rel_duration.minutes / (60 * 24)
-						+ trigger.u.rel_duration.hours / 24
-						+ trigger.u.rel_duration.days
-						+ trigger.u.rel_duration.weeks * 7;
-				}
-				if (local->appt->advance > PILOT_MAX_ADVANCE)
-					local->appt->advance = PILOT_MAX_ADVANCE;
-
-				local->appt->alarm = 1;
-				break;
-			}
-			e_cal_component_alarm_free (alarm);
-		}
-		cal_obj_uid_list_free (uids);
-	}
-	
-	e_cal_component_get_classification (comp, &classif);
-
-	if (classif == E_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)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_assert(local!=NULL);
-
-	if (e_cal_get_object (ctxt->client, uid, NULL, &icalcomp, &error)) {
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			g_object_unref (comp);
-			icalcomponent_free (icalcomp);
-			return;
-		}
-
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else if (error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
-		e_cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else {
-		INFO ("Object did not exist");
-	}
-
-	g_clear_error (&error);
-}
-
-static ECalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 ECalComponent *in_comp,
-			 ECal *client,
-			 icaltimezone *timezone)
-{
-	ECalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;
-	struct icalrecurrencetype recur;
-	ECalComponentText summary = {NULL, NULL};
-	ECalComponentDateTime dt = {NULL, NULL};
-	GSList *edl = NULL;	
-	char *txt;
-	int pos, i;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
-		e_cal_component_set_created (comp, &now);
-	} else {
-		comp = e_cal_component_clone (in_comp);
-	}
-
-	e_cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
-	e_cal_component_set_summary (comp, &summary);
-	free (txt);
-
-	/* The iCal description field */
-	if (!appt.note) {
-		e_cal_component_set_description_list (comp, NULL);
-	} else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (appt.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (appt.event && !is_empty_time (appt.begin)) {
-		it = tm_to_icaltimetype (&appt.begin, TRUE);
-		dt.value = &it;
-		dt.tzid = NULL;
-		e_cal_component_set_dtstart (comp, &dt);
-		e_cal_component_set_dtend (comp, &dt);
-	} else {
-		dt.tzid = icaltimezone_get_tzid (timezone);
-
-		if (!is_empty_time (appt.begin)) {
-			it = tm_to_icaltimetype (&appt.begin, FALSE);
-			dt.value = &it;
-			e_cal_component_set_dtstart (comp, &dt);
-		}
-
-		if (!is_empty_time (appt.end)) {		
-			it = tm_to_icaltimetype (&appt.end, FALSE);
-			dt.value = &it;
-			e_cal_component_set_dtend (comp, &dt);
-		}
-	}
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-
-	switch (appt.repeatType) {
-	case repeatNone:
-		recur.freq = ICAL_NO_RECURRENCE;
-		break;
-
-	case repeatDaily:
-		recur.freq = ICAL_DAILY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-
-	case repeatWeekly:
-		recur.freq = ICAL_WEEKLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-
-		pos = 0;
-		for (i = 0; i < 7; i++) {
-			if (appt.repeatDays[i])
-				recur.by_day[pos++] = get_ical_day (i);
-		}
-		
-		break;
-
-	case repeatMonthlyByDay:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		if (appt.repeatDay < domLastSun)
-			recur.by_day[0] = nth_weekday ((appt.repeatDay / 7) + 1, 
-						       get_ical_day (appt.repeatDay % 7));
-		else
-			recur.by_day[0] = nth_weekday (-1, get_ical_day (appt.repeatDay % 7));		
-		break;
-		
-	case repeatMonthlyByDate:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_month_day[0] = appt.begin.tm_mday;
-		break;
-
-	case repeatYearly:
-		recur.freq = ICAL_YEARLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-		
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (recur.freq != ICAL_NO_RECURRENCE) {
-		GSList *list = NULL, *existing;
-		struct icalrecurrencetype *erecur;
-		
-		/* recurrence start of week */
-		recur.week_start = get_ical_day (appt.repeatWeekstart);
-
-		if (!appt.repeatForever) {
-			recur.until = tm_to_icaltimetype (&appt.repeatEnd, TRUE);	
-		}
-
-		list = g_slist_append (list, &recur);
-		e_cal_component_set_rrule_list (comp, list);
-
-		/* If the desktop uses count and rrules are
-		 * equivalent, use count still on the desktop */
-		if (!appt.repeatForever && e_cal_component_has_rrules (in_comp)) {
-			e_cal_component_get_rrule_list (in_comp, &existing);
-			erecur = existing->data;
-			
-			/* If the rules are otherwise the same and the existing uses count, 
-			   see if they end at the same point */
-			if (rrules_mostly_equal (&recur, erecur) && 
-			    icaltime_is_null_time (erecur->until) && erecur->count > 0) {
-				time_t last, elast;
-				
-				e_cal_recur_generate_instances (comp, -1, -1, find_last_cb, &last, 
-							      e_cal_resolve_tzid_cb, client,
-							      timezone);
-				e_cal_recur_generate_instances (in_comp, -1, -1, find_last_cb, &elast, 
-							      e_cal_resolve_tzid_cb, client, 
-							      timezone);
-
-				
-				if (last == elast) {
-					recur.until = icaltime_null_time ();
-					recur.count = erecur->count;
-					e_cal_component_set_rrule_list (comp, list);
-				}
-			}
-		}
-
-		g_slist_free (list);
-	} else {
-		e_cal_component_set_rrule_list (comp, NULL);		
-	}
-
-	/* Exceptions */
-	for (i = 0; i < appt.exceptions; i++) {
-		struct tm ex;
-		ECalComponentDateTime *dt = g_new0 (ECalComponentDateTime, 1);
-
-		dt->value = g_new0 (struct icaltimetype, 1);
-		dt->tzid = NULL;		
-		
-		ex = appt.exception[i];
-		*dt->value = tm_to_icaltimetype (&ex, TRUE);
-		
-		edl = g_slist_prepend (edl, dt);
-	}
-	e_cal_component_set_exdate_list (comp, edl);
-	e_cal_component_free_exdate_list (edl);
-
-	/* Alarm */
-	if (appt.alarm) {
-		ECalComponentAlarm *alarm = NULL;
-		ECalComponentAlarmTrigger trigger;
-		gboolean found = FALSE;
-		
-		if (e_cal_component_has_alarms (comp)) {
-			GList *uids, *l;
-			
-			uids = e_cal_component_get_alarm_uids (comp);
-			for (l = uids; l != NULL; l = l->next) {
-				alarm = e_cal_component_get_alarm (comp, l->data);
-				e_cal_component_alarm_get_trigger (alarm, &trigger);
-				if ((trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START
-				     && trigger.u.rel_duration.is_neg)) {
-					found = TRUE;
-					break;
-				}
-				e_cal_component_alarm_free (alarm);
-			}
-			cal_obj_uid_list_free (uids);
-		}
-		if (!found)
-			alarm = e_cal_component_alarm_new ();
-
-		memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-		trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-		trigger.u.rel_duration.is_neg = 1;
-		switch (appt.advanceUnits) {
-		case advMinutes:
-			trigger.u.rel_duration.minutes = appt.advance;
-			break;
-		case advHours:
-			trigger.u.rel_duration.hours = appt.advance;
-			break;
-		case advDays:
-			trigger.u.rel_duration.days = appt.advance;
-			break;
-		}
-		e_cal_component_alarm_set_trigger (alarm, trigger);
-		e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-		if (!found)
-			e_cal_component_add_alarm (comp, alarm);
-		e_cal_component_alarm_free (alarm);
-	}
-	
-	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->secret)
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PUBLIC);
-
-	e_cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_cal_get_uri (ctxt->client);
-	LOG (g_message ( "  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>" ));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-	
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *removed = NULL, *added = NULL, *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	icalcomponent *icalcomp;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
-
-	ctxt->dbi = dbi;	
-	ctxt->client = NULL;
-
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG (g_message ( "  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
-	
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone) {
-		if (!e_cal_set_default_timezone (ctxt->client, ctxt->timezone, NULL))
-			return -1;
-	}
-
-	/* Get the default component */
-	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
-		return -1;
-
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		return -1;
-	}
-
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		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 */
-	if (!e_cal_get_object_list_as_comp (ctxt->client, "(#t)", &ctxt->comps, NULL))
-		return -1;
-
-	/* Find the added, modified and deleted items */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	if (!e_cal_get_changes (ctxt->client, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	/* See if we need to split up any events */
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		GList *multi_comp = NULL, *multi_ccc = NULL;
-		
-		if (process_multi_day (ctxt, ccc, &multi_comp, &multi_ccc)) {
-			ctxt->comps = g_list_concat (ctxt->comps, multi_comp);
-			
-			added = g_list_concat (added, multi_ccc);
-			removed = g_list_prepend (removed, ccc);
-		}
-	}
-
-	/* Remove the events that were split up */
-	g_list_concat (ctxt->changed, added);
-	for (l = removed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) {
-			ctxt->changed = g_list_remove (ctxt->changed, ccc);
-			g_object_unref (ccc->comp);
-			g_free (ccc);
-		}
-	}
-	g_list_free (removed);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-		
-		e_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 E_CAL_CHANGE_ADDED:
-				add_records++;
-				break;
-			case E_CAL_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case E_CAL_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == E_CAL_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-	
-	/* Set the count information */
-	num_records = g_list_length (ctxt->comps);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG (g_message ( "post_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_cal_get_uri (ctxt->client));
-	calconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
-		e_cal_free_change_list (changed);
-	g_free (change_id);
-	
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_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 (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	e_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 *comps, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		comps = ctxt->comps;
-		count = 0;
-		
-		if (comps != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (comps)));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			iterator = comps;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash) ));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			ECalChange *ccc = iterator->data;
-		
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			ECalChange *ccc = iterator->data;
-			
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "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 (g_message ("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 (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    ECalConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->client, ctxt->timezone);
-
-	/* Give it a new UID otherwise it will be the uid of the default comp */
-	uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (comp, uid);
-	
-	if (!e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (comp), NULL, NULL))
-		return -1;
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	g_free (uid);	
-
-	g_object_unref (comp);
-	
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	ECalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-			print_local (local), print_remote (remote)));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->client, ctxt->timezone);
-	g_object_unref (local->comp);
-	local->comp = new_comp;
-
-	if (!e_cal_modify_object (ctxt->client, e_cal_component_get_icalcomponent (new_comp), 
-				       CALOBJ_MOD_ALL, NULL))
-		return -1;
-
-	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);
-
-	e_cal_component_get_uid (local->comp, &uid);
-
-	LOG (g_message ( "delete_record: deleting %s\n", uid ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	
-        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 (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_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 (g_message ("match: looking for local copy of %s\n",
-			print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  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 (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	calconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (ECalConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_cal_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-
-	ctxt->ps = e_pilot_settings_new ();
-	ctxt->gui = e_cal_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "save_settings" ));
-
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_cal_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	calconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	calconduit_save_configuration (ctxt->cfg);
-	calconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = calconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	ctxt = e_calendar_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	/* Sync signals */
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	ECalConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (obj, "calconduit_context");
-	e_calendar_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 6ddcf5761a..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="@privconduitdir@/libecalendar_conduit.so"/>
-	<name value="ECalendar"/>
-	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 3ee063c770..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo-conduit-control-applet.desktop
-e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index 15e7a81f84..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# ToDo Conduit
-privconduit_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = 	\
-	todo-conduit.c
-
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
-libetodo_conduit_la_LIBADD = 						\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-todo-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-todo.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 3b02058c91..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="@privconduitdir@/libetodo_conduit.so"/>
-	<name value="EToDo"/>
-	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index fe5684252b..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1413 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#define G_LOG_DOMAIN "etodoconduit"
-
-#include <libecal/e-cal-types.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-todo.h>
-#include <libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-#include <e-config-listener.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.4"
-
-#define DEBUG_TODOCONDUIT 1
-/* #undef DEBUG_TODOCONDUIT */
-
-#ifdef DEBUG_TODOCONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif 
-
-#define WARN g_warning
-#define INFO g_message
-
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-typedef struct _EToDoConduitGui EToDoConduitGui;
-typedef struct _EToDoConduitContext EToDoConduitContext;
-
-/* Local Record */
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	ECalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct ToDo *todo;
-};
-
-static void
-todoconduit_destroy_record (EToDoLocalRecord *local) 
-{
-	g_object_unref (local->comp);
-	free_ToDo (local->todo);
-	g_free (local->todo);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _EToDoConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	gboolean secret;
-	gint priority;
-
-	gchar *last_uri;
-};
-
-static EToDoConduitCfg *
-todoconduit_load_configuration (guint32 pilot_id) 
-{
-	EToDoConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EToDoConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-
-	management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-	
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->priority = gnome_config_get_int ("priority=3");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_int ("priority", c->priority);
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	retval->secret = c->secret;
-	retval->priority = c->priority;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EToDoConduitGui {
-	GtkWidget *priority;
-};
-
-static EToDoConduitGui *
-e_todo_gui_new (EPilotSettings *ps) 
-{
-	EToDoConduitGui *gui;
-	GtkWidget *lbl;
-	GtkObject *adj;
-	gint rows;
-	
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EToDoConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Priority:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	adj = gtk_adjustment_new (1, 1, 5, 1, 5, 5);
-	gui->priority = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gui->priority), TRUE);
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->priority, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->priority);
-	
-	return gui;
-}
-
-static void
-e_todo_gui_fill_widgets (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gui->priority), cfg->priority);
-}
-
-static void
-e_todo_gui_fill_config (EToDoConduitGui *gui, EToDoConduitCfg *cfg) 
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->priority = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (gui->priority));
-}
-
-static void
-e_todo_gui_destroy (EToDoConduitGui *gui) 
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EToDoConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EToDoConduitCfg *cfg;
-	EToDoConduitCfg *new_cfg;
-	EToDoConduitGui *gui;
-	GtkWidget *ps;
-	
-	struct ToDoAppInfo ai;
-
-	ECal *client;
-
-	icaltimezone *timezone;
-	ECalComponent *default_comp;
-	GList *comps;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static EToDoConduitContext *
-e_todo_context_new (guint32 pilot_id) 
-{
-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);
-
-	ctxt->cfg = todoconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->default_comp = NULL;
-	ctxt->comps = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static gboolean
-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-	
-	return TRUE;
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		todoconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_todo_gui_destroy (ctxt->gui);
-	
-	if (ctxt->client != NULL)
-		g_object_unref (ctxt->client);
-
-	if (ctxt->default_comp != NULL)
-		g_object_unref (ctxt->default_comp);
-	if (ctxt->comps != NULL) {
-		for (l = ctxt->comps; l; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->comps);
-	}
-
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_todo_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			todoconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->changed != NULL)
-		e_cal_free_change_list (ctxt->changed);
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EToDoLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->todo && local->todo->description) {
-		g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-			    local->todo->indefinite,
-			    mktime (& local->todo->due),
-			    local->todo->priority,
-			    local->todo->complete,
-			    local->todo->description ?
-			    local->todo->description : "",
-			    local->todo->note ?
-			    local->todo->note : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct ToDo todo;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
-		    todo.indefinite,
-		    mktime (&todo.due),
-		    todo.priority,
-		    todo.complete,
-		    todo.description ?
-		    todo.description : "",
-		    todo.note ?
-		    todo.note : "");
-
-	free_ToDo (&todo);
-	
-	return buff;
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	char *uri;
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	/* FIXME Need a mechanism for the user to select uri's */
-	/* FIXME Can we use the cal model? */
-	uri = g_strdup_printf ("file://%s/local/Tasks/", g_get_home_dir ());
-	ctxt->client = e_cal_new (uri, CALOBJ_TYPE_TODO);
-	g_free (uri);
-	
-	if (!ctxt->client)
-		return -1;
-
-	if (!e_cal_open (ctxt->client,  FALSE, NULL))
-		return -1;
-
-	return 0;
-}
-
-/* Utility routines */
-static icaltimezone *
-get_timezone (ECal *client, const char *tzid) 
-{
-	icaltimezone *timezone = NULL;
-
-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (timezone == NULL)
-		 e_cal_get_timezone (client, tzid, &timezone, NULL);
-	
-	return timezone;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	EConfigListener *listener;
-	icaltimezone *timezone = NULL;
-	char *location;
-
-	listener = e_config_listener_new ();
-
-	location = e_config_listener_get_string_with_default (listener,
-		"/apps/evolution/calendar/display/timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	g_object_unref (listener);
-
-	return timezone;	
-}
-
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Tasks/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static GList *
-next_changed_item (EToDoConduitContext *ctxt, GList *changes) 
-{
-	ECalChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		e_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)
-{
-	ECalChange *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 E_CAL_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case E_CAL_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_CAL_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a ECalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	icalproperty_status status;
-	ECalComponentText summary;
-	GSList *d_list = NULL;
-	ECalComponentText *description;
-	ECalComponentDateTime due;
-	ECalComponentClassification classif;
-	icaltimezone *default_tz = get_default_timezone ();
-	
-	LOG (g_message ( "local_record_from_comp\n" ));
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	g_object_ref (comp);
-
-	e_cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* Don't overwrite the category */
-	if (local->local.ID != 0) {
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;			
-		}
-	}
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	e_cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = e_pilot_utf8_to_pchar (summary.value);
-
-	e_cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (ECalComponentText *) 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;
-	}
-
-	e_cal_component_get_due (comp, &due);	
-	if (due.value) {
-		icaltimezone_convert_time (due.value,
-					   get_timezone (ctxt->client, due.tzid),
-					   default_tz);
-		local->todo->due = icaltimetype_to_tm (due.value);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-	e_cal_component_free_datetime (&due);	
-
-	e_cal_component_get_status (comp, &status);	
-	if (status == ICAL_STATUS_COMPLETED)
-		local->todo->complete = 1;
-	else
-		local->todo->complete = 0;
-	
-	e_cal_component_get_priority (comp, &priority);
-	if (priority && *priority != 0) {
-		if (*priority <= 3)
-			local->todo->priority = 1;
-		else if (*priority == 4)
-			local->todo->priority = 2;
-		else if (*priority == 5)
-			local->todo->priority = 3;
-		else if (*priority <= 7)
-			local->todo->priority = 4;
-		else
-			local->todo->priority = 5;
-		
-		e_cal_component_free_priority (priority);
-	} else {
-		local->todo->priority = ctxt->cfg->priority;
-	}	
-	
-	e_cal_component_get_classification (comp, &classif);
-
-	if (classif == E_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)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_assert(local!=NULL);
-
-	if (e_cal_get_object (ctxt->client, uid, NULL, &icalcomp, &error)) {
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			g_object_unref (comp);
-			icalcomponent_free (icalcomp);
-			return;
-		}
-
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else if (error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
-		e_cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else {
-		INFO ("Object did not exist");
-	}
-
-	g_clear_error (&error);
-}
-
-
-static ECalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 ECalComponent *in_comp,
-			 icaltimezone *timezone)
-{
-	ECalComponent *comp;
-	struct ToDo todo;
-	ECalComponentText summary = {NULL, NULL};
-	ECalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};
-	struct icaltimetype due, now;
-	icaltimezone *utc_zone;
-	int priority;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-					     utc_zone);
-
-	if (in_comp == NULL) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
-		e_cal_component_set_created (comp, &now);
-	} else {
-		comp = e_cal_component_clone (in_comp);
-	}
-
-	e_cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
-	e_cal_component_set_summary (comp, &summary);
-	free (txt);
-	
-	/* The iCal description field */
-	if (!todo.note) {
-		e_cal_component_set_comment_list (comp, NULL);
-	} else {
-		GSList l;
-		ECalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (todo.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (todo.complete) {
-		int percent = 100;
-
-		e_cal_component_set_completed (comp, &now);
-		e_cal_component_set_percent (comp, &percent);
-		e_cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
-	} else {
-		int *percent = NULL;
-		icalproperty_status status;
-		
-		e_cal_component_set_completed (comp, NULL);
-		
-		e_cal_component_get_percent (comp, &percent);
-		if (percent == NULL || *percent == 100) {
-			int p = 0;
-			e_cal_component_set_percent (comp, &p);
-		}
-		if (percent != NULL)
-			e_cal_component_free_percent (percent);
-
-		e_cal_component_get_status (comp, &status);
-		if (status == ICAL_STATUS_COMPLETED)
-			e_cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
-	}
-
-	if (!is_empty_time (todo.due)) {
-		due = tm_to_icaltimetype (&todo.due, TRUE);
-		dt.value = &due;
-		e_cal_component_set_due (comp, &dt);
-	}
-
-	switch (todo.priority) {
-	case 1:
-		priority = 3;
-		break;
-	case 2:
-		priority = 4;
-		break;
-	case 3:
-		priority = 5;
-		break;
-	case 4:
-		priority = 7;
-		break;
-	default:
-		priority = 9;
-	}
-	
-	e_cal_component_set_priority (comp, &priority);
-	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->secret)
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PUBLIC);
-
-	e_cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are no objects or objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_cal_get_uri (ctxt->client);
-	LOG (g_message ( "  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>" ));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    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;
-	icalcomponent *icalcomp;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION ));
-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->dbi = dbi;	
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG (g_message ( "  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
-
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone) {
-		if (!e_cal_set_default_timezone (ctxt->client, ctxt->timezone, NULL))
-			return -1;		
-	}
-
-	/* Get the default component */
-	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
-		return -1;
-
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		return -1;
-	}
-
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		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 */
-	if (!e_cal_get_object_list_as_comp (ctxt->client, "(#t)", &ctxt->comps, NULL))
-		return -1;
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	if (!e_cal_get_changes (ctxt->client, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-		
-		e_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 E_CAL_CHANGE_ADDED:
-				add_records++;
-				break;
-			case E_CAL_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case E_CAL_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == E_CAL_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-
-	/* Set the count information */
-	num_records = g_list_length (ctxt->comps);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-
-	LOG (g_message ( "post_sync: ToDo Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_cal_get_uri (ctxt->client));
-	todoconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
-		e_cal_free_change_list (changed);
-	g_free (change_id);
-	
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_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 (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	e_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 *comps, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		comps = ctxt->comps;
-		count = 0;
-		
-		if (comps != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (comps)));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-			
-			iterator = comps;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "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 (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash) ));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			ECalChange *ccc = iterator->data;
-		
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			ECalChange *ccc = iterator->data;
-			
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);			
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "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 (g_message ("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 (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EToDoConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone);
-
-	/* Give it a new UID otherwise it will be the uid of the default comp */
-	uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (comp, uid);
-
-	if (!e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (comp), NULL, NULL))
-		return -1;
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	g_object_unref (comp);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	ECalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-			print_local (local), print_remote (remote)));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone);
-	g_object_unref (local->comp);
-	local->comp = new_comp;
-
-	if (!e_cal_modify_object (ctxt->client, e_cal_component_get_icalcomponent (new_comp), 
-				       CALOBJ_MOD_ALL, NULL))
-		return -1;
-
-	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);
-
-	e_cal_component_get_uid (local->comp, &uid);
-
-	LOG (g_message ( "delete_record: deleting %s\n", uid ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	
-        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 (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_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 (g_message ("match: looking for local copy of %s\n",
-			print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  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 (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	todoconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EToDoConduitContext *ctxt)
-{
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_todo_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-
-	ctxt->ps = e_pilot_settings_new ();
-	ctxt->gui = e_todo_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "save_settings" ));
-
-	ctxt->new_cfg->secret = e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_todo_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-	
-	todoconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	todoconduit_save_configuration (ctxt->cfg);
-	todoconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = todoconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-
-	ctxt = e_todo_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	EToDoConduitContext *ctxt;
-	
-	ctxt = gtk_object_get_data (obj, "todoconduit_context");
-	e_todo_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index a2cee3711f..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,25 +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
-e-calendar-marshal.h
-e-calendar-marshal.c
-*.lo
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
-Evolution-Composer-common.c
-Evolution-Composer-skels.c
-Evolution-Composer-stubs.c
-Evolution-Composer.h
-GNOME_Evolution_Calendar*.server
-GNOME_Evolution_Calendar*.server.in
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
deleted file mode 100644
index cee3a6a103..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ /dev/null
@@ -1,146 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR@/libevolution-calendar.so">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar and Tasks"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<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 scheduling message viewer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="calendar"/>
-
-	<oaf_attribute name="name" type="string" _value="Evolution's Calendar component"/>
-
-	<oaf_attribute name="evolution:button_label" type="string" _value="Calendars"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="evolution-calendar.png"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:@VERSION@"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-	               _value="Evolution Calendar viewer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="tasks"/>
-
-	<oaf_attribute name="name" type="string" _value="Evolution's Tasks component"/>
-
-	<oaf_attribute name="evolution:button_label" type="string" _value="Tasks"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="evolution-tasks.png"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/tasks-control:@VERSION@"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-	               _value="Evolution Tasks viewer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:@VERSION@"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar/Task editor"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		       _value="Calendar and Tasks"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		       _value="Configure your timezone, Calendar and Task List here "/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		       value="evolution-calendar.png"/>
-
-	<oaf_attribute name="evolution2:config_item:type" type="stringv">
-		<item value="calendar"/>
-		<item value="tasks"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Calendar configuration control"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index bdb5f454fa..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,261 +0,0 @@
-## CORBA stuff
-
-IDLS =												   	\
-	$(top_srcdir)/composer/Evolution-Composer.idl						  	\
-	$(top_srcdir)/calendar/idl/evolution-calendar.idl						\
-	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-CALENDAR_IDL_GENERATED_H =              		\
-	evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =		\
-	evolution-calendar-common.c	\
-	evolution-calendar-skels.c	\
-	evolution-calendar-stubs.c
-CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
-
-$(CALENDAR_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
-
-# Message composer IDL files
-
-COMPOSER_IDL_GENERATED_H = \
-        Evolution-Composer.h
-COMPOSER_IDL_GENERATED_C =             			\
-        Evolution-Composer-common.c       		\
-        Evolution-Composer-skels.c        		\
-        Evolution-Composer-stubs.c
-COMPOSER_IDL_GENERATED = $(COMPOSER_IDL_GENERATED_C) $(COMPOSER_IDL_GENERATED_H)
-
-$(COMPOSER_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(srcdir)/../../composer/Evolution-Composer.idl
-$(COMPOSER_IDL_GENERATED_C): $(COMPOSER_IDL_GENERATED_H)
-
-# SelectNames IDL files
-
-SELECT_NAMES_IDL_GENERATED_H =              		\
-	Evolution-Addressbook-SelectNames.h
-SELECT_NAMES_IDL_GENERATED_C =                 		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c
-SELECT_NAMES_IDL_GENERATED = $(SELECT_NAMES_IDL_GENERATED_C) $(SELECT_NAMES_IDL_GENERATED_H)
-
-$(SELECT_NAMES_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
-
-
-IDL_GENERATED = $(CALENDAR_IDL_GENERATED) $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED)
-
-# The marshallers
-MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h
-@EVO_MARSHAL_RULE@
-
-SUBDIRS = alarm-notify dialogs
-
-component_LTLIBRARIES = libevolution-calendar.la
-
-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)/widgets				\
-	-I$(top_srcdir)/a11y/calendar			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-glade_DATA = 					\
-	e-itip-control.glade			\
-	goto-dialog.glade
-
-etspec_DATA =				\
-	e-calendar-table.etspec		\
-	e-meeting-time-sel.etspec	\
-	e-cal-list-view.etspec
-
-libevolution_calendar_la_SOURCES =		\
-	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
-	cal-search-bar.c			\
-	cal-search-bar.h			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-config-keys.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-component.c			\
-	calendar-component.h			\
-	calendar-offline-handler.c		\
-	calendar-offline-handler.h		\
-	calendar-view.c				\
-	calendar-view.h				\
-	calendar-view-factory.c			\
-	calendar-view-factory.h			\
-	comp-editor-factory.c			\
-	comp-editor-factory.h			\
-	comp-util.c				\
-	comp-util.h				\
-	control-factory.c			\
-	control-factory.h			\
-	e-alarm-list.c				\
-	e-alarm-list.h				\
-	e-cal-model-calendar.c			\
-	e-cal-model-calendar.h			\
-	e-cal-model-tasks.c			\
-	e-cal-model-tasks.h			\
-	e-cal-model.c				\
-	e-cal-model.h				\
-	e-cal-view.c				\
-	e-cal-view.h				\
-	e-cal-list-view.c			\
-	e-cal-list-view.h			\
-	e-cal-list-view-config.c		\
-	e-cal-list-view-config.h		\
-	e-calendar-table.c			\
-	e-calendar-table.h			\
-	e-calendar-table-config.c		\
-	e-calendar-table-config.h		\
-	e-cell-date-edit-config.c		\
-	e-cell-date-edit-config.h		\
-	e-cell-date-edit-text.h			\
-	e-cell-date-edit-text.c			\
-	e-comp-editor-registry.c		\
-	e-comp-editor-registry.h		\
-	e-date-edit-config.c			\
-	e-date-edit-config.h			\
-	e-date-time-list.c                      \
-	e-date-time-list.h                      \
-	e-day-view-config.c			\
-	e-day-view-config.h			\
-	e-day-view-layout.c			\
-	e-day-view-layout.h			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	e-meeting-attendee.c			\
-	e-meeting-attendee.h			\
-	e-meeting-list-view.c			\
-	e-meeting-list-view.h			\
-	e-meeting-store.c			\
-	e-meeting-store.h			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-types.h			\
-	e-meeting-utils.c			\
-	e-meeting-utils.h			\
-	e-mini-calendar-config.c		\
-	e-mini-calendar-config.h		\
-	e-select-names-editable.c		\
-	e-select-names-editable.h		\
-	e-select-names-renderer.c		\
-	e-select-names-renderer.h		\
-	e-week-view-config.c			\
-	e-week-view-config.h			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-layout.c			\
-	e-week-view-layout.h			\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	e-tasks.c				\
-	e-tasks.h				\
-	e-timezone-entry.c			\
-	e-timezone-entry.h			\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	goto.c					\
-	goto.h					\
-	itip-bonobo-control.c			\
-	itip-bonobo-control.h			\
-	itip-utils.c				\
-	itip-utils.h				\
-	main.c					\
-	migration.c				\
-	migration.h				\
-	misc.c					\
-	misc.h					\
-	print.c					\
-	print.h					\
-	tag-calendar.c				\
-	tag-calendar.h				\
-	tasks-component.c			\
-	tasks-component.h			\
-	tasks-control.c				\
-	tasks-control.h				\
-	weekday-picker.c			\
-	weekday-picker.h
-
-libevolution_calendar_la_LIBADD =					\
-	$(top_builddir)/widgets/menus/libmenus.la			\
-	$(top_builddir)/shell/libeshell.la				\
-	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
-	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la	\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-libevolution_calendar_la_LDFLAGS = -avoid-version -module
-
-server_in_files = GNOME_Evolution_Calendar.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-EXTRA_DIST =	 			\
-	e-calendar-marshal.list		\
-	$(glade_DATA)			\
-	$(schema_DATA)                  \
-	$(etspec_DATA)			\
-	$(server_in_files)
-
-BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-install-data-local:
-	$(mkinstalldirs) $(Conduitsdir); \
-	if test -z "$(DESTDIR)"; then \
-		for p in $(schema_DATA); do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
-		done; \
-	fi
-
-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 d940a07146..0000000000
--- a/calendar/gui/alarm-notify/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-alarm-notify
-GNOME_Evolution_Calendar_AlarmNotify*.server
-GNOME_Evolution_Calendar_AlarmNotify*.server.in
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
deleted file mode 100644
index 3c43c4ca54..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify:@VERSION@"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-alarm-notify">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar 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 e5653e4433..0000000000
--- a/calendar/gui/alarm-notify/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-CORBA_GENERATED_H =				\
-	evolution-calendar.h
-CORBA_GENERATED_C =				\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H)
-
-idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-idl_flags = $(IDL_INCLUDES) 
-
-$(CORBA_GENERATED_H): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
-
-
-privlibexec_PROGRAMS = evolution-alarm-notify
-
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-glade_DATA =		\
-	alarm-notify.glade
-
-evolution_alarm_notify_SOURCES =	\
-	$(CORBA_GENERATED)		\
-	alarm.c				\
-	alarm.h				\
-	alarm-notify.c			\
-	alarm-notify.h			\
-	alarm-notify-dialog.c		\
-	alarm-notify-dialog.h		\
-	alarm-queue.c			\
-	alarm-queue.h			\
-	config-data.c			\
-	config-data.h			\
-	notify-main.c			\
-	save.c				\
-	save.h				\
-	util.c				\
-	util.h
-
-evolution_alarm_notify_LDADD =						\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-EXTRA_DIST =			\
-	$(server_in_files)	\
-	$(glade_DATA)
-
-BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(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 e7c87c2156..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
-#if 0 
-#  include <libgnomeui/gnome-winhints.h>
-#endif
-#include <libgnomeui/gnome-window-icon.h>
-#include <glade/glade.h>
-#include <e-util/e-time-utils.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <libecal/e-cal-time-util.h>
-#include "alarm-notify-dialog.h"
-#include "config-data.h"
-#include "util.h"
-
-
-GtkWidget *make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow);
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *snooze_time;
-	GtkWidget *html;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_object_unref (an->xml);
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
-{
-
-	if (!strncmp ("file:///", url, strlen ("file:///"))) {
-		FILE *fp;
-		const char *filename = url + strlen ("file://");
-		char buf[4096];
-		size_t len;
-
-		fp = fopen (filename, "r");
-
-		if (fp == NULL) {
-			g_warning ("Error opening image: %s\n", url);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-			return;
-		}
-
-		while ((len = fread (buf, 1, sizeof(buf), fp)) > 0)
-			gtk_html_stream_write (stream, buf, len);
-
-		if (feof (fp)) {
-			fclose (fp);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-			return;
-		}
-
-		fclose (fp);
-	}
-
-	g_warning ("Error loading image");
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-	return;
-}
-
-GtkWidget *
-make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow)
-{
-	GtkWidget *html, *scrolled_window;
-
-	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
-
-	html = gtk_html_new();
-
-	gtk_html_set_default_content_type (GTK_HTML (html),
-					   "charset=utf-8");
-	gtk_html_load_empty (GTK_HTML (html));
-
-	g_signal_connect (html, "url_requested",
-			  G_CALLBACK (url_requested_cb),
-			  NULL);
-
-	gtk_widget_pop_colormap();
-
-	scrolled_window = gtk_scrolled_window_new(NULL, NULL);
-
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
-				       GTK_POLICY_AUTOMATIC,
-				       GTK_POLICY_AUTOMATIC);
-
-
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-					     GTK_SHADOW_IN);
-
-	gtk_widget_set_size_request (scrolled_window, 300, 200);
-
-	gtk_container_add(GTK_CONTAINER (scrolled_window), html);
-
-	gtk_widget_show_all(scrolled_window);
-
-	g_object_set_data (G_OBJECT (scrolled_window), "html", html);
-	return scrolled_window;
-}
-
-static void
-write_times (GtkHTMLStream *stream, char *start, char *end)
-{
-	if (start)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Starting:"), start);
-	if (end)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Ending:"), end);
-
-}
-
-/* Creates a heading for the alarm notification dialog */
-static void
-write_html_heading (GtkHTMLStream *stream, const char *message,
-		    ECalComponentVType vtype, time_t occur_start, time_t occur_end)
-{
-	char *buf;
-	char *start, *end;
-	char *bg_path = "file://" EVOLUTION_IMAGESDIR "/bcg.png";
-	char *image_path = "file://" EVOLUTION_IMAGESDIR "/alarm.png";
-	icaltimezone *current_zone;
-
-	/* Stringize the times */
-
-	current_zone = config_data_get_timezone ();
-
-	buf = timet_to_str_with_zone (occur_start, current_zone);
-	start = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-	g_free (buf);
-
-	buf = timet_to_str_with_zone (occur_end, current_zone);
-	end = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-	g_free (buf);
-
-	/* Write the header */
-
-	gtk_html_stream_printf (stream,
-				"<HTML><BODY background=\"%s\">"
-				"<TABLE WIDTH=\"100%%\">"
-				"<TR>"
-				"<TD><IMG SRC=\"%s\" ALIGN=\"top\" BORDER=\"0\"></TD>"
-				"<TD><H1>%s</H1></TD>"
-				"</TR>"
-				"</TABLE>",
-				bg_path,
-				image_path,
-				_("Evolution Alarm"));
-
-	gtk_html_stream_printf (stream, "<br><br><font size=\"+2\">%s</font><br><br>", message);
-
-	/* Write the times */
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		write_times (stream, start, end);
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		write_times (stream, start, end);
-		break;
-
-	default:
-		/* Only VEVENTs and VTODOs can have alarms */
-		g_assert_not_reached ();
-		break;
-	}
-
-	g_free (start);
-	g_free (end);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur_start: Start of occurrence time for the event.
- * @occur_end: End of occurrence time for the event.
- * @vtype: Type of the component which corresponds to the alarm.
- * @message; Message to display in the dialog; usually comes from the component.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- *
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- *
- * Return value: a pointer to the dialog structure if successful or NULL if an error occurs.
- **/
-gpointer
-alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-		     ECalComponentVType vtype, const char *message,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	GtkHTMLStream *stream;
-	icaltimezone *current_zone;
-	char *buf, *title;
-
-	g_return_val_if_fail (trigger != -1, NULL);
-
-	/* Only VEVENTs or VTODOs can have alarms */
-	g_return_val_if_fail (vtype == E_CAL_COMPONENT_EVENT || vtype == E_CAL_COMPONENT_TODO, NULL);
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (func != NULL, NULL);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return NULL;
-	}
-
-	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->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-	an->html = g_object_get_data (G_OBJECT (glade_xml_get_widget (an->xml, "frame")), "html");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		g_object_unref (an->xml);
-		g_free (an);
-		return NULL;
-	}
-
-	g_signal_connect (G_OBJECT (an->dialog), "destroy",
-			  G_CALLBACK (dialog_destroy_cb),
-			  an);
-
-	/* Title */
-
-	current_zone = config_data_get_timezone ();
-
-	buf = timet_to_str_with_zone (trigger, current_zone);
-	title = g_strdup_printf (_("Alarm on %s"), buf);
-	g_free (buf);
-
-	gtk_window_set_title (GTK_WINDOW (an->dialog), title);
-	g_free (title);
-
-	/* html heading */
-	stream = gtk_html_begin (GTK_HTML (an->html));
-	write_html_heading (stream, message, vtype, occur_start, occur_end);
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-
-	/* Connect actions */
-
-	g_signal_connect (an->dialog, "delete_event",
-			  G_CALLBACK (delete_event_cb),
-			  an);
-
-	g_signal_connect (an->close, "clicked",
-			  G_CALLBACK (close_clicked_cb),
-			  an);
-
-	g_signal_connect (an->snooze, "clicked",
-			  G_CALLBACK (snooze_clicked_cb),
-			  an);
-
-	g_signal_connect (an->edit, "clicked",
-			  G_CALLBACK (edit_clicked_cb),
-			  an);
-
-	/* Run! */
-
-	if (!GTK_WIDGET_REALIZED (an->dialog))
-		gtk_widget_realize (an->dialog);
-
-	gtk_window_stick (GTK_WINDOW (an->dialog));
-	gtk_window_set_icon_from_file (GTK_WINDOW (an->dialog), EVOLUTION_IMAGESDIR "/alarm.png", NULL);
-
-	gtk_widget_show (an->dialog);
-	return an;
-}
-
-void
-alarm_notify_dialog_disable_buttons (gpointer dialog)
-{
-	AlarmNotify *an = dialog;
-
-	gtk_widget_set_sensitive (an->snooze, FALSE);
-	gtk_widget_set_sensitive (an->edit, FALSE);
-}
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 9bebce0a08..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <libecal/e-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);
-
-gpointer alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-			      ECalComponentVType vtype, const char *message,
-			      AlarmNotifyFunc func, gpointer func_data);
-void     alarm_notify_dialog_disable_buttons (gpointer dialog);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
deleted file mode 100644
index 9e7f1335a8..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <libecal/e-cal.h>
-#include "alarm-notify.h"
-#include "alarm-queue.h"
-#include "save.h"
-#include "e-util/e-url.h"
-
-
-
-/* Private part of the AlarmNotify structure */
-struct _AlarmNotifyPrivate {
-	/* Mapping from EUri's to LoadedClient structures */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void alarm_notify_class_init (AlarmNotifyClass *klass);
-static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass);
-static void alarm_notify_finalize (GObject *object);
-
-
-static BonoboObjectClass *parent_class;
-
-
-
-GType
-alarm_notify_get_type (void)
-{
-	static GType type = 0;
-                                                                                
-        if (!type) {
-                static GTypeInfo info = {
-                        sizeof (AlarmNotifyClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) alarm_notify_class_init,
-                        NULL, NULL,
-                        sizeof (AlarmNotify),
-                        0,
-                        (GInstanceInitFunc) alarm_notify_init
-                };
-                type = g_type_register_static (G_TYPE_OBJECT, "AlarmNotify", &info, 0);
-        }
-
-        return type;
-}
-
-/* Class initialization function for the alarm notify service */
-static void
-alarm_notify_class_init (AlarmNotifyClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass *) klass;
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->finalize = alarm_notify_finalize;
-}
-
-/* Object initialization function for the alarm notify system */
-static void
-alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass)
-{
-	AlarmNotifyPrivate *priv;
-
-	priv = g_new0 (AlarmNotifyPrivate, 1);
-	an->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-}
-
-static void
-free_client_hash (gpointer key, gpointer value, gpointer user_data)
-{
-	char *uri = key;
-	ECal *client = value;
-
-	g_free (uri);
-	g_object_unref (client);
-}
-
-/* Finalize handler for the alarm notify system */
-static void
-alarm_notify_finalize (GObject *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, (GHFunc) free_client_hash, NULL);
-	g_hash_table_destroy (priv->uri_client_hash);
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/**
- * 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 = g_object_new (TYPE_ALARM_NOTIFY, NULL);
-	return an;
-}
-
-/**
- * alarm_notify_add_calendar:
- * @an: An alarm notification service.
- * @uri: URI of the calendar to load.
- * @load_afterwards: Whether this calendar should be loaded in the future
- * when the alarm daemon starts up.
- * 
- * Tells the alarm notification service to load a calendar and start monitoring
- * its alarms.  It can optionally be made to save the URI of this calendar so
- * that it can be loaded in the future when the alarm daemon starts up.
- **/
-void
-alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards)
-{
-	AlarmNotifyPrivate *priv;
-	ECal *client;
-
-	g_return_if_fail (an != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (an));
-	g_return_if_fail (str_uri != NULL);
-
-	priv = an->priv;
-
-	/* See if we already know about this uri */
-	if (g_hash_table_lookup (priv->uri_client_hash, str_uri))
-		return;
-
-	client = e_cal_new_from_uri (str_uri, CALOBJ_TYPE_EVENT);
-
-	if (client) {
-		if (e_cal_open (client, FALSE, NULL)) {
-			g_hash_table_insert (priv->uri_client_hash,
-					     g_strdup (str_uri), client);
-		}
-	}
-}
-
-void
-alarm_notify_remove_calendar (AlarmNotify *an, const char *str_uri)
-{
-	AlarmNotifyPrivate *priv;
-	ECal *client;
-
-	priv = an->priv;
-
-	client = g_hash_table_lookup (priv->uri_client_hash, str_uri);
-	if (client) {
-		alarm_queue_remove_client (client);
-
-		g_hash_table_remove (priv->uri_client_hash, str_uri);
-	}
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index bc0da43f22..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="alarm-notify">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox2">
-      <property name="border_width">4</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkHBox" id="hbox3">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox5">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="Custom" id="frame">
-		  <property name="visible">True</property>
-		  <property name="creation_function">make_html_display</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Thu, 11 Oct 2001 08:19:04 GMT</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox4">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkButton" id="close">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">C_lose</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="snooze">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Snoo_ze</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="edit">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Edit appointment</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator1">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox4">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Snooze time (minutes)</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSpinButton" id="snooze-time">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="climb_rate">1</property>
-	      <property name="digits">0</property>
-	      <property name="numeric">False</property>
-	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-	      <property name="snap_to_ticks">False</property>
-	      <property name="wrap">False</property>
-	      <property name="adjustment">5 1 1440 1 5 5</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
deleted file mode 100644
index 418ae23878..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_H
-#define ALARM_NOTIFY_H
-
-#include <glib-object.h>
-
-
-
-#define TYPE_ALARM_NOTIFY            (alarm_notify_get_type ())
-#define ALARM_NOTIFY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALARM_NOTIFY, AlarmNotify))
-#define ALARM_NOTIFY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALARM_NOTIFY,		\
-				      AlarmNotifyClass))
-#define IS_ALARM_NOTIFY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALARM_NOTIFY))
-#define IS_ALARM_NOTIFY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ALARM_NOTIFY))
-
-typedef struct _AlarmNotify AlarmNotify;
-typedef struct _AlarmNotifyClass AlarmNotifyClass;
-
-typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
-
-struct _AlarmNotify {
-	GObject object;
-
-	/* Private data */
-	AlarmNotifyPrivate *priv;
-};
-
-struct _AlarmNotifyClass {
-	GObjectClass parent_class;
-};
-
-GType alarm_notify_get_type (void);
-
-AlarmNotify *alarm_notify_new (void);
-
-void alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards);
-void alarm_notify_remove_calendar (AlarmNotify *an, const char *str_uri);
-
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
deleted file mode 100644
index 2cf95f47b7..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ /dev/null
@@ -1,1301 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-object.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktooltips.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/eggtrayicon.h>
-#include <libecal/e-cal-time-util.h>
-#include "evolution-calendar.h"
-#include "alarm.h"
-#include "alarm-notify-dialog.h"
-#include "alarm-queue.h"
-#include "config-data.h"
-#include "save.h"
-#include "util.h"
-
-
-
-/* Whether the queueing system has been initialized */
-static gboolean alarm_queue_inited;
-
-/* When the alarm queue system is inited, this gets set to the last time an
- * alarm notification was issued.  This lets us present any notifications that
- * should have happened while the alarm daemon was not running.
- */
-static time_t saved_notification_time;
-
-/* Clients we are monitoring for alarms */
-static GHashTable *client_alarms_hash = NULL;
-
-/* Structure that stores a client we are monitoring */
-typedef struct {
-	/* Monitored client */
-	ECal *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 ECalComponentAlarms and the mapping from queued alarm IDs to the
- * actual alarm instance structures.
- */
-typedef struct {
-	/* The parent client alarms structure */
-	ClientAlarms *parent_client;
-
-	/* The component's UID */
-	char *uid;
-
-	/* The actual component and its alarm instances */
-	ECalComponentAlarms *alarms;
-
-	/* List of QueuedAlarm structures */
-	GSList *queued_alarms;
-
-	/* Flags */
-	gboolean expecting_update;
-} 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 */
-	ECalComponentAlarmInstance *instance;
-
-	/* Whether this is a snoozed queued alarm or a normal one */
-	guint snooze : 1;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-static void display_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
-static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-
-
-
-/* Alarm queue engine */
-
-static void load_alarms_for_today (ClientAlarms *ca);
-static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);
-
-/* Queues an alarm trigger for midnight so that we can load the next day's worth
- * of alarms.
- */
-static void
-queue_midnight_refresh (void)
-{
-	time_t midnight;
-	icaltimezone *zone;
-
-	g_assert (midnight_refresh_id == NULL);
-
-	zone = config_data_get_timezone ();
-
-	midnight = time_day_end_with_zone (time (NULL), zone);
-
-	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
-	if (!midnight_refresh_id) {
-		g_message ("queue_midnight_refresh(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
-}
-
-/* Loads a client's alarms; called from g_hash_table_foreach() */
-static void
-add_client_alarms_cb (gpointer key, gpointer value, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = value;
-	load_alarms_for_today (ca);
-}
-
-/* Loads the alarms for the new day every midnight */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	/* Re-load the alarms for all clients */
-
-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
-
-	/* Re-schedule the midnight update */
-
-	midnight_refresh_id = NULL;
-	queue_midnight_refresh ();
-}
-
-/* Looks up a client in the client alarms hash table */
-static ClientAlarms *
-lookup_client (ECal *client)
-{
-	return g_hash_table_lookup (client_alarms_hash, client);
-}
-
-/* Looks up a queued alarm based on its alarm ID */
-static QueuedAlarm *
-lookup_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GSList *l;
-	QueuedAlarm *qa;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			return qa;
-	}
-
-	/* not found, might have been updated/removed */
-	return NULL;
-}
-
-/* Removes an alarm from the list of alarms of a component.  If the alarm was
- * the last one listed for the component, it removes the component itself.
- */
-static void
-remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
-		     gboolean free_object, gboolean remove_alarm)
-{
-	QueuedAlarm *qa;
-	GSList *l;
-
-	qa = NULL;
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	if (!l)
-		return;
-
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
-
-	if (remove_alarm) {
-		cqa->expecting_update = TRUE;
-		e_cal_discard_alarm (cqa->parent_client->client, cqa->alarms->comp,
-					  qa->instance->auid, NULL);
-		cqa->expecting_update = FALSE;
-	}
-
-	g_free (qa);
-
-	/* If this was the last queued alarm for this component, remove the
-	 * component itself.
-	 */
-
-	if (cqa->queued_alarms != NULL)
-		return;
-
-	if (free_object) {
-		g_hash_table_remove (cqa->parent_client->uid_alarms_hash, cqa->uid);
-		g_free (cqa->uid);
-		cqa->uid = NULL;
-		cqa->parent_client = NULL;
-		e_cal_component_alarms_free (cqa->alarms);
-		g_free (cqa);
-	} else {
-		e_cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-	}
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	ECalComponent *comp;
-	QueuedAlarm *qa;
-	ECalComponentAlarm *alarm;
-	ECalComponentAlarmAction action;
-
-	cqa = data;
-	comp = cqa->alarms->comp;
-
-	save_notification_time (trigger);
-	saved_notification_time = trigger;
-
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	/* 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 = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_action (alarm, &action);
-	e_cal_component_alarm_free (alarm);
-
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		audio_notification (trigger, cqa, alarm_id);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		display_notification (trigger, cqa, alarm_id, TRUE);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		mail_notification (trigger, cqa, alarm_id);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		procedure_notification (trigger, cqa, alarm_id);
-		break;
-
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-/* Adds the alarms in a ECalComponentAlarms 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, ECalComponentAlarms *alarms)
-{
-	const char *uid;
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	/* No alarms? */
-	if (alarms->alarms == NULL) {
-		e_cal_component_alarms_free (alarms);
-		return;
-	}
-
-	cqa = g_new (CompQueuedAlarms, 1);
-	cqa->parent_client = ca;
-	cqa->alarms = alarms;
-	cqa->expecting_update = FALSE;
-
-	cqa->queued_alarms = NULL;
-
-	for (l = alarms->alarms; l; l = l->next) {
-		ECalComponentAlarmInstance *instance;
-		gpointer alarm_id;
-		QueuedAlarm *qa;
-
-		instance = l->data;
-
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-		if (!alarm_id) {
-			g_message ("add_component_alarms(): Could not schedule a trigger for "
-				   "%ld, discarding...", (long) instance->trigger);
-			continue;
-		}
-
-		qa = g_new (QueuedAlarm, 1);
-		qa->alarm_id = alarm_id;
-		qa->instance = instance;
-		qa->snooze = FALSE;
-
-		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-	}
-
-	e_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);
-
-		e_cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-
-		g_free (cqa);
-		return;
-	}
-
-	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	cqa->uid = g_strdup (uid);
-	g_hash_table_insert (ca->uid_alarms_hash, cqa->uid, cqa);
-}
-
-/* Loads the alarms of a client for a given range of time */
-static void
-load_alarms (ClientAlarms *ca, time_t start, time_t end)
-{
-	GSList *comp_alarms;
-	GSList *l;
-
-	comp_alarms = e_cal_get_alarms_in_range (ca->client, start, end);
-
-	for (l = comp_alarms; l; l = l->next) {
-		ECalComponentAlarms *alarms;
-
-		alarms = l->data;
-		add_component_alarms (ca, alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/* Loads today's remaining alarms for a client */
-static void
-load_alarms_for_today (ClientAlarms *ca)
-{
-	time_t now, day_end;
-	icaltimezone *zone;
-
-	now = time (NULL);
-
-	zone = config_data_get_timezone ();
-
-	day_end = time_day_end_with_zone (now, zone);
-	load_alarms (ca, now, day_end);
-}
-
-/* Adds any alarms that should have occurred while the alarm daemon was not
- * running.
- */
-static void
-load_missed_alarms (ClientAlarms *ca)
-{
-	time_t now;
-
-	now = time (NULL);
-
-	g_assert (saved_notification_time != -1);
-
-	/* We add 1 to the saved_notification_time to make the time ranges
-	 * half-open; we do not want to display the "last" displayed alarm
-	 * twice, once when it occurs and once when the alarm daemon restarts.
-	 */
-	load_alarms (ca, saved_notification_time + 1, now);
-}
-
-/* Called when a calendar client finished loading; we load its alarms */
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	if (status != E_CALENDAR_STATUS_OK)
-		return;
-
-	load_alarms_for_today (ca);
-	load_missed_alarms (ca);
-}
-
-/* Looks up a component's queued alarm structure in a client alarms structure */
-static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
-{
-	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
-}
-
-static void
-remove_alarms (CompQueuedAlarms *cqa, gboolean free_object)
-{
-	GSList *l;
-
-	for (l = cqa->queued_alarms; l;) {
-		QueuedAlarm *qa;
-
-		qa = l->data;
-
-		/* Get the next element here because the list element will go
-		 * away in remove_queued_alarm().  The qa will be freed there as
-		 * well.
-		 */
-		l = l->next;
-
-		alarm_remove (qa->alarm_id);
-		remove_queued_alarm (cqa, qa->alarm_id, free_object, FALSE);
-	}
-
-}
-
-/* Removes a component an its alarms */
-static void
-remove_comp (ClientAlarms *ca, const char *uid)
-{
-	CompQueuedAlarms *cqa;
-
-	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);
-
-	remove_alarms (cqa, TRUE);
-
-	/* 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 (ECal *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-	time_t now, day_end;
-	ECalComponentAlarms *alarms;
-	gboolean found;
-	icaltimezone *zone;
-	CompQueuedAlarms *cqa;
-
-	ca = data;
-
-	now = time (NULL);
-
-	zone = config_data_get_timezone ();
-
-	day_end = time_day_end_with_zone (now, zone);
-
-	found = e_cal_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
-
-	if (!found) {
-		remove_comp (ca, uid);
-		return;
-	}
-
-	cqa = lookup_comp_queued_alarms (ca, uid);
-	if (!cqa)
-		add_component_alarms (ca, alarms);
-	else {
-		GSList *l;
-
-		/* if already in the list, just update it */
-		remove_alarms (cqa, FALSE);
-		cqa->alarms = alarms;
-		cqa->queued_alarms = NULL;
-
-		/* add the new alarms */
-		for (l = cqa->alarms->alarms; l; l = l->next) {
-			ECalComponentAlarmInstance *instance;
-			gpointer alarm_id;
-			QueuedAlarm *qa;
-
-			instance = l->data;
-
-			alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-			if (!alarm_id) {
-				g_message ("obj_updated_cb(): Could not schedule a trigger for "
-					   "%ld, discarding...", (long) instance->trigger);
-				continue;
-			}
-
-			qa = g_new (QueuedAlarm, 1);
-			qa->alarm_id = alarm_id;
-			qa->instance = instance;
-			qa->snooze = FALSE;
-
-			cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		}
-
-		if (cqa->queued_alarms == NULL) {
-			if (!cqa->expecting_update)
-				remove_comp (ca, uid);
-		} else
-			cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	}
-}
-
-/* Called when a calendar component is removed; we must delete its corresponding
- * alarms.
- */
-static void
-obj_removed_cb (ECal *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-}
-
-
-
-/* Notification functions */
-
-/* Creates a snooze alarm based on an existing one.  The snooze offset is
- * compued with respect to the current time.
- */
-static void
-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
-{
-	QueuedAlarm *orig_qa;
-	time_t t;
-	gpointer new_id;
-
-	orig_qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!orig_qa)
-		return;
-
-	t = time (NULL);
-	t += snooze_mins * 60;
-
-	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);
-	if (!new_id) {
-		g_message ("create_snooze(): Could not schedule a trigger for "
-			   "%ld, discarding...", (long) t);
-		return;
-	}
-
-	orig_qa->instance->trigger = t;
-	orig_qa->alarm_id = new_id;
-	orig_qa->snooze = TRUE;
-}
-
-/* Launches a component editor for a component */
-static void
-edit_component (ECal *client, ECalComponent *comp)
-{
-	const char *uid;
-	const char *uri;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CompEditorFactory factory;
-
-	e_cal_component_get_uid (comp, &uid);
-
-	uri = e_cal_get_uri (client);
-
-	/* Get the factory */
-
-	CORBA_exception_init (&ev);
-	factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION,
-						      0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("edit_component(): Could not activate the component editor factory");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	/* Edit the component */
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("edit_component(): Exception while editing the component");
-
-	CORBA_exception_free (&ev);
-
-	/* Get rid of the factory */
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("edit_component(): Could not unref the calendar component factory");
-
-	CORBA_exception_free (&ev);
-}
-
-
-/* /\* 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: */
-/* 		create_snooze (c->cqa, c->alarm_id, snooze_mins); */
-
-/* 		g_object_unref (c->comp); */
-/* 		g_object_unref (c->client); */
-/* 		g_free (c); */
-/* 		return; */
-
-/* 	case ALARM_NOTIFY_EDIT: */
-/* 		edit_component (c->client, c->comp); */
-/* 		break; */
-
-/* 	case ALARM_NOTIFY_CLOSE: */
-/* 		/\* Do nothing *\/ */
-/* 		break; */
-
-/* 	default: */
-/* 		g_assert_not_reached (); */
-/* 	} */
-
-/* 	if (c->cqa != NULL) */
-/* 		remove_queued_alarm (c->cqa, c->alarm_id, TRUE, TRUE); */
-/* 	g_object_unref (c->comp); */
-/* 	g_object_unref (c->client); */
-/* 	g_free (c); */
-/* } */
-
-typedef struct {
-	char *message;
-	gboolean blink_state;
-	gint blink_id;
-	time_t trigger;
-	CompQueuedAlarms *cqa;
-	gpointer alarm_id;
-	ECalComponent *comp;
-	ECal *client;
-	GtkWidget *tray_icon;
-	GtkWidget *image;
-	GtkWidget *alarm_dialog;
-} TrayIconData;
-
-static void
-on_dialog_obj_updated_cb (ECal *client, const char *uid, gpointer data)
-{
-/* commented out so gcc won't complain about the unused variable
-	struct notify_dialog_closure *c = data;
-*/
-}
-
-static void
-on_dialog_obj_removed_cb (ECal *client, const char *uid, gpointer data)
-{
-	const char *our_uid;
-	TrayIconData *tray_data = data;
-
-	e_cal_component_get_uid (tray_data->comp, &our_uid);
-	g_return_if_fail (our_uid && *our_uid);
-
-	if (!strcmp (uid, our_uid)) {
-		alarm_notify_dialog_disable_buttons (tray_data->alarm_dialog);
-		tray_data->cqa = NULL;
-		tray_data->alarm_id = NULL;
-	}
-}
-
-/* Callback used from the alarm notify dialog */
-static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	TrayIconData *tray_data = data;
-
-	g_signal_handlers_disconnect_matched (tray_data->client, G_SIGNAL_MATCH_FUNC,
-					      0, 0, NULL, on_dialog_obj_removed_cb, NULL);
-
-	switch (result) {
-	case ALARM_NOTIFY_SNOOZE:
-		create_snooze (tray_data->cqa, tray_data->alarm_id, snooze_mins);
-		tray_data->cqa = NULL;
-		return;
-
-	case ALARM_NOTIFY_EDIT:
-		edit_component (tray_data->client, tray_data->comp);
-		break;
-
-	case ALARM_NOTIFY_CLOSE:
-		/* Do nothing */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	tray_data->alarm_dialog = NULL;
-	gtk_widget_destroy (tray_data->tray_icon);
-}
-
-static gint
-tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data)
-{
-	TrayIconData *tray_data = user_data;
-
-	if (tray_data->cqa != NULL)
-		remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE);
-
-	if (tray_data->message != NULL) {
-		g_free (tray_data->message);
-		tray_data->message = NULL;
-	}
-
-	g_source_remove (tray_data->blink_id);
-
-	g_object_unref (tray_data->comp);
-	g_object_unref (tray_data->client);
-	g_free (tray_data);
-
-	return TRUE;
-}
-
-static gint
-tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	TrayIconData *tray_data = user_data;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		if (event->button == 1) {
-			QueuedAlarm *qa;
-
-			if (tray_data->alarm_dialog != NULL)
-				return FALSE;
-
-			qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
-			if (qa) {
-				gtk_widget_hide (tray_data->tray_icon);
-				tray_data->alarm_dialog = alarm_notify_dialog (
-					tray_data->trigger,
-					qa->instance->occur_start,
-					qa->instance->occur_end,
-					e_cal_component_get_vtype (tray_data->comp),
-					tray_data->message,
-					notify_dialog_cb, tray_data);
-				if (tray_data->alarm_dialog) {
-					g_signal_connect (G_OBJECT (tray_data->client), "obj_removed",
-							  G_CALLBACK (on_dialog_obj_removed_cb), tray_data);
-				}
-			}
-
-			return TRUE;
-		} else if (event->button == 2) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-tray_icon_blink_cb (gpointer data)
-{
-	TrayIconData *tray_data = data;
-
-	/* FIXME: Use stock image equivalents when they become available */
-
-	tray_data->blink_state = tray_data->blink_state == TRUE ? FALSE : TRUE;
-	gtk_image_set_from_file (GTK_IMAGE (tray_data->image),
-				 tray_data->blink_state == TRUE ?
-				 EVOLUTION_IMAGESDIR "/appointment-reminder-excl.png" :
-				 EVOLUTION_IMAGESDIR "/appointment-reminder.png");
-
-	return TRUE;
-}
-
-/* Performs notification of a display alarm */
-static void
-display_notification (time_t trigger, CompQueuedAlarms *cqa,
-		      gpointer alarm_id, gboolean use_description)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	ECal *client;
-	ECalComponentVType vtype;
-	const char *message;
-	ECalComponentAlarm *alarm;
-	GtkWidget *tray_icon, *image, *ebox;
-	GtkTooltips *tooltips;
-	TrayIconData *tray_data;
-	ECalComponentText text;
-	char *str, *start_str, *end_str, *alarm_str;
-	icaltimezone *current_zone;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	vtype = e_cal_component_get_vtype (comp);
-
-	/* get a sensible description for the event */
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_description (alarm, &text);
-	e_cal_component_alarm_free (alarm);
-
-	if (text.value)
-		message = text.value;
-	else {
-		e_cal_component_get_summary (comp, &text); 
- 		if (text.value)
- 			message = text.value;
- 		else
- 			message = _("No description available.");
-	}
-
-	/* create the tray icon */
-	tooltips = gtk_tooltips_new ();
-
-	/* FIXME: Use stock image equivalent when it becomes available */
-	tray_icon = egg_tray_icon_new (qa->instance->auid);
-	image = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/appointment-reminder.png");
-	ebox = gtk_event_box_new ();
-
-	gtk_widget_show (image);
-	gtk_widget_show (ebox);
-
-	current_zone = config_data_get_timezone ();
-	alarm_str = timet_to_str_with_zone (trigger, current_zone);
-	start_str = timet_to_str_with_zone (qa->instance->occur_start, current_zone);
-	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
-	str = g_strdup_printf (_("Alarm on %s\n%s\nStarting at %s\nEnding at %s"),
-			       alarm_str, message, start_str, end_str);
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), ebox, str, str);
-	g_free (start_str);
-	g_free (end_str);
-	g_free (alarm_str);
-	g_free (str);
-	
-	g_object_set_data (G_OBJECT (tray_icon), "image", image);
-	g_object_set_data (G_OBJECT (tray_icon), "available", GINT_TO_POINTER (1));
-
-	gtk_container_add (GTK_CONTAINER (ebox), image);
-	gtk_container_add (GTK_CONTAINER (tray_icon), ebox);
-
-	/* create the private structure */
-	tray_data = g_new0 (TrayIconData, 1);
-	tray_data->message = g_strdup (message);
-	tray_data->trigger = trigger;
-	tray_data->cqa = cqa;
-	tray_data->alarm_id = alarm_id;
-	tray_data->comp = e_cal_component_clone (comp);
-	tray_data->client = cqa->parent_client->client;
-	tray_data->image = image;
-	tray_data->blink_state = FALSE;
-	g_object_ref (tray_data->client);
-	tray_data->tray_icon = tray_icon;
-
-	g_signal_connect (G_OBJECT (tray_icon), "destroy",
-			  G_CALLBACK (tray_icon_destroyed_cb), tray_data);
-	g_signal_connect (G_OBJECT (ebox), "button_press_event",
-			  G_CALLBACK (tray_icon_clicked_cb), tray_data);
-
-	tray_data->blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
-
-	gtk_widget_show (tray_icon);
-}
-
-/* Performs notification of an audio alarm */
-static void
-audio_notification (time_t trigger, CompQueuedAlarms *cqa,
-		    gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	ECalComponentAlarm *alarm;
-	icalattach *attach;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-	e_cal_component_alarm_free (alarm);
-
-	if (attach && icalattach_get_is_url (attach)) {
-		const char *url;
-
-		url = icalattach_get_url (attach);
-
-		if (url && *url && g_file_test (url, G_FILE_TEST_EXISTS))
-			gnome_sound_play (url); /* this sucks */
-		else
-			gdk_beep ();
-	}
-
-	if (attach)
-		icalattach_unref (attach);
-
-	/* We present a notification message in addition to playing the sound */
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-/* Performs notification of a mail alarm */
-static void
-mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-
-	/* FIXME */
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-
-	dialog = gtk_dialog_new_with_buttons (_("Warning"),
-					      NULL, 0,
-					      GTK_STOCK_OK, GTK_RESPONSE_CANCEL,
-					      NULL);
-	label = gtk_label_new (_("Evolution does not support calendar reminders with\n"
-				 "email notifications yet, but this reminder was\n"
-				 "configured to send an email.  Evolution will display\n"
-				 "a normal reminder dialog box instead."));
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
-
-	gtk_dialog_run (GTK_DIALOG (dialog));
-}
-
-/* Performs notification of a procedure alarm */
-static gboolean
-procedure_notification_dialog (const char *cmd, const char *url) 
-{
-	GtkWidget *dialog, *label, *checkbox;
-	char *str;
-	int btn;
-	
-	if (is_blessed_program (url))
-		return TRUE;
-	
-	dialog = gtk_dialog_new_with_buttons (_("Warning"),
-					      NULL, 0,
-					      GTK_STOCK_NO, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_YES, GTK_RESPONSE_OK,
-					      NULL);
-
-	str = g_strdup_printf (_("An Evolution Calendar reminder is about to trigger. "
-				 "This reminder is configured to run the following program:\n\n"
-				 "        %s\n\n"
-				 "Are you sure you want to run this program?"),
-			       cmd);
-	label = gtk_label_new (str);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    label, TRUE, TRUE, 4);
-	g_free (str);
-
-	checkbox = gtk_check_button_new_with_label
-		(_("Do not ask me about this program again."));
-	gtk_widget_show (checkbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), 
-			    checkbox, TRUE, TRUE, 4);
-
-	/* Run the dialog */
-	btn = gtk_dialog_run (GTK_DIALOG (dialog));
-	if (btn == GTK_RESPONSE_OK && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		save_blessed_program (url);
-	gtk_widget_destroy (dialog);
-
-	return (btn == GTK_RESPONSE_OK);
-}
-
-static void
-procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
-{
-	QueuedAlarm *qa;
-	ECalComponent *comp;
-	ECalComponentAlarm *alarm;
-	ECalComponentText description;
-	icalattach *attach;
-	const char *url;
-	char *cmd;
-	int result;
-
-	comp = cqa->alarms->comp;
-	qa = lookup_queued_alarm (cqa, alarm_id);
-	if (!qa)
-		return;
-
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-	e_cal_component_alarm_get_description (alarm, &description);
-	e_cal_component_alarm_free (alarm);
-
-	/* If the alarm has no attachment, simply display a notification dialog. */
-	if (!attach)
-		goto fallback;
-
-	if (!icalattach_get_is_url (attach)) {
-		icalattach_unref (attach);
-		goto fallback;
-	}
-
-	url = icalattach_get_url (attach);
-	g_assert (url != NULL);
-
-	/* Ask for confirmation before executing the stuff */
-	if (description.value)
-		cmd = g_strconcat (url, " ", description.value, NULL);
-	else
-		cmd = (char *) url;
-
-	result = 0;
-	if (procedure_notification_dialog (cmd, url))
-		result = gnome_execute_shell (NULL, cmd);
-	
-	if (cmd != (char *) url)
-		g_free (cmd);
-
-	icalattach_unref (attach);
-
-	/* Fall back to display notification if we got an error */
-	if (result < 0)
-		goto fallback;
-
-	remove_queued_alarm (cqa, alarm_id, TRUE, TRUE);
-	return;
-
- fallback:
-
-	display_notification (trigger, cqa, alarm_id, FALSE);
-}
-
-
-
-/**
- * alarm_queue_init:
- *
- * Initializes the alarm queueing system.  This should be called near the
- * beginning of the program.
- **/
-void
-alarm_queue_init (void)
-{
-	g_return_if_fail (alarm_queue_inited == FALSE);
-
-	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-	queue_midnight_refresh ();
-
-	saved_notification_time = get_saved_notification_time ();
-	if (saved_notification_time == -1) {
-		saved_notification_time = time (NULL);
-		save_notification_time (saved_notification_time);
-	}
-
-	alarm_queue_inited = TRUE;
-}
-
-static void
-free_client_alarms_cb (gpointer key, gpointer value, gpointer user_data)
-{
-	ECal *client = key;
-	ClientAlarms *ca = value;
-
-	if (ca) {
-		g_object_unref (ca->client);
-		g_free (ca);
-	}
-}
-
-/**
- * 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_foreach (client_alarms_hash, (GHFunc) free_client_alarms_cb, NULL);
-	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 (ECal *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (client));
-
-	ca = lookup_client (client);
-	if (ca) {
-		ca->refcount++;
-		return;
-	}
-
-	ca = g_new (ClientAlarms, 1);
-
-	ca->client = client;
-	g_object_ref (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 (e_cal_get_load_state (client) != E_CAL_LOAD_LOADED)
-		g_signal_connect (client, "cal_opened",
-				  G_CALLBACK (cal_opened_cb),
-				  ca);
-
-	g_signal_connect (client, "obj_updated",
-			  G_CALLBACK (obj_updated_cb),
-			  ca);
-	g_signal_connect (client, "obj_removed",
-			  G_CALLBACK (obj_removed_cb),
-			  ca);
-
-	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
-		load_alarms_for_today (ca);
-		load_missed_alarms (ca);
-	}
-}
-
-/* Called from g_hash_table_foreach(); adds a component UID to a list */
-static void
-add_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	GSList **uids;
-	const char *uid;
-
-	uids = data;
-	uid = key;
-
-	*uids = g_slist_prepend (*uids, (char *) uid);
-}
-
-/* Removes all the alarms queued for a particular calendar client */
-static void
-remove_client_alarms (ClientAlarms *ca)
-{
-	GSList *uids;
-	GSList *l;
-
-	/* First we build a list of UIDs so that we can remove them one by one */
-
-	uids = NULL;
-	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		remove_comp (ca, uid);
-	}
-
-	g_slist_free (uids);
-
-	/* The hash table should be empty now */
-
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-}
-
-/**
- * alarm_queue_remove_client:
- * @client: A calendar client.
- *
- * Removes a calendar client from the alarm queueing system.
- **/
-void
-alarm_queue_remove_client (ECal *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CAL (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 */
-
-	g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
-					      0, 0, NULL, NULL, ca);
-
-	g_object_unref (ca->client);
-	ca->client = NULL;
-
-	g_hash_table_destroy (ca->uid_alarms_hash);
-	ca->uid_alarms_hash = NULL;
-
-	g_free (ca);
-
-	g_hash_table_remove (client_alarms_hash, client);
-}
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
deleted file mode 100644
index 12802750ec..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_QUEUE_H
-#define ALARM_QUEUE_H
-
-#include <libecal/e-cal.h>
-
-
-void alarm_queue_init (void);
-void alarm_queue_done (void);
-
-void alarm_queue_add_client (ECal *client);
-void alarm_queue_remove_client (ECal *client);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index 8c6c4c59cd..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <gdk/gdk.h>
-#include "alarm.h"
-
-
-
-/* Our glib timeout */
-static guint timeout_id;
-
-/* The list of pending alarms */
-static GList *alarms = NULL;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-static void setup_timeout (time_t now);
-
-
-
-/* Removes the head alarm from the queue.  Does not touch the timeout_id. */
-static void
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	g_assert (alarms != NULL);
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	g_free (ar);
-}
-
-/* Callback from the alarm timeout */
-static gboolean
-alarm_ready_cb (gpointer data)
-{
-	time_t now;
-
-	g_assert (alarms != NULL);
-	timeout_id = 0;
-
-	now = time (NULL);
-
-	while (alarms) {
-		AlarmRecord *notify_id, *ar;
-		AlarmRecord ar_copy;
-
-		ar = alarms->data;
-
-		if (ar->trigger > now)
-			break;
-
-		notify_id = ar;
-
-		ar_copy = *ar;
-		ar = &ar_copy;
-
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-
-		(* ar->alarm_fn) (notify_id, ar->trigger, ar->data);
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (notify_id, ar->data);
-	}
-
-	if (alarms) {
-		/* We need this check because one of the alarm_fn above may have
-		 * re-entered and added an alarm of its own, so the timer will
-		 * already be set up.
-		 */
-		if (timeout_id == 0)
-			setup_timeout (now);
-	} else
-		g_assert (timeout_id == 0);
-
-	return FALSE;
-}
-
-/* Sets up a timeout for the next minute.  We do not need to be concerned with
- * timezones here, as this is just a periodic check on the alarm queue.
- */
-static void
-setup_timeout (time_t now)
-{
-	time_t next, diff;
-	struct tm tm;
-
-	g_assert (timeout_id == 0);
-	g_assert (alarms != NULL);
-
-	tm = *localtime (&now);
-	tm.tm_sec = 0;
-	tm.tm_min++; /* next minute */
-
-	next = mktime (&tm);
-	g_assert (next != -1);
-
-	diff = next - now;
-
-	g_assert (diff >= 0);
-	timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);
-}
-
-/* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static void
-queue_alarm (AlarmRecord *ar)
-{
-	time_t now;
-	AlarmRecord *old_head;
-
-	if (alarms) {
-		g_assert (timeout_id != 0);
-
-		old_head = alarms->data;
-	} else {
-		g_assert (timeout_id == 0);
-
-		old_head = NULL;
-	}
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return;
-
-	/* Set the timer for removal upon activation */
-
-	if (!old_head) {
-		now = time (NULL);
-		setup_timeout (now);
-	}
-}
-
-
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	AlarmRecord *ar;
-
-	g_return_val_if_fail (trigger != -1, NULL);
-	g_return_val_if_fail (alarm_fn != NULL, NULL);
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	queue_alarm (ar);
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *notify_id, *ar;
-	AlarmRecord ar_copy;
-	AlarmRecord *old_head;
-	GList *l;
-
-	g_return_if_fail (alarm != NULL);
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	notify_id = ar;
-
-	if (old_head == ar) {
-		ar_copy = *ar;
-		ar = &ar_copy;
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
-	} else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	/* Reset the timeout */
-
-	g_assert (timeout_id != 0);
-
-	if (!alarms) {
-		g_source_remove (timeout_id);
-		timeout_id = 0;
-	}
-
-	/* Notify about destructiono of the alarm */
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (notify_id, ar->data);
-
-}
-
-/**
- * alarm_done:
- * 
- * Terminates the alarm timer mechanism.  This should be called at the end of
- * the program.
- **/
-void
-alarm_done (void)
-{
-	GList *l;
-
-	if (timeout_id == 0) {
-		g_assert (alarms == NULL);
-		return;
-	}
-
-	g_assert (alarms != NULL);
-
-	g_source_remove (timeout_id);
-	timeout_id = 0;
-
-	for (l = alarms; l; l = l->next) {
-		AlarmRecord *ar;
-
-		ar = l->data;
-
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar, ar->data);
-
-		g_free (ar);
-	}
-
-	g_list_free (alarms);
-	alarms = NULL;
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index 23fde886c9..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-#include <glib.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);
-
-void alarm_done (void);
-
-gpointer alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		    AlarmDestroyNotify destroy_notify_fn);
-void alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
deleted file mode 100644
index 3cad23d5cd..0000000000
--- a/calendar/gui/alarm-notify/config-data.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIOH
-#include <config.h>
-#endif
-
-#include <libedataserver/e-source-list.h>
-#include "config-data.h"
-#include "save.h"
-
-
-
-/* Whether we have initied ourselves by reading the data from the configuration engine */
-static gboolean inited = FALSE;
-static GConfClient *conf_client = NULL;
-static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
-
-
-
-/* Copied from ../calendar-config.c; returns whether the locale has 'am' and
- * 'pm' strings defined.
- */
-static gboolean
-locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-static void
-do_cleanup (void)
-{
-	if (calendar_source_list) {
-		g_object_unref (calendar_source_list);
-		calendar_source_list = NULL;
-	}
-
-	if (tasks_source_list) {
-		g_object_unref (tasks_source_list);
-		tasks_source_list = NULL;
-	}
-
-	g_object_unref (conf_client);
-	conf_client = NULL;
-
-	inited = FALSE;
-}
-
-/* Ensures that the configuration values have been read */
-static void
-ensure_inited (void)
-{
-	if (inited)
-		return;
-
-	inited = TRUE;
-
-	conf_client = gconf_client_get_default ();
-	if (!GCONF_IS_CLIENT (conf_client)) {
-		inited = FALSE;
-		return;
-	}
-
-	g_atexit ((GVoidFunc) do_cleanup);
-
-	/* load the sources for calendars and tasks */
-	calendar_source_list = e_source_list_new_for_gconf (conf_client,
-							    "/apps/evolution/calendar/sources");
-	tasks_source_list = e_source_list_new_for_gconf (conf_client,
-							 "/apps/evolution/tasks/sources");
-
-}
-
-GConfClient *
-config_data_get_conf_client (void)
-{
-	ensure_inited ();
-	return conf_client;
-}
-
-icaltimezone *
-config_data_get_timezone (void)
-{
-	char *location;
-	icaltimezone *local_timezone;
-
-	ensure_inited ();
-
-	location = gconf_client_get_string (conf_client, 
-					    "/apps/evolution/calendar/display/timezone",
-					    NULL);
-	if (location && location[0]) {
-		local_timezone = icaltimezone_get_builtin_timezone (location);
-	} else {
-		local_timezone = icaltimezone_get_utc_timezone ();
-	}
-
-	g_free (location);
-
-	return local_timezone;
-}
-
-gboolean
-config_data_get_24_hour_format (void)
-{
-	ensure_inited ();
-
-	if (locale_supports_12_hour_format ()) {
-		return gconf_client_get_bool (conf_client,
-					      "/apps/evolution/calendar/display/use_24hour_format",
-					      NULL);
-	}
-
-	return TRUE;
-}
-
-GPtrArray *
-config_data_get_calendars_to_load (void)
-{
-	GPtrArray *cals;
-	GSList *groups, *gl, *sources, *sl;
-
-	ensure_inited ();
-
-	/* create the array to be returned */
-	cals = g_ptr_array_new ();
-
-	/* process calendar sources */
-	groups = e_source_list_peek_groups (calendar_source_list);
-	for (gl = groups; gl != NULL; gl = gl->next) {
-		sources = e_source_group_peek_sources (E_SOURCE_GROUP (gl->data));
-		for (sl = sources; sl != NULL; sl = sl->next) {
-			g_ptr_array_add (cals, sl->data);
-		}
-	}
-
-	/* process tasks sources */
-	groups = e_source_list_peek_groups (tasks_source_list);
-	for (gl = groups; gl != NULL; gl = gl->next) {
-		sources = e_source_group_peek_sources (E_SOURCE_GROUP (gl->data));
-		for (sl = sources; sl != NULL; sl = sl->next) {
-			g_ptr_array_add (cals, sl->data);
-		}
-	}
-
-	return cals;
-}
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
deleted file mode 100644
index 26b5dc111f..0000000000
--- a/calendar/gui/alarm-notify/config-data.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CONFIG_DATA_H
-#define CONFIG_DATA_H
-
-#include <glib.h>
-#include <libical/ical.h>
-#include <gconf/gconf-client.h>
-
-GConfClient *config_data_get_conf_client (void);
-
-icaltimezone *config_data_get_timezone (void);
-gboolean config_data_get_24_hour_format (void);
-GPtrArray *config_data_get_calendars_to_load (void);
-
-#endif
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
deleted file mode 100644
index 6897d00857..0000000000
--- a/calendar/gui/alarm-notify/notify-main.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2003 Novell, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-init.h>
-#include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-client.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libedataserver/e-source.h>
-#include "alarm.h"
-#include "alarm-queue.h"
-#include "alarm-notify.h"
-#include "config-data.h"
-#include "save.h"
-
-
-
-static GnomeClient *master_client = NULL;
-
-static BonoboGenericFactory *factory;
-
-static AlarmNotify *alarm_notify_service = NULL;
-
-
-/* Callback for the master client's "die" signal.  We must terminate the daemon
- * since the session is ending.
- */
-static void
-client_die_cb (GnomeClient *client)
-{
-	bonobo_main_quit ();
-}
-
-/* Sees if a session manager is present.  If so, it tells the SM how to restart
- * the daemon when the session starts.  It also sets the die callback so that
- * the daemon can terminate properly when the session ends.
- */
-static void
-set_session_parameters (char **argv)
-{
-	int flags;
-	char *args[2];
-
-	master_client = gnome_master_client ();
-	flags = gnome_client_get_flags (master_client);
-
-	if (!(flags & GNOME_CLIENT_IS_CONNECTED))
-		return;
-
-	/* The daemon should always be started up by the session manager when
-	 * the session starts.  The daemon will take care of loading whatever
-	 * calendars it was told to load.
-	 */
-	gnome_client_set_restart_style (master_client, GNOME_RESTART_ANYWAY);
-
-	args[0] = argv[0];
-	args[1] = NULL;
-
-	gnome_client_set_restart_command (master_client, 1, args);
-
-	g_signal_connect (G_OBJECT (master_client), "die",
-			  G_CALLBACK (client_die_cb), NULL);
-}
-
-/* Factory function for the alarm notify service; just creates and references a
- * singleton service object.
- */
-static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, const char *component_id, void *data)
-{
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		g_assert (alarm_notify_service != NULL);
-	}
-
-	return NULL;
-}
-
-/* Loads the calendars that the alarm daemon has been told to load in the past */
-static gboolean
-load_calendars (gpointer user_data)
-{
-	GPtrArray *cals;
-	int i;
-
-	alarm_queue_init ();
-
-	/* create the alarm notification service */
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		g_assert (alarm_notify_service != NULL);
-	}
-
-	cals = config_data_get_calendars_to_load ();
-	if (!cals) {
-		g_message ("load_calendars(): Could not get the list of calendars to load");
-		return TRUE; /* should we continue retrying? */;
-	}
-
-	for (i = 0; i < cals->len; i++) {
-		ESource *source;
-		char *uri;
-
-		source = cals->pdata[i];
-
-		uri = e_source_get_uri (source);
-		alarm_notify_add_calendar (alarm_notify_service, uri, FALSE);
-		g_free (uri);
-	}
-
-	g_ptr_array_free (cals, TRUE);
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("evolution-alarm-notify", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
-	gtk_init (&argc, &argv);
-
-	if (bonobo_init (&argc, argv) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	glade_init ();
-
-	gnome_sound_init ("localhost");
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION,
-					      (BonoboFactoryCallback) alarm_notify_factory_fn, NULL);
-	if (!factory)
-		g_error (_("Could not create the alarm notify service factory"));
-
-	set_session_parameters (argv);
-
-	g_idle_add ((GSourceFunc) load_calendars, NULL);
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (factory));
-	factory = NULL;
-
-	bonobo_object_unref (BONOBO_OBJECT (alarm_notify_service));
-
-	alarm_queue_done ();
-	alarm_done ();
-
-	if (alarm_notify_service)
-		bonobo_object_unref (BONOBO_OBJECT (alarm_notify_service));
-
-	gnome_sound_shutdown ();
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/calendar/gui/alarm-notify/save.c b/calendar/gui/alarm-notify/save.c
deleted file mode 100644
index d0b127fb99..0000000000
--- a/calendar/gui/alarm-notify/save.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Evolution calendar - Functions to save alarm notification times
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <bonobo/bonobo-arg.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include "evolution-calendar.h"
-#include "config-data.h"
-#include "save.h"
-#include <gconf/gconf-client.h>
-
-
-
-/* Key names for the configuration values */
-
-#define KEY_LAST_NOTIFICATION_TIME "/apps/evolution/calendar/notify/last_notification_time"
-#define KEY_CALENDARS "/apps/evolution/calendar/notify/calendars"
-#define KEY_PROGRAMS "/apps/evolution/calendar/notify/programs"
-
-
-
-/**
- * save_notification_time:
- * @t: A time value.
- * 
- * Saves the last notification time so that it can be fetched the next time the
- * alarm daemon is run.  This way the daemon can show alarms that should have
- * triggered while it was not running.
- **/
-void
-save_notification_time (time_t t)
-{
-	GConfClient *conf_client;
-	time_t current_t;
-
-	g_return_if_fail (t != -1);
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return;
-
-	/* we only store the new notification time if it is bigger
-	   than the already stored one */
-	current_t = gconf_client_get_int (conf_client, KEY_LAST_NOTIFICATION_TIME, NULL);
-	if (t > current_t)
-		gconf_client_set_int (conf_client, KEY_LAST_NOTIFICATION_TIME, t, NULL);
-}
-
-/**
- * get_saved_notification_time:
- * 
- * Queries the last saved value for alarm notification times.
- * 
- * Return value: The last saved value, or -1 if no value had been saved before.
- **/
-time_t
-get_saved_notification_time (void)
-{
-	GConfClient *conf_client;
-	long t;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return -1;
-
-	t = gconf_client_get_int (conf_client, KEY_LAST_NOTIFICATION_TIME, NULL);
-
-	return (time_t) t;
-}
-
-/**
- * save_blessed_program:
- * @program: a program name
- * 
- * Saves a program name as "blessed"
- **/
-void
-save_blessed_program (const char *program)
-{
-	GConfClient *conf_client;
-	GSList *l;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return;
-
-	l = gconf_client_get_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL);
-	l = g_slist_append (l, g_strdup (program));
-	gconf_client_set_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, l, NULL);
-	g_slist_foreach (l, (GFunc) g_free, NULL);
-	g_slist_free (l);
-}
-
-/**
- * is_blessed_program:
- * @program: a program name
- * 
- * Checks to see if a program is blessed
- * 
- * Return value: TRUE if program is blessed, FALSE otherwise
- **/
-gboolean
-is_blessed_program (const char *program)
-{
-	GConfClient *conf_client;
-	GSList *l, *n;
-	gboolean found = FALSE;
-
-	if (!(conf_client = config_data_get_conf_client ()))
-		return FALSE;
-
-	l = gconf_client_get_list (conf_client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL);
-	while (l) {
-		n = l->next;
-		if (!found)
-			found = strcmp ((char *) l->data, program) == 0;
-		g_free (l->data);
-		g_slist_free_1 (l);
-		l = n;
-	}
-
-	return found;
-}
diff --git a/calendar/gui/alarm-notify/save.h b/calendar/gui/alarm-notify/save.h
deleted file mode 100644
index f7cc75955c..0000000000
--- a/calendar/gui/alarm-notify/save.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Evolution calendar - Functions to save alarm notification times
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef SAVE_H
-#define SAVE_H
-
-#include <time.h>
-
-void save_notification_time (time_t t);
-time_t get_saved_notification_time (void);
-
-void save_calendars_to_load (GPtrArray *uris);
-GPtrArray *get_calendars_to_load (void);
-
-void save_blessed_program (const char *program);
-gboolean is_blessed_program (const char *program);
-
-#endif
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
deleted file mode 100644
index 4bc91810a5..0000000000
--- a/calendar/gui/alarm-notify/util.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - utility functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
-#include "config-data.h"
-#include "util.h"
-
-/* Converts a time_t to a string, relative to the specified timezone */
-char *
-timet_to_str_with_zone (time_t t, icaltimezone *zone)
-{
-	struct icaltimetype itt;
-	struct tm tm;
-	char buf[256];
-
-	if (t == -1)
-		return g_strdup (_("invalid time"));
-
-	itt = icaltime_from_timet_with_zone (t, FALSE, zone);
-	tm = icaltimetype_to_tm (&itt);
-
-	e_time_format_date_and_time (&tm, config_data_get_24_hour_format (),
-				     FALSE, FALSE, buf, sizeof (buf));
-	return g_strdup (buf);
-}
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
deleted file mode 100644
index 7dae3dd7fe..0000000000
--- a/calendar/gui/alarm-notify/util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - utility functions
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <libecal/e-cal-component.h>
-
-char *timet_to_str_with_zone (time_t t, icaltimezone *zone);
-
-#endif
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in
deleted file mode 100644
index 27e9aa44e2..0000000000
--- a/calendar/gui/apps_evolution_calendar.schemas.in.in
+++ /dev/null
@@ -1,359 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Display -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/timezone</key>
-      <applyto>/apps/evolution/calendar/display/timezone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>UTC</default>
-      <locale name="C">
-        <short>Default timezone for meetings</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
-      <applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Whether to show times in 24h format instead of using am/pm</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/week_start_day</key>
-      <applyto>/apps/evolution/calendar/display/week_start_day</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Weekday the week starts on</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_start_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>9</default>
-      <locale name="C">
-        <short>Hour the workday starts on</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_start_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Minute the workday starts on</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_end_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>17</default>
-      <locale name="C">
-        <short>Hour the workday ends on</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_end_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Minute the workday ends on</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/time_divisions</key>
-      <applyto>/apps/evolution/calendar/display/time_divisions</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>30</default>
-      <locale name="C">
-        <short>Intervals shown in Day and Work Week views</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/default_view</key>
-      <applyto>/apps/evolution/calendar/display/default_view</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>The view showing when the calendar starts</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Position of the horizontal pane</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Position of the vertical pane</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>32000</default>
-      <locale name="C">
-        <short>Position of the horizontal pane in the month view</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Position of the vertical pane in the month view</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/task_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/task_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Position of the vertical pane in the task view</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/compress_weekend</key>
-      <applyto>/apps/evolution/calendar/display/compress_weekend</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Allocate less space to weekend appointments</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_event_end</key>
-      <applyto>/apps/evolution/calendar/display/show_event_end</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show where events end in week and month views</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/working_days</key>
-      <applyto>/apps/evolution/calendar/display/working_days</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>62</default>
-      <locale name="C">
-        <short>Days that are work days</short>
-      </locale>
-    </schema>
-
-    <!-- Tasks -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Whether to hide completed tasks</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_units</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>days</default>
-      <locale name="C">
-        <short>Units for determining when to hide tasks</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_value</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_value</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Number of units for determining when to hide tasks</short>
-      </locale>
-    </schema>
-
-    <!-- Tasks: Colors -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/due_today</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/due_today</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>blue</default>
-      <locale name="C">
-        <short>Color of tasks that are due today</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/overdue</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/overdue</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>red</default>
-      <locale name="C">
-        <short>Color of tasks that are overdue</short>
-      </locale>
-    </schema>
-
-    <!-- Miscellaneous -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_delete</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_delete</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to ask for confirmation on appointment deletion</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_expunge</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_expunge</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to ask for confirmation when folder is expunged</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/use_default_reminder</key>
-      <applyto>/apps/evolution/calendar/other/use_default_reminder</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Whether to set a default reminder for events</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_interval</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_interval</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>15</default>
-      <locale name="C">
-        <short>Number of units for default reminder</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_units</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Units of default reminder</short>
-      </locale>
-    </schema>
-
-    <!-- Date navigator -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/date_navigator/show_week_numbers</key>
-      <applyto>/apps/evolution/calendar/date_navigator/show_week_numbers</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Whether to show week numbers in date navigator</short>
-      </locale>
-    </schema>
-
-    <!-- Alarm notification -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/last_notification_time</key>
-      <applyto>/apps/evolution/calendar/notify/last_notification_time</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>-1</default>
-      <locale name="C">
-        <short>Time last alarm ran</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/calendars</key>
-      <applyto>/apps/evolution/calendar/notify/calendars</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Calendars to run alarms for</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/programs</key>
-      <applyto>/apps/evolution/calendar/notify/programs</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Programs that can run as part of alarms</short>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
deleted file mode 100644
index 477a6d91a7..0000000000
--- a/calendar/gui/cal-search-bar.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include "cal-search-bar.h"
-
-
-
-/* IDs and option items for the ESearchBar */
-enum {
-	SEARCH_ANY_FIELD_CONTAINS,
-	SEARCH_SUMMARY_CONTAINS,
-	SEARCH_DESCRIPTION_CONTAINS,
-	SEARCH_COMMENT_CONTAINS,
-	SEARCH_CATEGORY_IS,
-};
-
-static ESearchBarItem search_option_items[] = {
-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL },
-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL },
-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL },
-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL },
-	{ N_("Category is"), SEARCH_CATEGORY_IS, NULL },
-	{ NULL, -1, NULL }
-};
-
-/* IDs for the categories suboptions */
-#define CATEGORIES_ALL 0
-#define CATEGORIES_UNMATCHED 1
-#define CATEGORIES_OFFSET 3
-
-/* Private part of the CalSearchBar structure */
-struct CalSearchBarPrivate {
-	/* Array of categories */
-	GPtrArray *categories;
-};
-
-
-
-static void cal_search_bar_class_init (CalSearchBarClass *class);
-static void cal_search_bar_init (CalSearchBar *cal_search);
-static void cal_search_bar_destroy (GtkObject *object);
-
-static void cal_search_bar_search_activated (ESearchBar *search);
-
-static ESearchBarClass *parent_class = NULL;
-
-/* Signal IDs */
-enum {
-	SEXP_CHANGED,
-	CATEGORY_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
-
-
-
-E_MAKE_TYPE (cal_search_bar, "CalSearchBar", CalSearchBar, cal_search_bar_class_init,
-	     cal_search_bar_init, E_SEARCH_BAR_TYPE);
-
-/* Class initialization function for the calendar search bar */
-static void
-cal_search_bar_class_init (CalSearchBarClass *class)
-{
-	ESearchBarClass *e_search_bar_class;
-	GtkObjectClass *object_class;
-
-	e_search_bar_class = (ESearchBarClass *) class;
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	cal_search_bar_signals[SEXP_CHANGED] =
-		gtk_signal_new ("sexp_changed",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	cal_search_bar_signals[CATEGORY_CHANGED] =
-		gtk_signal_new ("category_changed",
-				GTK_RUN_FIRST,
-				G_TYPE_FROM_CLASS (object_class),
-				GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	class->sexp_changed = NULL;
-	class->category_changed = NULL;
-
-	e_search_bar_class->search_activated = cal_search_bar_search_activated;
-
-	object_class->destroy = cal_search_bar_destroy;
-}
-
-/* Object initialization function for the calendar search bar */
-static void
-cal_search_bar_init (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-
-	priv = g_new (CalSearchBarPrivate, 1);
-	cal_search->priv = priv;
-
-	priv->categories = g_ptr_array_new ();
-	g_ptr_array_set_size (priv->categories, 0);
-}
-
-/* Frees an array of categories */
-static void
-free_categories (GPtrArray *categories)
-{
-	int i;
-
-	for (i = 0; i < categories->len; i++) {
-		g_assert (categories->pdata[i] != NULL);
-		g_free (categories->pdata[i]);
-	}
-
-	g_ptr_array_free (categories, TRUE);
-}
-
-/* Destroy handler for the calendar search bar */
-static void
-cal_search_bar_destroy (GtkObject *object)
-{
-	CalSearchBar *cal_search;
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_SEARCH_BAR (object));
-
-	cal_search = CAL_SEARCH_BAR (object);
-	priv = cal_search->priv;
-
-	if (priv) {
-		if (priv->categories) {
-			free_categories (priv->categories);
-			priv->categories = NULL;
-		}
-		
-		g_free (priv);
-		cal_search->priv = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Emits the "sexp_changed" signal for the calendar search bar */
-static void
-notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)
-{
-	gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED],
-			 sexp);
-}
-
-/* Returns the string of the currently selected category, NULL for "Unmatched",
- * or (const char *) 1 for "All".
- */
-static const char *
-get_current_category (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id, subid;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-	if (id != SEARCH_CATEGORY_IS)
-		return NULL;
-
-	subid = e_search_bar_get_subitem_id (E_SEARCH_BAR (cal_search));
-	if (subid == CATEGORIES_ALL)
-		return (const char *) 1;
-	else if (subid == CATEGORIES_UNMATCHED)
-		return NULL;
-	else {
-		int i;
-
-		i = subid - CATEGORIES_OFFSET;
-		g_assert (i >= 0 && i < priv->categories->len);
-
-		return priv->categories->pdata[i];
-	}
-}
-
-/* Sets the query string to be (contains? "field" "text") */
-static void
-notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field)
-{
-	char *text;
-	char *sexp;
-
-	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
-	if (!text)
-		return; /* This is an error in the UTF8 conversion, not an empty string! */
-
-	sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);
-	g_free (text);
-
-	notify_sexp_changed (cal_search, sexp);
-	g_free (sexp);
-}
-
-/* Returns a sexp for the selected category in the drop-down menu.  The "All"
- * option is returned as (const char *) 1, and the "Unfiled" option is returned
- * as NULL.
- */
-static char *
-get_category_sexp (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (category == NULL)
-		return g_strdup ("(has-categories? #f)"); /* Unfiled items */
-	else if (category == (const char *) 1)
-		return NULL; /* All items */
-	else
-		return g_strdup_printf ("(has-categories? \"%s\")", category); /* Specific category */
-}
-
-/* Sets the query string to the appropriate match for categories */
-static void
-notify_category_is (CalSearchBar *cal_search)
-{
-	char *sexp;
-
-	sexp = get_category_sexp (cal_search);
-	if (!sexp)
-		notify_sexp_changed (cal_search, "#t"); /* Match all */
-	else
-		notify_sexp_changed (cal_search, sexp);
-
-	if (sexp)
-		g_free (sexp);
-}
-
-/* Creates a new query from the values in the widgets and notifies upstream */
-static void
-regen_query (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	int id;
-	const char *category;
-
-	priv = cal_search->priv;
-
-	/* Fetch the data from the ESearchBar's entry widgets */
-
-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
-
-	/* Generate the different types of queries */
-
-	switch (id) {
-	case SEARCH_ANY_FIELD_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "any");
-		break;
-
-	case SEARCH_SUMMARY_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "summary");
-		break;
-
-	case SEARCH_DESCRIPTION_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "description");
-		break;
-
-	case SEARCH_COMMENT_CONTAINS:
-		notify_e_cal_view_contains (cal_search, "comment");
-		break;
-
-	case SEARCH_CATEGORY_IS:
-		notify_category_is (cal_search);
-
-		category = cal_search_bar_get_category (cal_search);
-		gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],
-				 category);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* search_activated handler for the calendar search bar */
-static void
-cal_search_bar_search_activated (ESearchBar *search)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = CAL_SEARCH_BAR (search);
-	regen_query (cal_search);
-}
-
-
-
-/* Creates the suboptions menu for the ESearchBar with the list of categories */
-static void
-make_suboptions (CalSearchBar *cal_search)
-{
-	CalSearchBarPrivate *priv;
-	ESearchBarSubitem *subitems;
-	int i;
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-
-	/* Categories plus "all", "unmatched", separator, terminator */
-	subitems = g_new (ESearchBarSubitem, priv->categories->len + 3 + 1);
-
-	/* All, unmatched, separator */
-
-	subitems[0].text = _("Any Category");
-	subitems[0].id = CATEGORIES_ALL;
-	subitems[0].translate = FALSE;
-
-	subitems[1].text = _("Unmatched");
-	subitems[1].id = CATEGORIES_UNMATCHED;
-	subitems[1].translate = FALSE;
-
-	/* All the other items */
-
-	if (priv->categories->len > 0) {
-		subitems[2].text = NULL; /* separator */
-		subitems[2].id = 0;
-
-		for (i = 0; i < priv->categories->len; i++) {
-			const char *category;
-			char *str;
-
-			category = priv->categories->pdata[i];
-			str = g_strdup (category ? category : "");
-
-			subitems[i + CATEGORIES_OFFSET].text      = str;
-			subitems[i + CATEGORIES_OFFSET].id        = i + CATEGORIES_OFFSET;
-			subitems[i + CATEGORIES_OFFSET].translate = FALSE;
-		}
-
-		subitems[i + CATEGORIES_OFFSET].id = -1; /* terminator */
-	} else
-		subitems[2].id = -1; /* terminator */
-
-	e_search_bar_set_suboption (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, subitems);
-
-	/* Free the strings */
-	for (i = 0; i < priv->categories->len; i++)
-		g_free (subitems[i + CATEGORIES_OFFSET].text);
-
-	g_free (subitems);
-}
-
-/**
- * cal_search_bar_construct:
- * @cal_search: A calendar search bar.
- * 
- * Constructs a calendar search bar by binding its menu and option items.
- * 
- * Return value: The same value as @cal_search.
- **/
-CalSearchBar *
-cal_search_bar_construct (CalSearchBar *cal_search)
-{
-	g_return_val_if_fail (cal_search != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);
-
-	e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, search_option_items);
-	make_suboptions (cal_search);
-
-	e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL);
-
-	return cal_search;
-}
-
-/**
- * cal_search_bar_new:
- * 
- * Creates a new calendar search bar.
- * 
- * Return value: A newly-created calendar search bar.  You should connect to the
- * "sexp_changed" signal to monitor changes in the generated sexps.
- **/
-GtkWidget *
-cal_search_bar_new (void)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = g_object_new (TYPE_CAL_SEARCH_BAR, NULL);
-	return GTK_WIDGET (cal_search_bar_construct (cal_search));
-}
-
-/* Used from qsort() */
-static int
-compare_categories_cb (const void *a, const void *b)
-{
-	const char **ca, **cb;
-
-	ca = (const char **) a;
-	cb = (const char **) b;
-
-	/* FIXME: should use some utf8 strcoll() thingy */
-	return strcmp (*ca, *cb);
-}
-
-/* Creates a sorted array of categories based on the original one; copies the
- * string values.
- */
-static GPtrArray *
-sort_categories (GPtrArray *categories)
-{
-	GPtrArray *c;
-	int i;
-
-	c = g_ptr_array_new ();
-	g_ptr_array_set_size (c, categories->len);
-
-	for (i = 0; i < categories->len; i++)
-		c->pdata[i] = g_strdup (categories->pdata[i]);
-
-	qsort (c->pdata, c->len, sizeof (gpointer), compare_categories_cb);
-
-	return c;
-}
-
-/**
- * cal_search_bar_set_categories:
- * @cal_search: A calendar search bar.
- * @categories: Array of pointers to strings for the category names.
- * 
- * Sets the list of categories that are to be shown in the drop-down list
- * of a calendar search bar.  The search bar will automatically add an item
- * for "unfiled" components, that is, those that have no categories assigned
- * to them.
- **/
-void
-cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories)
-{
-	CalSearchBarPrivate *priv;
-
-	g_return_if_fail (cal_search != NULL);
-	g_return_if_fail (IS_CAL_SEARCH_BAR (cal_search));
-	g_return_if_fail (categories != NULL);
-
-	priv = cal_search->priv;
-
-	g_assert (priv->categories != NULL);
-	free_categories (priv->categories);
-
-	priv->categories = sort_categories (categories);
-	make_suboptions (cal_search);
-}
-
-/**
- * cal_search_bar_get_category:
- * @cal_search: A calendar search bar.
- * 
- * Queries the currently selected category name in a calendar search bar.
- * If "All" or "Unfiled" are selected, this function will return NULL.
- * 
- * Return value: Name of the selected category, or NULL if there is no
- * selected category.
- **/
-const char *
-cal_search_bar_get_category (CalSearchBar *cal_search)
-{
-	const char *category;
-
-	category = get_current_category (cal_search);
-
-	if (!category || category == (const char *) 1)
-		return NULL;
-	else
-		return category;
-}
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
deleted file mode 100644
index a8910ba7b4..0000000000
--- a/calendar/gui/cal-search-bar.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_SEARCH_BAR_H
-#define CAL_SEARCH_BAR_H
-
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_CAL_SEARCH_BAR            (cal_search_bar_get_type ())
-#define CAL_SEARCH_BAR(obj)            (GTK_CHECK_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))
-#define CAL_SEARCH_BAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR,	\
-					CalSearchBarClass))
-#define IS_CAL_SEARCH_BAR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CAL_SEARCH_BAR))
-#define IS_CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))
-
-typedef struct CalSearchBarPrivate CalSearchBarPrivate;
-
-typedef struct {
-	ESearchBar search_bar;
-
-	/* Private data */
-	CalSearchBarPrivate *priv;
-} CalSearchBar;
-
-typedef struct {
-	ESearchBarClass parent_class;
-
-	/* Notification signals */
-
-	void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp);
-	void (* category_changed) (CalSearchBar *cal_search, const char *category);
-} CalSearchBarClass;
-
-GtkType cal_search_bar_get_type (void);
-
-CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search);
-
-GtkWidget *cal_search_bar_new (void);
-
-void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);
-
-const char *cal_search_bar_get_category (CalSearchBar *cal_search);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index 3ed09c3bc7..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,810 +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>
- *          Rodrigo Moya <rodrigo@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <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/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
-#include <libecal/e-cal-time-util.h>
-#include "shell/Evolution.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "gnome-cal.h"
-#include "goto.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-#include "dialogs/new-calendar.h"
-#include "itip-utils.h"
-#include "evolution-shell-component-utils.h"
-
-/* Focusing information for the calendar view.  We have to keep track of this
- * ourselves because with Bonobo controls, we may get unpaired focus_out events.
- */
-typedef struct {
-	guint calendar_focused : 1;
-	guint taskpad_focused : 1;
-} FocusData;
-
-static void
-file_new_calendar_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	new_calendar_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-}
-
-/* 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);
-}
-
-/* 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
-show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW, FALSE, TRUE);
-}
-
-
-static void
-cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	set_clock_cursor (gcal);
-	gnome_calendar_cut_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-copy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_copy_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-paste_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_paste_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selection (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_occurrence_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selected_occurrence (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-	GList *client_list, *cl;
-	GList *comp_list = NULL;
-	icaltimezone *utc;
-	time_t start = time (NULL), end;
-
-	gcal = GNOME_CALENDAR (data);
-
-	utc = icaltimezone_get_utc_timezone ();
-	start = time_day_begin_with_zone (start, utc);
-	end = time_add_week_with_zone (start, 6, utc);
-
-	/* FIXME Should we aggregate the data? */
-	client_list = e_cal_model_get_client_list (gnome_calendar_get_calendar_model (gcal));
-	for (cl = client_list; cl != NULL; cl = cl->next) {
-		if (e_cal_get_free_busy ((ECal *) cl->data, NULL, start, end, &comp_list, NULL)) {
-			GList *l;
-
-			for (l = comp_list; l; l = l->next) {
-				ECalComponent *comp = E_CAL_COMPONENT (l->data);
-				itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, (ECal *) cl->data, NULL);
-
-				g_object_unref (comp);
-			}
-
-			g_list_free (comp_list);
-		}
-	}
-
-	g_list_free (client_list);
-}
-
-static void
-purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-	GtkWidget *dialog, *parent, *box, *label, *spin;
-	int response;
-
-	gcal = GNOME_CALENDAR (data);
-
-	/* create the dialog */
-	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
-	dialog = gtk_message_dialog_new (
-		(GtkWindow *)parent,
-		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_MESSAGE_WARNING,
-		GTK_BUTTONS_OK_CANCEL,
-		_("This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."));
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-
-	box = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, TRUE, FALSE, 6);
-
-	label = gtk_label_new (_("Purge events older than"));
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 6);
-	spin = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 60.0);
-	gtk_box_pack_start (GTK_BOX (box), spin, FALSE, FALSE, 6);
-	label = gtk_label_new (_("days"));
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 6);
-
-	gtk_widget_show_all (box);
-
-	/* run the dialog */
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	if (response == GTK_RESPONSE_OK) {
-		gint days;
-		time_t tt;
-
-		days = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
-		tt = time (NULL);
-		tt -= (days * (24 * 3600));
-
-		gnome_calendar_purge (gcal, tt);
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-
-const gchar *
-calendar_get_text_for_folder_bar_label (GnomeCalendar *gcal)
-{
-	icaltimezone *zone;
-	struct icaltimetype start_tt, end_tt;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	static char buffer[512];
-	char end_buffer[256];
-	GnomeCalendarViewType view;
-
-	gnome_calendar_get_visible_time_range (gcal, &start_time, &end_time);
-	zone = gnome_calendar_get_timezone (gcal);
-
-	start_tt = icaltime_from_timet_with_zone (start_time, FALSE, zone);
-	start_tm.tm_year = start_tt.year - 1900;
-	start_tm.tm_mon = start_tt.month - 1;
-	start_tm.tm_mday = start_tt.day;
-	start_tm.tm_hour = start_tt.hour;
-	start_tm.tm_min = start_tt.minute;
-	start_tm.tm_sec = start_tt.second;
-	start_tm.tm_isdst = -1;
-	start_tm.tm_wday = time_day_of_week (start_tt.day, start_tt.month - 1,
-					     start_tt.year);
-
-	/* Take one off end_time so we don't get an extra day. */
-	end_tt = icaltime_from_timet_with_zone (end_time - 1, FALSE, zone);
-	end_tm.tm_year = end_tt.year - 1900;
-	end_tm.tm_mon = end_tt.month - 1;
-	end_tm.tm_mday = end_tt.day;
-	end_tm.tm_hour = end_tt.hour;
-	end_tm.tm_min = end_tt.minute;
-	end_tm.tm_sec = end_tt.second;
-	end_tm.tm_isdst = -1;
-	end_tm.tm_wday = time_day_of_week (end_tt.day, end_tt.month - 1,
-					   end_tt.year);
-
-	view = gnome_calendar_get_view (gcal);
-
-	switch (view) {
-	case GNOME_CAL_DAY_VIEW:
-	case GNOME_CAL_WORK_WEEK_VIEW:
-	case GNOME_CAL_WEEK_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year
-		    && start_tm.tm_mon == end_tm.tm_mon
-		    && start_tm.tm_mday == end_tm.tm_mday) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%A %d %B %Y"), &start_tm);
-		} else if (start_tm.tm_year == end_tm.tm_year) {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%a %d %b"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%a %d %b %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%a %d %b %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	case GNOME_CAL_MONTH_VIEW:
-	case GNOME_CAL_LIST_VIEW:
-		if (start_tm.tm_year == end_tm.tm_year) {
-			if (start_tm.tm_mon == end_tm.tm_mon) {
-				if (start_tm.tm_mday == end_tm.tm_mday) {
-					buffer [0] = '\0';
-				} else {
-					e_utf8_strftime (buffer, sizeof (buffer),
-							 "%d", &start_tm);
-					strcat (buffer, " - ");
-				}
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %B %Y"), &end_tm);
-				strcat (buffer, end_buffer);
-			} else {
-				e_utf8_strftime (buffer, sizeof (buffer),
-					  _("%d %B"), &start_tm);
-				e_utf8_strftime (end_buffer, sizeof (end_buffer),
-					  _("%d %B %Y"), &end_tm);
-				strcat (buffer, " - ");
-				strcat (buffer, end_buffer);
-			}
-		} else {
-			e_utf8_strftime (buffer, sizeof (buffer),
-				  _("%d %B %Y"), &start_tm);
-			e_utf8_strftime (end_buffer, sizeof (end_buffer),
-				  _("%d %B %Y"), &end_tm);
-			strcat (buffer, " - ");
-			strcat (buffer, end_buffer);
-		}
-		break;
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-	return buffer;
-}
-
-
-/* Sensitizes the UI Component menu/toolbar calendar commands based on the
- * number of selected events. (This will always be 0 or 1 currently.)  If enable
- * is FALSE, all will be disabled.  Otherwise, the currently-selected number of
- * events will be used.
- */
-void
-calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	ECalendarViewEvent *event;
-	GList *list;
-	int n_selected;
-	GtkWidget *view;
-	ECal *e_cal;
-	gboolean read_only = FALSE, has_recurrences;
-	
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	view = gnome_calendar_get_current_view_widget (gcal);
-	list = e_calendar_view_get_selected_events (E_CALENDAR_VIEW (view));
-
-	n_selected = enable ? g_list_length (list) : 0;
-
-	event = (ECalendarViewEvent *) list ? list->data : NULL;
-	if (event) {
-		e_cal_is_read_only (event->comp_data->client, &read_only, NULL);
-	} else {
-		e_cal = e_cal_model_get_default_client (gnome_calendar_get_calendar_model (gcal));
-		if (e_cal)
-			e_cal_is_read_only (e_cal, &read_only, NULL);
-		else
-			read_only = TRUE;
-	}
-
-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",
-				      enable && !read_only ? "1" : "0",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-
-	/* occurrence-related menu items */
-	has_recurrences = FALSE;
-	if (n_selected > 0 && !read_only) {
-		if (list) {
-			event = (ECalendarViewEvent *) list->data;
-			if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
-				has_recurrences = TRUE;
-		}
-	}
-
-	bonobo_ui_component_set_prop (uic, "/commands/DeleteOccurrence", "sensitive",
-				      has_recurrences ? "1" : "0",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/DeleteAllOccurrences", "sensitive",
-				      has_recurrences ? "1" : "0",
-				      NULL);
-
-	/* free memory */
-	if (list)
-		g_list_free (list);
-}
-
-/* Sensitizes the UI Component menu/toolbar tasks commands based on the number
- * of selected tasks.  If enable is FALSE, all will be disabled.  Otherwise, the
- * currently-selected number of tasks will be used.
- */
-static void
-sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	int n_selected;
-	ECal *e_cal;
-	gboolean read_only = TRUE;
-	
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	n_selected = enable ? gnome_calendar_get_num_tasks_selected (gcal) : 0;
-	e_cal = gnome_calendar_get_task_pad_e_cal (gcal);
-	if (e_cal)
-		e_cal_is_read_only (e_cal, &read_only, NULL);
-	else
-		read_only = TRUE;
-
-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",
-				      n_selected == 0 ? "0" : "1",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",
-				      enable && !read_only ? "1" : "0",
-				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",
-				      n_selected == 0 || read_only ? "0" : "1",
-				      NULL);
-}
-
-/* Callback used when the selection in the calendar views changes */
-static void
-gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-}
-
-/* Callback used when the selection in the taskpad changes */
-static void
-gcal_taskpad_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	sensitize_taskpad_commands (gcal, control, TRUE);
-}
-
-/* Callback used when the focus changes for a calendar view */
-static void
-gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "calendar_selection_changed",
-				  G_CALLBACK (gcal_calendar_selection_changed_cb), control);
-		calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-		focus->calendar_focused = TRUE;
-	} else if (focus->calendar_focused) {
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       G_CALLBACK (gcal_calendar_selection_changed_cb),
-					       control);
-		calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
-		focus->calendar_focused = FALSE;
-	}
-}
-
-/* Callback used when the taskpad focus changes */
-static void
-gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
-{
-	BonoboControl *control;
-	FocusData *focus;
-
-	control = BONOBO_CONTROL (data);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	if (in) {
-		g_signal_connect (gcal, "taskpad_selection_changed",
-				  G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
-		sensitize_taskpad_commands (gcal, control, TRUE);
-		focus->taskpad_focused = TRUE;
-	} else if (focus->taskpad_focused) {
-		/* With Bonobo controls, we may get unpaired focus_out events.
-		 * That is why we have to keep track of this ourselves instead
-		 * of blindly assumming that we are getting this event because
-		 * the taskpad was in fact focused.
-		 */
-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
-					       G_CALLBACK (gcal_taskpad_selection_changed_cb),
-					       control);
-		sensitize_taskpad_commands (gcal, control, FALSE);
-		focus->taskpad_focused = FALSE;
-	}
-
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("NewCalendar", file_new_calendar_cb),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
-
-	BONOBO_UI_VERB ("Cut", cut_cmd),
-	BONOBO_UI_VERB ("Copy", copy_cmd),
-	BONOBO_UI_VERB ("Paste", paste_cmd),
-	BONOBO_UI_VERB ("Delete", delete_cmd),
-	BONOBO_UI_VERB ("DeleteOccurrence", delete_occurrence_cmd),
-	BONOBO_UI_VERB ("DeleteAllOccurrences", delete_cmd),
-
-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),
-
-	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked),
-	BONOBO_UI_VERB ("ShowListView", show_list_view_clicked),
-
-	BONOBO_UI_VERB ("PublishFreeBusy", publish_freebusy_cmd),
-	BONOBO_UI_VERB ("CalendarPurge", purge_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] =
-{
-	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 ("/Toolbar/ListView",	      "buttons/listview.xpm"),
-
-	E_PIXMAP_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *gcal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-	FocusData *focus;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control, NULL);
-	bonobo_ui_component_set_container (uic, remote_uih, NULL);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, gcal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-calendar.xml",
-			       "evolution-calendar",
-			       NULL);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	gnome_calendar_setup_view_menus (gcal, uic);
-
-	g_signal_connect (gcal, "calendar_focus_change",
-			  G_CALLBACK (gcal_calendar_focus_change_cb), control);
-	g_signal_connect (gcal, "taskpad_focus_change",
-			  G_CALLBACK (gcal_taskpad_focus_change_cb), control);
-
-	calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
-	sensitize_taskpad_commands (gcal, control, FALSE);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	/* Show the dialog for setting the timezone if the user hasn't chosen
-	   a default timezone already. This is done in the startup wizard now,
-	   so we don't do it here. */
-#if 0
-	calendar_config_check_timezone_set ();
-#endif
-
-	focus = g_new (FocusData, 1);
-	focus->calendar_focused = FALSE;
-	focus->taskpad_focused = FALSE;
-
-	g_object_set_data (G_OBJECT (control), "focus_data", focus);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
-{
-	FocusData *focus;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	gnome_calendar_set_ui_component (gcal, uic);
-
-	focus = g_object_get_data (G_OBJECT (control), "focus_data");
-	g_assert (focus != NULL);
-
-	g_object_set_data (G_OBJECT (control), "focus_data", NULL);
-	g_free (focus);
-
-	gnome_calendar_discard_view_menus (gcal);
-
-	g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic, NULL);
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index 901d01d845..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 version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include "gnome-cal.h"
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-component.h>
-
-void calendar_control_activate (BonoboControl *control, GnomeCalendar *gcal);
-void calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal);
-
-void calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable);
-
-void calendar_goto_today (GnomeCalendar *gcal);
-
-const gchar * calendar_get_text_for_folder_bar_label (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 455ede19ba..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,902 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.c
- *
- * Copyright (C) 2003  Ettore Perazzoli
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ettore Perazzoli <ettore@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <errno.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
-#include <bonobo/bonobo-exception.h>
-#include "calendar-config.h"
-#include "calendar-component.h"
-#include "calendar-commands.h"
-#include "gnome-cal.h"
-#include "migration.h"
-#include "e-comp-editor-registry.h"
-#include "comp-util.h"
-#include "dialogs/new-calendar.h"
-#include "dialogs/comp-editor.h"
-#include "dialogs/copy-source-dialog.h"
-#include "dialogs/event-editor.h"
-#include "widgets/misc/e-source-selector.h"
-
-
-/* IDs for user creatable items */
-#define CREATE_EVENT_ID "event"
-#define CREATE_MEETING_ID "meeting"
-#define CREATE_ALLDAY_EVENT_ID "allday-event"
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _CalendarComponentPrivate {
-	char *config_directory;
-
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-	GSList *source_selection;
-	
-	GnomeCalendar *calendar;
-	GtkWidget *source_selector;
-
-	ECal *create_ecal;
-
-	GList *notifications;
-
-	EActivityHandler *activity_handler;
-};
-
-/* FIXME This should be gnome cal likely */
-extern ECompEditorRegistry *comp_editor_registry;
-
-/* Utility functions.  */
-
-static void
-add_uri_for_source (ESource *source, GnomeCalendar *calendar)
-{
-	char *uri = e_source_get_uri (source);
-
-	gnome_calendar_add_event_uri (calendar, uri);
-	g_free (uri);
-}
-
-static void
-remove_uri_for_source (ESource *source, GnomeCalendar *calendar)
-{
-	char *uri = e_source_get_uri (source);
-
-	gnome_calendar_remove_event_uri (calendar, uri);
-	g_free (uri);
-}
-
-static gboolean
-is_in_selection (GSList *selection, ESource *source)
-{
-	GSList *l;
-	
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		if (!strcmp (e_source_peek_uid (selected_source), e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-is_in_uids (GSList *uids, ESource *source)
-{
-	GSList *l;
-	
-	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
-		
-		if (!strcmp (uid, e_source_peek_uid (source)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static ESource *
-find_first_source (ESourceList *source_list)
-{
-	GSList *groups, *sources, *l, *m;
-			
-	groups = e_source_list_peek_groups (source_list);
-	for (l = groups; l; l = l->next) {
-		ESourceGroup *group = l->data;
-				
-		sources = e_source_group_peek_sources (group);
-		for (m = sources; m; m = m->next) {
-			ESource *source = m->data;
-
-			return source;
-		}				
-	}
-
-	return NULL;
-}
-
-static void
-update_uris_for_selection (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	GSList *selection, *l, *uids_selected = NULL;
-	
-	priv = calendar_component->priv;
-	
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
-
-	for (l = priv->source_selection; l; l = l->next) {
-		ESource *old_selected_source = l->data;
-
-		if (!is_in_selection (selection, old_selected_source))
-			remove_uri_for_source (old_selected_source, priv->calendar);
-	}	
-	
-	for (l = selection; l; l = l->next) {
-		ESource *selected_source = l->data;
-		
-		add_uri_for_source (selected_source, priv->calendar);
-		uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
-	}
-	
-	e_source_selector_free_selection (priv->source_selection);
-	priv->source_selection = selection;
-
-	/* Save the selection for next time we start up */
-	calendar_config_set_calendars_selected (uids_selected);
-	g_slist_free (uids_selected);
-}
-
-static void
-update_uri_for_primary_selection (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	ESource *source;
-	char *uri;
-
-	priv = calendar_component->priv;
-	
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!source)
-		return;
-
-	/* Set the default */
-	uri = e_source_get_uri (source);
-	gnome_calendar_set_default_uri (priv->calendar, uri);
-	g_free (uri);
-	
-	/* Save the selection for next time we start up */
-	calendar_config_set_primary_calendar (e_source_peek_uid (source));
-}
-
-static void
-update_selection (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	GSList *selection, *uids_selected, *l;
-
-	priv = calendar_component->priv;
-
-	/* Get the selection in gconf */
-	uids_selected = calendar_config_get_calendars_selected ();
-
-	/* Remove any that aren't there any more */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
-
-	for (l = selection; l; l = l->next) {
-		ESource *source = l->data;
-
-		if (!is_in_uids (uids_selected, source)) 
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector), source);
-	}
-	
-	e_source_selector_free_selection (selection);
-
-	/* Make sure the whole selection is there */
-	for (l = uids_selected; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		if (source) 
-			e_source_selector_select_source (E_SOURCE_SELECTOR (priv->source_selector), source);
-		
-		g_free (uid);
-	}
-	g_slist_free (uids_selected);
-}
-
-static void
-update_primary_selection (CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv;
-	ESource *source;
-	char *uid;
-
-	priv = calendar_component->priv;
-
-	uid = calendar_config_get_primary_calendar ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-	
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
-	} else {
-		ESource *source;
-		
-		/* Try to create a default if there isn't one */
-		source = find_first_source (priv->source_list);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
-	}
-}
-
-/* FIXME This is duplicated from comp-editor-factory.c, should it go in comp-util? */
-static ECalComponent *
-get_default_event (ECal *client, gboolean all_day) 
-{
-	ECalComponent *comp;
-	struct icaltimetype itt;
-	ECalComponentDateTime dt;
-	char *location;
-	icaltimezone *zone;
-
-	comp = cal_comp_event_new_with_defaults (client);
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	if (all_day) {
-		itt = icaltime_from_timet_with_zone (time (NULL), 1, zone);
-
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		e_cal_component_set_dtend (comp, &dt);		
-	} else {
-		itt = icaltime_current_time_with_zone (zone);
-		icaltime_adjust (&itt, 0, 1, -itt.minute, -itt.second);
-		
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		icaltime_adjust (&itt, 0, 1, 0, 0);
-		e_cal_component_set_dtend (comp, &dt);
-	}
-
-	e_cal_component_commit_sequence (comp);
-
-	return comp;
-}
-
-/* Callbacks.  */
-static void
-add_popup_menu_item (GtkMenu *menu, const char *label, const char *pixmap,
-		     GCallback callback, gpointer user_data, gboolean sensitive)
-{
-	GtkWidget *item, *image;
-
-	if (pixmap) {
-		item = gtk_image_menu_item_new_with_label (label);
-
-		/* load the image */
-		image = gtk_image_new_from_stock (pixmap, GTK_ICON_SIZE_MENU);
-		if (!image)
-			image = gtk_image_new_from_file (pixmap);
-
-		if (image) {
-			gtk_widget_show (image);
-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		}
-	} else {
-		item = gtk_menu_item_new_with_label (label);
-	}
-
-	if (callback)
-		g_signal_connect (G_OBJECT (item), "activate", callback, user_data);
-
-	if (!sensitive)
-		gtk_widget_set_sensitive (item, FALSE);
-
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	gtk_widget_show (item);
-}
-
-static void
-copy_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
-{
-	ESource *selected_source;
-	CalendarComponentPrivate *priv;
-
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!selected_source)
-		return;
-
-	copy_source_dialog (GTK_WINDOW (gtk_widget_get_toplevel (widget)), selected_source, CALOBJ_TYPE_EVENT);
-}
-
-static void
-delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
-{
-	ESource *selected_source;
-	CalendarComponentPrivate *priv;
-	GtkWidget *dialog;
-
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!selected_source)
-		return;
-
-	/* create the confirmation dialog */
-	dialog = gtk_message_dialog_new (
-		GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-		GTK_DIALOG_MODAL,
-		GTK_MESSAGE_QUESTION,
-		GTK_BUTTONS_YES_NO,
-		_("Calendar '%s' will be removed. Are you sure you want to continue?"),
-		e_source_peek_name (selected_source));
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) {
-		if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->source_selector),
-							  selected_source))
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector),
-							   selected_source);
-		
-		e_source_group_remove_source (e_source_peek_group (selected_source), selected_source);
-
-		/* FIXME: remove the calendar.ics file and the directory */
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-static void
-new_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
-{
-	new_calendar_dialog (GTK_WINDOW (gtk_widget_get_toplevel (widget)));
-}
-
-static void
-rename_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
-{
-	CalendarComponentPrivate *priv;
-	ESource *selected_source;
-	GtkWidget *dialog, *entry;
-
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!selected_source)
-		return;
-
-	/* create the dialog to prompt the user for the new name */
-	dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-					 GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_OK_CANCEL,
-					 _("Rename this calendar to"));
-	entry = gtk_entry_new ();
-	gtk_entry_set_text (GTK_ENTRY (entry), e_source_peek_name (selected_source));
-	gtk_widget_show (entry);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), entry, TRUE, FALSE, 6);
-
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-		e_source_set_name (selected_source, gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	gtk_widget_destroy (dialog);
-}
-
-static void
-fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, CalendarComponent *comp)
-{
-	gboolean sensitive;
-
-	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (comp->priv->source_selector)) ?
-		TRUE : FALSE;
-
-	add_popup_menu_item (menu, _("New Calendar"), GTK_STOCK_NEW, G_CALLBACK (new_calendar_cb), comp, TRUE);
-	add_popup_menu_item (menu, _("Copy"), NULL, G_CALLBACK (copy_calendar_cb), comp, sensitive);
-	add_popup_menu_item (menu, _("Rename"), NULL, G_CALLBACK (rename_calendar_cb), comp, sensitive);
-	add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_calendar_cb), comp, sensitive);
-}
-
-static void
-source_selection_changed_cb (ESourceSelector *selector, 
-			     CalendarComponent *calendar_component)
-{
-	update_uris_for_selection (calendar_component);
-}
-
-static void
-primary_source_selection_changed_cb (ESourceSelector *selector,
-				     CalendarComponent *calendar_component)
-{
-	update_uri_for_primary_selection (calendar_component);
-}
-
-static void
-config_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_selection (data);
-}
-
-
-static void
-config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_primary_selection (data);
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
-	GList *l;
-	
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->source_selection != NULL) {
-		e_source_selector_free_selection (priv->source_selection);
-		priv->source_selection = NULL;
-	}
-	
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-		
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
-
-	g_free (priv->config_directory);
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-/* Evolution::Component CORBA methods.  */
-
-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
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-	GtkWidget *selector_scrolled_window;
-	GtkWidget *statusbar_widget;
-	BonoboControl *sidebar_control;
-	BonoboControl *view_control;
-	BonoboControl *statusbar_control;
-	guint not;
-	
-	priv = calendar_component->priv;
-	
-	/* Create sidebar selector */
-	priv->source_selector = e_source_selector_new (calendar_component->priv->source_list);
-	gtk_widget_show (priv->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), priv->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	sidebar_control = bonobo_control_new (selector_scrolled_window);
-
-	/* Create main calendar view */
-	/* FIXME Instead of returning, we should make a control with a
-	 * label describing the problem */
-	priv->calendar = GNOME_CALENDAR (gnome_calendar_new ());
-	if (!priv->calendar) {
-		g_warning (G_STRLOC ": could not create the calendar widget!");
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
-	}
-	
-	gtk_widget_show (GTK_WIDGET (priv->calendar));
-
-	view_control = bonobo_control_new (GTK_WIDGET (priv->calendar));
-	if (!view_control) {
-		g_warning (G_STRLOC ": could not create the control!");
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
-	}
-	g_object_set_data (G_OBJECT (priv->calendar), "control", view_control);
-
-	g_signal_connect (view_control, "activate", G_CALLBACK (control_activate_cb), priv->calendar);
-
-	g_signal_connect_object (priv->source_selector, "selection_changed",
-				 G_CALLBACK (source_selection_changed_cb), 
-				 G_OBJECT (calendar_component), 0);
-	g_signal_connect_object (priv->source_selector, "primary_selection_changed",
-				 G_CALLBACK (primary_source_selection_changed_cb), 
-				 G_OBJECT (calendar_component), 0);
-	g_signal_connect_object (priv->source_selector, "fill_popup_menu",
-				 G_CALLBACK (fill_popup_menu_cb),
-				 G_OBJECT (calendar_component), 0);
-
-	statusbar_widget = e_task_bar_new ();
-	gtk_widget_show (statusbar_widget);
-	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
-	statusbar_control = bonobo_control_new (statusbar_widget);
-
-	/* Load the selection from the last run */
-	update_selection (calendar_component);	
-	update_primary_selection (calendar_component);
-
-	/* If it gets fiddled with update */
-	not = calendar_config_add_notification_calendars_selected (config_selection_changed_cb, 
-								   calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_primary_calendar (config_primary_selection_changed_cb, 
-								 calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-	
-	/* Return the controls */
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
-}
-
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 3;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = CREATE_EVENT_ID;
-	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
-	list->_buffer[0].tooltip = _("Create a new appointment");
-	list->_buffer[0].menuShortcut = 'a';
-	list->_buffer[0].iconName = "new_appointment.xpm";
-
-	list->_buffer[1].id = CREATE_MEETING_ID;
-	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
-	list->_buffer[1].tooltip = _("Create a new meeting request");
-	list->_buffer[1].menuShortcut = 'e';
-	list->_buffer[1].iconName = "meeting-request-16.png";
-
-	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
-	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All _Day Appointment");
-	list->_buffer[2].tooltip = _("Create a new all-day appointment");
-	list->_buffer[2].menuShortcut = 'd';
-	list->_buffer[2].iconName = "new_all_day_event.png";
-
-	return list;
-}
-
-static void
-config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{	
-	CalendarComponent *calendar_component = data;
-	CalendarComponentPrivate *priv;
-	
-	priv = calendar_component->priv;
-
-	g_object_unref (priv->create_ecal);
-	priv->create_ecal = NULL;
-	
-	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
-}
-
-static gboolean
-setup_create_ecal (CalendarComponent *calendar_component) 
-{
-	CalendarComponentPrivate *priv;
-	ESource *source = NULL;
-	char *uid;
-	guint not;
-	
-	priv = calendar_component->priv;
-
-	if (priv->create_ecal)
-		return TRUE; 
-
-	/* Try to use the client from the calendar first to avoid re-opening things */
-	if (priv->calendar) {
-		ECal *default_ecal;
-		
-		default_ecal = gnome_calendar_get_default_client (priv->calendar);
-		if (default_ecal) {
-			priv->create_ecal = g_object_ref (default_ecal);
-			return TRUE;
-		}
-	}
-	
-	/* Get the current primary calendar, or try to set one if it doesn't already exist */		
-	uid = calendar_config_get_primary_calendar ();
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-
-		priv->create_ecal = e_cal_new (source, CALOBJ_TYPE_EVENT);
-	} 
-
-	if (!priv->create_ecal) {
-		/* Try to create a default if there isn't one */
-		source = find_first_source (priv->source_list);
-		if (source)
-			priv->create_ecal = e_cal_new (source, CALOBJ_TYPE_EVENT);
-	}
-		
-	if (priv->create_ecal) {
-		if (!e_cal_open (priv->create_ecal, FALSE, NULL)) {
-			GtkWidget *dialog;
-			
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-							 _("Unable to open the calendar '%s' for creating events and meetings"), 
-							   e_source_peek_name (source));
-			gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-
-			return FALSE;
-		}
-	} else {
-		GtkWidget *dialog;
-			
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("There is no calendar available for creating events and meetings"));
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-
-		return FALSE;
-	}		
-
-	/* Handle the fact it may change on us */
-	not = calendar_config_add_notification_primary_calendar (config_create_ecal_changed_cb, 
-								 calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Save the primary source for use elsewhere */
-	calendar_config_set_primary_calendar (e_source_peek_uid (source));
-
-	return TRUE;
-}
-
-static void
-impl_requestCreateItem (PortableServer_Servant servant,
-			const CORBA_char *item_type_name,
-			CORBA_Environment *ev)
-{
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-	ECalComponent *comp;
-	EventEditor *editor;
-	gboolean is_meeting = FALSE;
-	
-	priv = calendar_component->priv;
-
-	if (!setup_create_ecal (calendar_component))
-		return;
-		
-	editor = event_editor_new (priv->create_ecal);
-	
-	if (strcmp (item_type_name, CREATE_EVENT_ID) == 0) {
-		comp = get_default_event (priv->create_ecal, FALSE);
- 	} else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0) {
-		comp = get_default_event (priv->create_ecal, TRUE);
-	} else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0) {
-		comp = get_default_event (priv->create_ecal, FALSE);
-		is_meeting = TRUE;
-	} else {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
-		return;
-	}	
-
-	comp_editor_edit_comp (COMP_EDITOR (editor), comp);
-	if (is_meeting)
-		event_editor_show_meeting (editor);
-	comp_editor_focus (COMP_EDITOR (editor));
-
-	e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
-}
-
-
-/* Initialization.  */
-
-static void
-calendar_component_class_init (CalendarComponentClass *class)
-{
-	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	parent_class = g_type_class_peek_parent (class);
-
-	epv->createControls          = impl_createControls;
-	epv->_get_userCreatableItems = impl__get_userCreatableItems;
-	epv->requestCreateItem       = impl_requestCreateItem;
-
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-}
-
-static void
-calendar_component_init (CalendarComponent *component)
-{
-	CalendarComponentPrivate *priv;
-	GSList *groups;
-
-	priv = g_new0 (CalendarComponentPrivate, 1);
-
-	priv->config_directory = g_build_filename (g_get_home_dir (),
-						   ".evolution", "calendar", "config",
-						   NULL);
-
-	/* EPFIXME: Should use a custom one instead?  Also we should add
-	 * calendar_component_peek_gconf_client().  */
-	priv->gconf_client = gconf_client_get_default ();
-
-	priv->source_list = e_source_list_new_for_gconf (priv->gconf_client,
-							 "/apps/evolution/calendar/sources");
-
-	priv->activity_handler = e_activity_handler_new ();
-
-	/* create default calendars if there are no groups */
-	groups = e_source_list_peek_groups (priv->source_list);
-	if (!groups) {
-		ESourceGroup *group;
-		ESource *source;
-		char *base_uri, *new_dir;
-
-		/* create the local source group */
-		base_uri = g_build_filename (g_get_home_dir (),
-					     "/.evolution/calendar/local/OnThisComputer/",
-					     NULL);
-		group = e_source_group_new (_("On This Computer"), base_uri);
-		e_source_list_add_group (priv->source_list, group, -1);
-
-		/* migrate calendars from older setup */
-		if (!migrate_old_calendars (group)) {
-			/* create default calendars */
-			new_dir = g_build_filename (base_uri, "Personal/", NULL);
-			if (!e_mkdir_hier (new_dir, 0700)) {
-				source = e_source_new (_("Personal"), "Personal");
-				e_source_group_add_source (group, source, -1);
-			}
-			g_free (new_dir);
-
-			new_dir = g_build_filename (base_uri, "Work/", NULL);
-			if (!e_mkdir_hier (new_dir, 0700)) {
-				source = e_source_new (_("Work"), "Work");
-				e_source_group_add_source (group, source, -1);
-			}
-			g_free (new_dir);
-		}
-
-		g_free (base_uri);
-
-		/* create the remote source group */
-		group = e_source_group_new (_("On The Web"), "webcal://");
-		e_source_list_add_group (priv->source_list, group, -1);
-	}
-
-	component->priv = priv;
-}
-
-
-/* Public API.  */
-
-CalendarComponent *
-calendar_component_peek (void)
-{
-	static CalendarComponent *component = NULL;
-
-	if (component == NULL) {
-		component = g_object_new (calendar_component_get_type (), NULL);
-
-		if (e_mkdir_hier (calendar_component_peek_config_directory (component), 0777) != 0) {
-			g_warning (G_STRLOC ": Cannot create directory %s: %s",
-				   calendar_component_peek_config_directory (component),
-				   g_strerror (errno));
-			g_object_unref (component);
-			component = NULL;
-		}
-	}
-
-	return component;
-}
-
-const char *
-calendar_component_peek_config_directory (CalendarComponent *component)
-{
-	return component->priv->config_directory;
-}
-
-
-EActivityHandler *
-calendar_component_peek_activity_handler (CalendarComponent *component)
-{
-	return component->priv->activity_handler;
-}
-
-
-BONOBO_TYPE_FUNC_FULL (CalendarComponent, GNOME_Evolution_Component, PARENT_TYPE, calendar_component)
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index 77d2fe9879..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.h
- *
- * Copyright (C) 2003  Ettore Perazzoli
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CALENDAR_COMPONENT_H_
-#define _CALENDAR_COMPONENT_H_
-
-
-#include <bonobo/bonobo-object.h>
-#include <libedataserver/e-source-list.h>
-
-#include "e-activity-handler.h"
-#include "Evolution.h"
-
-
-#define CALENDAR_TYPE_COMPONENT			(calendar_component_get_type ())
-#define CALENDAR_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent))
-#define CALENDAR_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass))
-#define CALENDAR_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-#define CALENDAR_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
-
-
-typedef struct _CalendarComponent        CalendarComponent;
-typedef struct _CalendarComponentPrivate CalendarComponentPrivate;
-typedef struct _CalendarComponentClass   CalendarComponentClass;
-
-struct _CalendarComponent {
-	BonoboObject parent;
-
-	CalendarComponentPrivate *priv;
-};
-
-struct _CalendarComponentClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Component__epv epv;
-};
-
-
-GType calendar_component_get_type  (void);
-
-CalendarComponent *calendar_component_peek  (void);
-
-const char       *calendar_component_peek_config_directory  (CalendarComponent *component);
-ESourceList      *calendar_component_peek_source_list       (CalendarComponent *component);
-EActivityHandler *calendar_component_peek_activity_handler  (CalendarComponent *component);
-
-
-#endif /* _CALENDAR_COMPONENT_H_ */
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
deleted file mode 100644
index ebe16b6539..0000000000
--- a/calendar/gui/calendar-config-keys.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors :
- *  JP Rosevear <jpr@ximian.com>
- *
- * Copyright 2003, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _CALENDAR_CONFIG_KEYS_H_
-#define _CALENDAR_CONFIG_KEYS_H_
-
-G_BEGIN_DECLS
-
-#define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar"
-
-/* Display settings */
-#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone"
-#define CALENDAR_CONFIG_SELECTED_CALENDARS CALENDAR_CONFIG_PREFIX "/display/selected_calendars"
-#define CALENDAR_CONFIG_PRIMARY_CALENDAR CALENDAR_CONFIG_PREFIX "/display/primary_calendar"
-#define CALENDAR_CONFIG_24HOUR CALENDAR_CONFIG_PREFIX "/display/use_24hour_format"
-#define CALENDAR_CONFIG_WEEK_START CALENDAR_CONFIG_PREFIX "/display/week_start_day"
-#define CALENDAR_CONFIG_DAY_START_HOUR CALENDAR_CONFIG_PREFIX "/display/day_start_hour"
-#define CALENDAR_CONFIG_DAY_START_MINUTE CALENDAR_CONFIG_PREFIX "/display/day_start_minute"
-#define CALENDAR_CONFIG_DAY_END_HOUR CALENDAR_CONFIG_PREFIX "/display/day_end_hour"
-#define CALENDAR_CONFIG_DAY_END_MINUTE CALENDAR_CONFIG_PREFIX "/display/day_end_minute"
-#define CALENDAR_CONFIG_TIME_DIVISIONS CALENDAR_CONFIG_PREFIX "/display/time_divisions"
-#define CALENDAR_CONFIG_TIME_DIVISIONS CALENDAR_CONFIG_PREFIX "/display/time_divisions"
-#define CALENDAR_CONFIG_DEFAULT_VIEW CALENDAR_CONFIG_PREFIX "/display/default_view"
-#define CALENDAR_CONFIG_HPANE_POS CALENDAR_CONFIG_PREFIX "/display/hpane_position"
-#define CALENDAR_CONFIG_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/vpane_position"
-#define CALENDAR_CONFIG_MONTH_HPANE_POS CALENDAR_CONFIG_PREFIX "/display/month_hpane_position"
-#define CALENDAR_CONFIG_MONTH_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/month_vpane_position"
-#define CALENDAR_CONFIG_TASK_VPANE_POS CALENDAR_CONFIG_PREFIX "/display/task_vpane_position"
-#define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend"
-#define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end"
-#define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days"
-
-/* Date navigator settings */
-#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers"
-
-/* Task display settings */
-#define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks"
-#define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED CALENDAR_CONFIG_PREFIX "/tasks/hide_completed"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS CALENDAR_CONFIG_PREFIX "/tasks/hide_completed_units"
-#define CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE CALENDAR_CONFIG_PREFIX "/tasks/hide_completed_value"
-#define CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR CALENDAR_CONFIG_PREFIX "/tasks/colors/due_today"
-#define CALENDAR_CONFIG_TASKS_OVERDUE_COLOR CALENDAR_CONFIG_PREFIX "/tasks/colors/overdue"
-
-/* Prompt settings */
-#define CALENDAR_CONFIG_PROMPT_DELETE CALENDAR_CONFIG_PREFIX "/prompts/confirm_delete"
-#define CALENDAR_CONFIG_PROMPT_PURGE CALENDAR_CONFIG_PREFIX "/prompts/confirm_purge"
-
-/* Default reminder */
-#define CALENDAR_CONFIG_DEFAULT_REMINDER CALENDAR_CONFIG_PREFIX "/other/use_default_reminder"
-#define CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL CALENDAR_CONFIG_PREFIX "/other/default_reminder_interval"
-#define CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS CALENDAR_CONFIG_PREFIX "/other/default_reminder_units"
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
deleted file mode 100644
index 3c12c381ac..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,1027 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.c - functions to load/save/get/set user settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <gal/util/e-util.h>
-#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include <libecal/e-cal-time-util.h>
-
-#include "calendar-component.h"
-#include "calendar-commands.h"
-#include "e-tasks.h"
-#include "e-cell-date-edit-text.h"
-#include "calendar-config-keys.h"
-#include "calendar-config.h"
-
-
-
-static GConfClient *config = NULL;
-
-static void on_timezone_set		(GnomeDialog	*dialog,
-					 int		 button,
-					 ETimezoneDialog *etd);
-static gboolean on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-						 GdkEvent	*event,
-						 ETimezoneDialog *etd);
-
-static void
-do_cleanup (void)
-{
-	g_object_unref (config);
-	config = NULL;
-}
-
-void
-calendar_config_init			(void)
-{
-	if (config)
-		return;
-
-	config = gconf_client_get_default ();
-	g_atexit ((GVoidFunc) do_cleanup);
-
-	gconf_client_add_dir (config, CALENDAR_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-}
-
-void
-calendar_config_remove_notification (guint id)
-{
-	gconf_client_notify_remove (config, id);
-}
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, in which
-   case the user can choose between 12 and 24-hour time formats. */
-gboolean
-calendar_config_locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-
-	e_utf8_strftime (s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-/* Returns the string representation of a units value */
-static const char *
-units_to_string (CalUnits units)
-{
-	switch (units) {
-	case CAL_DAYS:
-		return "days";
-
-	case CAL_HOURS:
-		return "hours";
-
-	case CAL_MINUTES:
-		return "minutes";
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/*
- * Calendar Settings.
- */
-
-/* The current list of calendars selected */
-GSList *
-calendar_config_get_calendars_selected (void)
-{
-	return gconf_client_get_list (config, CALENDAR_CONFIG_SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_calendars_selected (GSList *selected)
-{
-	gconf_client_set_list (config, CALENDAR_CONFIG_SELECTED_CALENDARS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_SELECTED_CALENDARS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The primary calendar */
-char *
-calendar_config_get_primary_calendar (void)
-{
-	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, NULL);
-}
-
-void
-calendar_config_set_primary_calendar (const char *primary_uid)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, primary_uid, NULL);
-}
-
-
-guint
-calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, func, data, NULL, NULL);
-	
-	return id;
-}
-
-
-/* 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)
-{
-	/* FIXME Guard against NULL? */
-	return gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL);
-}
-
-
-/* Sets the timezone. If set to NULL it defaults to UTC.
-   FIXME: Should check it is being set to a valid timezone. */
-void
-calendar_config_set_timezone (gchar *timezone)
-{
-	if (timezone && timezone[0])
-		gconf_client_set_string (config, CALENDAR_CONFIG_TIMEZONE, timezone, NULL);
-	else
-		gconf_client_set_string (config, CALENDAR_CONFIG_TIMEZONE, "UTC", NULL);
-}
-
-guint
-calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TIMEZONE, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean
-calendar_config_get_24_hour_format	(void)
-{
-	/* If the locale defines 'am' and 'pm' strings then the user has the
-	   choice of 12-hour or 24-hour time format, with 12-hour as the
-	   default. If the locale doesn't have 'am' and 'pm' strings we have
-	   to use 24-hour format, or strftime()/strptime() won't work. */
-	if (calendar_config_locale_supports_12_hour_format ())
-		return gconf_client_get_bool (config, CALENDAR_CONFIG_24HOUR, NULL);
-
-	return TRUE;
-}
-
-
-void
-calendar_config_set_24_hour_format	(gboolean     use_24_hour)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_24HOUR, use_24_hour, NULL);
-}
-
-guint
-calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_24HOUR, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The start day of the week (0 = Sun to 6 = Mon). */
-gint
-calendar_config_get_week_start_day	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_WEEK_START, NULL);
-}
-
-
-void
-calendar_config_set_week_start_day	(gint	      week_start_day)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_WEEK_START, week_start_day, NULL);
-}
-
-guint 
-calendar_config_add_notification_week_start_day (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_WEEK_START, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* The start and end times of the work-day. */
-gint
-calendar_config_get_day_start_hour	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_HOUR, NULL);
-}
-
-
-void
-calendar_config_set_day_start_hour	(gint	      day_start_hour)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_START_HOUR, day_start_hour, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_start_hour (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_START_HOUR, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_start_minute	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, NULL);
-}
-
-
-void
-calendar_config_set_day_start_minute	(gint	      day_start_min)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, day_start_min, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_start_minute (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_START_MINUTE, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_end_hour	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_HOUR, NULL);
-}
-
-
-void
-calendar_config_set_day_end_hour	(gint	      day_end_hour)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_END_HOUR, day_end_hour, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_end_hour (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_END_HOUR, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-gint
-calendar_config_get_day_end_minute	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, NULL);
-}
-
-
-void
-calendar_config_set_day_end_minute	(gint	      day_end_min)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, day_end_min, NULL);
-}
-
-guint 
-calendar_config_add_notification_day_end_minute (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_END_MINUTE, func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint
-calendar_config_get_time_divisions	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, NULL);
-}
-
-
-void
-calendar_config_set_time_divisions	(gint	      divisions)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, divisions, NULL);
-}
-
-guint
-calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TIME_DIVISIONS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean
-calendar_config_get_dnav_show_week_no	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL);
-}
-
-
-void
-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, show_week_no, NULL);
-}
-
-guint 
-calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */
-gint
-calendar_config_get_default_view	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DEFAULT_VIEW, NULL);
-}
-
-
-void
-calendar_config_set_default_view	(gint	      view)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DEFAULT_VIEW, view, NULL);
-}
-
-
-/* The positions of the panes in the normal and month views. */
-gint
-calendar_config_get_hpane_pos		(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_HPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_hpane_pos		(gint	      hpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_vpane_pos		(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_vpane_pos		(gint	      vpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_VPANE_POS, vpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_month_hpane_pos	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL);
-}
-
-
-gint
-calendar_config_get_month_vpane_pos	(void)
-{
-	return  gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_month_vpane_pos	(gint	      vpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL);
-}
-
-/* The current list of task lists selected */
-GSList   *
-calendar_config_get_tasks_selected (void)
-{
-	return gconf_client_get_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-calendar_config_set_tasks_selected (GSList *selected)
-{
-	gconf_client_set_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The primary task list */
-char *
-calendar_config_get_primary_tasks (void)
-{
-	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, NULL);
-}
-
-void
-calendar_config_set_primary_tasks (const char *primary_uid)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, primary_uid, NULL);
-}
-
-
-guint
-calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_PRIMARY_TASKS, func, data, NULL, NULL);
-	
-	return id;
-}
-
-gint
-calendar_config_get_task_vpane_pos	(void)
-{
-	return  gconf_client_get_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, NULL);
-}
-
-
-void
-calendar_config_set_task_vpane_pos	(gint	      vpane_pos)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, vpane_pos, NULL);
-}
-
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean
-calendar_config_get_compress_weekend	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, NULL);
-}
-
-
-void
-calendar_config_set_compress_weekend	(gboolean     compress)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, compress, NULL);
-}
-
-guint
-calendar_config_add_notification_compress_weekend (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* Whether we show event end times. */
-gboolean
-calendar_config_get_show_event_end	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, NULL);
-}
-
-
-void
-calendar_config_set_show_event_end	(gboolean     show_end)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, show_end, NULL);
-}
-
-guint
-calendar_config_add_notification_show_event_end (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_SHOW_EVENT_END, func, data, NULL, NULL);
-	
-	return id;
-}
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays
-calendar_config_get_working_days	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL);
-}
-
-
-void
-calendar_config_set_working_days	(CalWeekdays  days)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_WORKING_DAYS, days, NULL);
-}
-
-guint 
-calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-	
-	id = gconf_client_notify_add (config, CALENDAR_CONFIG_WORKING_DAYS , func, data, NULL, NULL);
-	
-	return id;	
-}
-
-/* Settings to hide completed tasks. */
-gboolean
-calendar_config_get_hide_completed_tasks	(void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, NULL);
-}
-
-
-void
-calendar_config_set_hide_completed_tasks	(gboolean	hide)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, hide, NULL);
-}
-
-
-CalUnits
-calendar_config_get_hide_completed_tasks_units	(void)
-{
-	char *units;
-	CalUnits cu;
-
-	units = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS, NULL);
-
-	if (!strcmp (units, "minutes"))
-		cu = CAL_MINUTES;
-	else if (!strcmp (units, "hours"))
-		cu = CAL_HOURS;
-	else
-		cu = CAL_DAYS;
-
-	g_free (units);
-
-	return cu;
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
-{
-	char *units;
-
-	switch (cu) {
-	case CAL_MINUTES :
-		units = g_strdup ("minutes");
-		break;
-	case CAL_HOURS :
-		units = g_strdup ("hours");
-		break;
-	default :
-		units = g_strdup ("days");
-	}
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS, units, NULL);
-
-	g_free (units);
-}
-
-
-gint
-calendar_config_get_hide_completed_tasks_value	(void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, NULL);
-}
-
-
-void
-calendar_config_set_hide_completed_tasks_value	(gint		value)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, value, NULL);
-}
-
-/**
- * calendar_config_get_confirm_delete:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when deleting calendar/tasks items.
- *
- * Return value: Whether confirmation is required when deleting items.
- **/
-gboolean
-calendar_config_get_confirm_delete (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_PROMPT_DELETE, NULL);
-}
-
-/**
- * calendar_config_set_confirm_delete:
- * @confirm: Whether confirmation is required when deleting items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when deleting calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_delete (gboolean confirm)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_DELETE, confirm, NULL);
-}
-
-/**
- * calendar_config_get_confirm_purge:
- *
- * Queries the configuration value for whether a confirmation dialog is
- * presented when purging calendar/tasks items.
- *
- * Return value: Whether confirmation is required when purging items.
- **/
-gboolean
-calendar_config_get_confirm_purge (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, NULL);
-}
-
-/**
- * calendar_config_set_confirm_purge:
- * @confirm: Whether confirmation is required when purging items.
- *
- * Sets the configuration value for whether a confirmation dialog is presented
- * when purging calendar/tasks items.
- **/
-void
-calendar_config_set_confirm_purge (gboolean confirm)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
-}
-
-/* This sets all the common config settings for an EDateEdit widget.
-   These are the week start day, whether we show week numbers, and whether we
-   use 24 hour format. */
-void
-calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
-{
-	gboolean dnav_show_week_no, use_24_hour;
-	gint week_start_day;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	e_date_edit_set_week_start_day (dedit, week_start_day);
-	e_date_edit_set_show_week_numbers (dedit, dnav_show_week_no);
-	e_date_edit_set_use_24_hour_format (dedit, use_24_hour);
-}
-
-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);
-
-	g_signal_connect (dialog, "clicked",
-			  G_CALLBACK (on_timezone_set), timezone_dialog);
-	g_signal_connect (dialog, "delete-event",
-			  G_CALLBACK (on_timezone_dialog_delete_event), timezone_dialog);
-
-	gtk_widget_show (dialog);
-}
-
-
-static void
-on_timezone_set			(GnomeDialog	*dialog,
-				 int		 button,
-				 ETimezoneDialog *etd)
-{
-	icaltimezone *zone;
-
-	zone = e_timezone_dialog_get_timezone (etd);
-	if (zone)
-		calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	g_object_unref (etd);
-}
-
-
-static gboolean
-on_timezone_dialog_delete_event	(GnomeDialog	*dialog,
-				 GdkEvent	*event,
-				 ETimezoneDialog *etd)
-{
-	g_object_unref (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)
-{
-	static char *color = NULL;
-
-	if (color)
-		g_free (color);
-
-	color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL);
-	return 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);
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL);
-}
-
-/**
- * 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)
-{
-	static char *color = NULL;
-
-	if (color)
-		g_free (color);
-
-	color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL);
-	return 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);
-
-	gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL);
-}
-
-/**
- * calendar_config_get_use_default_reminder:
- *
- * Queries whether new appointments should be created with a default reminder.
- *
- * Return value: Boolean value indicating whether new appointments should be
- * created with a default reminder from the values of
- * calendar_config_get_default_reminder_interval() and
- * calendar_config_get_default_reminder_units().
- **/
-gboolean
-calendar_config_get_use_default_reminder (void)
-{
-	return gconf_client_get_bool (config, CALENDAR_CONFIG_DEFAULT_REMINDER, NULL);
-}
-
-/**
- * calendar_config_set_use_default_reminder:
- * @value: Whether to create new appointments with a default reminder.
- *
- * Sets whether newly-created appointments should get a default reminder set
- * them.
- **/
-void
-calendar_config_set_use_default_reminder (gboolean value)
-{
-	gconf_client_set_bool (config, CALENDAR_CONFIG_DEFAULT_REMINDER, value, NULL);
-}
-
-/**
- * calendar_config_get_default_reminder_interval:
- *
- * Queries the interval for the default reminder of newly-created
- * appointments, i.e. 5 in "5 minutes".
- *
- * Return value: Interval for default reminders.
- **/
-int
-calendar_config_get_default_reminder_interval (void)
-{
-	return gconf_client_get_int (config, CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL, NULL);
-}
-
-/**
- * calendar_config_set_default_reminder_interval:
- * @interval: Interval value, e.g. 5 for "5 minutes".
- *
- * Sets the interval that should be used for the default reminder in new
- * appointments.
- **/
-void
-calendar_config_set_default_reminder_interval (int interval)
-{
-	gconf_client_set_int (config, CALENDAR_CONFIG_DEFAULT_REMINDER_INTERVAL, interval, NULL);
-}
-
-/**
- * calendar_config_get_default_reminder_units:
- *
- * Queries the units of time in which default reminders should be created for
- * new appointments, e.g. CAL_MINUTES for "5 minutes".
- *
- * Return value: Time units for default reminders.
- **/
-CalUnits
-calendar_config_get_default_reminder_units (void)
-{
-	char *units;
-	CalUnits cu;
-
-	units = gconf_client_get_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, NULL);
-
-	if (units && !strcmp (units, "days"))
-		cu = CAL_DAYS;
-	else if (units && !strcmp (units, "hours"))
-		cu = CAL_HOURS;
-	else
-		cu = CAL_MINUTES;
-	g_free (units);
-
-	return cu;
-}
-
-/**
- * calendar_config_set_default_reminder_units:
- * @units: Time units, e.g. CAL_MINUTES for "5 minutes".
- *
- * Sets the units to be used for default reminders in new appointments.
- **/
-void
-calendar_config_set_default_reminder_units (CalUnits units)
-{
-	gconf_client_set_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, units_to_string(units), NULL);
-}
-
-/**
- * calendar_config_get_hide_completed_tasks_sexp:
- *
- * Returns the subexpression to use to filter out completed tasks according
- * to the config settings. The returned sexp should be freed.
- **/
-char*
-calendar_config_get_hide_completed_tasks_sexp (void)
-{
-	char *sexp = NULL;
-
-	if (calendar_config_get_hide_completed_tasks ()) {
-		CalUnits units;
-		gint value;
-
-		units = calendar_config_get_hide_completed_tasks_units ();
-		value = calendar_config_get_hide_completed_tasks_value ();
-
-		if (value == 0) {
-			/* If the value is 0, we want to hide completed tasks
-			   immediately, so we filter out all completed tasks.*/
-			sexp = g_strdup ("(not is-completed?)");
-		} else {
-			char *location, *isodate;
-			icaltimezone *zone;
-			struct icaltimetype tt;
-			time_t t;
-
-			/* Get the current time, and subtract the appropriate
-			   number of days/hours/minutes. */
-			location = calendar_config_get_timezone ();
-			zone = icaltimezone_get_builtin_timezone (location);
-			tt = icaltime_current_time_with_zone (zone);
-
-			switch (units) {
-			case CAL_DAYS:
-				icaltime_adjust (&tt, -value, 0, 0, 0);
-				break;
-			case CAL_HOURS:
-				icaltime_adjust (&tt, 0, -value, 0, 0);
-				break;
-			case CAL_MINUTES:
-				icaltime_adjust (&tt, 0, 0, -value, 0);
-				break;
-			default:
-				g_assert_not_reached ();
-			}
-
-			t = icaltime_as_timet_with_zone (tt, zone);
-
-			/* Convert the time to an ISO date string, and build
-			   the query sub-expression. */
-			isodate = isodate_from_time_t (t);
-			sexp = g_strdup_printf ("(not (completed-before? (make-time \"%s\")))", isodate);
-		}
-	}
-
-	return sexp;
-}
-
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index ff34febd91..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.h - functions to load/save/get/set user settings.
- */
-
-#ifndef _CALENDAR_CONFIG_H_
-#define _CALENDAR_CONFIG_H_
-
-#include <gconf/gconf-client.h>
-#include <widgets/misc/e-calendar.h>
-#include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include "e-calendar-table.h"
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	CAL_SUNDAY	= 1 << 0,
-	CAL_MONDAY	= 1 << 1,
-	CAL_TUESDAY	= 1 << 2,
-	CAL_WEDNESDAY	= 1 << 3,
-	CAL_THURSDAY	= 1 << 4,
-	CAL_FRIDAY	= 1 << 5,
-	CAL_SATURDAY	= 1 << 6
-} CalWeekdays;
-
-
-/* Units for settings. */
-typedef enum
-{
-	CAL_DAYS,
-	CAL_HOURS,
-	CAL_MINUTES
-} CalUnits;
-
-
-void	  calendar_config_init			(void);
-void calendar_config_remove_notification (guint id);
-
-/*
- * Calendar Settings.
- */
-
-/* The current list of calendars selected */
-GSList   *calendar_config_get_calendars_selected (void);
-void	  calendar_config_set_calendars_selected (GSList *selected);
-guint	  calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data);
-
-/* The primary calendar */
-char     *calendar_config_get_primary_calendar (void);
-void	  calendar_config_set_primary_calendar (const char *primary_uid);
-guint	  calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data);
-
-/* The current timezone, e.g. "Europe/London". */
-gchar*	  calendar_config_get_timezone		(void);
-void	  calendar_config_set_timezone		(gchar	     *timezone);
-guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_week_start_day (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_day_start_hour (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_start_minute	(void);
-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-guint calendar_config_add_notification_day_start_minute (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_end_hour	(void);
-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-guint calendar_config_add_notification_day_end_hour (GConfClientNotifyFunc func, gpointer data);
-
-gint	  calendar_config_get_day_end_minute	(void);
-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-guint calendar_config_add_notification_day_end_minute (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-guint calendar_config_add_notification_show_event_end (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_compress_weekend (GConfClientNotifyFunc func, gpointer data);
-
-/* 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);
-guint calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data);
-
-/* 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. */
-gint      calendar_config_get_hpane_pos		(void);
-void	  calendar_config_set_hpane_pos		(gint	      hpane_pos);
-
-gint      calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gint	      vpane_pos);
-
-gint      calendar_config_get_month_hpane_pos	(void);
-void	  calendar_config_set_month_hpane_pos	(gint	      hpane_pos);
-
-gint      calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gint	      vpane_pos);
-
-/* The current list of task lists selected */
-GSList   *calendar_config_get_tasks_selected (void);
-void	  calendar_config_set_tasks_selected (GSList *selected);
-guint	  calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data);
-
-/* The primary calendar */
-char     *calendar_config_get_primary_tasks (void);
-void	  calendar_config_set_primary_tasks (const char *primary_uid);
-guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data);
-
-/* The pane position */
-gint      calendar_config_get_task_vpane_pos    (void);
-void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
-
-/* Colors for the task list */
-const char *calendar_config_get_tasks_due_today_color	(void);
-void	    calendar_config_set_tasks_due_today_color	(const char *color);
-
-const char *calendar_config_get_tasks_overdue_color	(void);
-void	    calendar_config_set_tasks_overdue_color	(const char *color);
-
-/* Settings to hide completed tasks. */
-gboolean  calendar_config_get_hide_completed_tasks	(void);
-void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);
-
-CalUnits  calendar_config_get_hide_completed_tasks_units(void);
-void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);
-
-gint	  calendar_config_get_hide_completed_tasks_value(void);
-void	  calendar_config_set_hide_completed_tasks_value(gint		value);
-
-char*	  calendar_config_get_hide_completed_tasks_sexp (void);
-
-/* Confirmation options */
-gboolean  calendar_config_get_confirm_delete (void);
-void      calendar_config_set_confirm_delete (gboolean confirm);
-
-gboolean  calendar_config_get_confirm_purge (void);
-void      calendar_config_set_confirm_purge (gboolean confirm);
-
-/* Default reminder options */
-gboolean calendar_config_get_use_default_reminder (void);
-void     calendar_config_set_use_default_reminder (gboolean value);
-
-int      calendar_config_get_default_reminder_interval (void);
-void     calendar_config_set_default_reminder_interval (int interval);
-
-CalUnits calendar_config_get_default_reminder_units (void);
-void     calendar_config_set_default_reminder_units (CalUnits units);
-
-
-/* Convenience functions to configure common properties of ECalendar,
-   EDateEdit & ECalendarTable widgets, and the ECellDateEdit ETable cell. */
-void	  calendar_config_configure_e_calendar		(ECalendar	*cal);
-void	  calendar_config_configure_e_date_edit		(EDateEdit	*dedit);
-void	  calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table);
-void	  calendar_config_configure_e_cell_date_edit	(ECellDateEdit	*ecde);
-
-/* Shows the timezone dialog if the user hasn't set a default timezone. */
-void	  calendar_config_check_timezone_set	(void);
-
-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
-   supports 12-hour time format. */
-gboolean  calendar_config_locale_supports_12_hour_format(void);
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
deleted file mode 100644
index 89a7aab36e..0000000000
--- a/calendar/gui/calendar-offline-handler.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Dan Winship <danw@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
-#include <gal/util/e-util.h>
-#include "e-util/e-url.h"
-#include <libecal/e-cal.h>
-#include "calendar-offline-handler.h"
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _CalendarOfflineHandlerPrivate {
-	ECal *client;
-
-	GNOME_Evolution_OfflineProgressListener listener_interface;
-
-	gboolean is_offline;	
-};
-
-static void
-add_connection (gpointer data, gpointer user_data)
-{
-	EUri *uri = e_uri_new (data);	
-	GNOME_Evolution_ConnectionList *list = user_data;
-
-	g_return_if_fail (uri != NULL);
-	
-	if (uri->host != NULL)
-		list->_buffer[list->_length].hostName = CORBA_string_dup (uri->host);
-	else
-		list->_buffer[list->_length].hostName = CORBA_string_dup ("Unknown");
-	if (uri->protocol != NULL)
-		list->_buffer[list->_length].type = CORBA_string_dup (uri->protocol);
-	else
-		list->_buffer[list->_length].type = CORBA_string_dup ("Unknown");
-	list->_length++;
-
-	e_uri_free (uri);
-}
-
-static GNOME_Evolution_ConnectionList *
-create_connection_list (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *list;
-	GList *uris;
-
-	priv = offline_handler->priv;
-
- 	uris = e_cal_uri_list (priv->client, CAL_MODE_REMOTE);	
-
-	list = GNOME_Evolution_ConnectionList__alloc ();
-	list->_length = 0;
-	list->_maximum = g_list_length (uris);
-	list->_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list->_maximum);
-
-	g_list_foreach (uris, add_connection, list);
-
-	return list;
-}
-
-/* GNOME::Evolution::Offline methods.  */
-static CORBA_boolean
-impl__get_isOffline (PortableServer_Servant servant,
-		     CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	return priv->is_offline;
-}
-
-static void
-impl_prepareForOffline (PortableServer_Servant servant,
-			GNOME_Evolution_ConnectionList **active_connection_list,
-			CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	*active_connection_list = create_connection_list (offline_handler);
-}
-
-static void
-update_offline (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-	GNOME_Evolution_ConnectionList *connection_list;
-	CORBA_Environment ev;
-
-	priv = offline_handler->priv;
-
-	connection_list = create_connection_list (offline_handler);
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_OfflineProgressListener_updateProgress (priv->listener_interface, 
-								connection_list, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_warning ("Error updating offline progress");
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-backend_cal_set_mode (ECal *client, ECalSetModeStatus status, CalMode mode, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	update_offline (offline_handler);
-	g_object_unref (client);
-}
-
-static void
-backend_cal_opened_offline (ECal *client, ECalendarStatus status, gpointer data)
-{
-	CalendarOfflineHandler *offline_handler = data;
-
-	if (status != E_CALENDAR_STATUS_OK) {
-		update_offline (offline_handler);
-		g_object_unref (client);
-		return;
-	}
-
-	g_signal_connect (client, "cal_set_mode", G_CALLBACK (backend_cal_set_mode), offline_handler);
-	e_cal_set_mode (client, CAL_MODE_LOCAL);
-}
-
-static void
-backend_cal_opened_online (ECal *client, ECalendarStatus status, gpointer data)
-{
-	if (status != E_CALENDAR_STATUS_OK) {
-		g_object_unref (client);
-		return;
-	}
-
-	e_cal_set_mode (client, CAL_MODE_REMOTE);
-	g_object_unref (client);
-}
-
-static void
-backend_go_offline (gpointer data, gpointer user_data)
-{
-	CalendarOfflineHandler *offline_handler = user_data;
-	char *uri = data;
-	ECal *client;
-	gboolean success;
-	GError *error = NULL;
-	
-	client = e_cal_new_from_uri (uri, CALOBJ_TYPE_ANY);
-	g_signal_connect (client, "cal_opened", G_CALLBACK (backend_cal_opened_offline), offline_handler);
-	success = e_cal_open (client, TRUE, &error);
-	if (!success) {
-		g_warning (_("backend_go_offline(): %s"), error->message);
-		update_offline (offline_handler);
-		g_object_unref (client);
-		g_error_free (error);
-		return;		
-	}
-}
-
-static void
-backend_go_online (gpointer data, gpointer user_data)
-{
-	CalendarOfflineHandler *offline_handler = user_data;
-	char *uri = data;
-	ECal *client;
-	gboolean success;
-	GError *error = NULL;
-	
-	client = e_cal_new_from_uri (uri, CALOBJ_TYPE_ANY);
-	g_signal_connect (G_OBJECT (client), "cal_opened", 
-			  G_CALLBACK (backend_cal_opened_online), offline_handler);
-	success = e_cal_open (client, TRUE, &error);
-	if (!success) {
-		g_warning (_("backend_go_online(): %s"), error->message);
-		g_object_unref (client);
-		g_error_free (error);
-		return;		
-	}	
-}
-
-static void
-impl_goOffline (PortableServer_Servant servant,
-		const GNOME_Evolution_OfflineProgressListener progress_listener,
-		CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	GList *uris;
-	
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	/* To update the status */
-	priv->listener_interface = CORBA_Object_duplicate (progress_listener, ev);
-
-	uris = e_cal_uri_list (priv->client, CAL_MODE_REMOTE);
-
-	g_list_foreach (uris, backend_go_offline, offline_handler);	
-}
-
-static void
-impl_goOnline (PortableServer_Servant servant,
-	       CORBA_Environment *ev)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-	GList *uris;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	uris = e_cal_uri_list (priv->client, CAL_MODE_LOCAL);
-
-	g_list_foreach (uris, backend_go_online, offline_handler);
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-
-	if (priv->client) {
-		g_object_unref (priv->client);
-		priv->client = NULL;
-	}
-	
-	if (priv->listener_interface != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->listener_interface, &ev);
-		CORBA_exception_free (&ev);
-
-		priv->listener_interface = CORBA_OBJECT_NIL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	CalendarOfflineHandler *offline_handler;
-	CalendarOfflineHandlerPrivate *priv;
-
-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/* GTK+ type initialization.  */
-
-static void
-calendar_offline_handler_class_init (CalendarOfflineHandlerClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Offline__epv *epv;
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->dispose = impl_dispose;
-	object_class->finalize = impl_finalize;
-
-	epv = & klass->epv;
-	epv->_get_isOffline    = impl__get_isOffline;
-	epv->prepareForOffline = impl_prepareForOffline;
-	epv->goOffline         = impl_goOffline;
-	epv->goOnline          = impl_goOnline;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-calendar_offline_handler_init (CalendarOfflineHandler *offline_handler)
-{
-	CalendarOfflineHandlerPrivate *priv;
-
-	priv = g_new (CalendarOfflineHandlerPrivate, 1);
-	offline_handler->priv = priv;
-
-	/* FIXME: what URI to use? */
-	priv->client = e_cal_new_from_uri ("", CALOBJ_TYPE_ANY);
-	priv->listener_interface = CORBA_OBJECT_NIL;
-	priv->is_offline = FALSE;
-}
-
-CalendarOfflineHandler *
-calendar_offline_handler_new (void)
-{
-	CalendarOfflineHandler *new;
-
-	new = g_object_new (calendar_offline_handler_get_type (), NULL);
-	
-	return new;
-}
-
-BONOBO_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
deleted file mode 100644
index 3cc61b4f25..0000000000
--- a/calendar/gui/calendar-offline-handler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-offline-handler.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CALENDAR_OFFLINE_HANDLER_H_
-#define _CALENDAR_OFFLINE_HANDLER_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define CALENDAR_TYPE_OFFLINE_HANDLER			(calendar_offline_handler_get_type ())
-#define CALENDAR_OFFLINE_HANDLER(obj)			(GTK_CHECK_CAST ((obj), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandler))
-#define CALENDAR_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandlerClass))
-#define CALENDAR_IS_OFFLINE_HANDLER(obj)			(GTK_CHECK_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-#define CALENDAR_IS_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))
-
-
-typedef struct _CalendarOfflineHandler        CalendarOfflineHandler;
-typedef struct _CalendarOfflineHandlerPrivate CalendarOfflineHandlerPrivate;
-typedef struct _CalendarOfflineHandlerClass   CalendarOfflineHandlerClass;
-
-struct _CalendarOfflineHandler {
-	BonoboObject parent;
-
-	CalendarOfflineHandlerPrivate *priv;
-};
-
-struct _CalendarOfflineHandlerClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Offline__epv epv;
-};
-
-
-GtkType             calendar_offline_handler_get_type  (void);
-CalendarOfflineHandler *calendar_offline_handler_new       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _CALENDAR_OFFLINE_HANDLER_H_ */
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
deleted file mode 100644
index a90e8a46d4..0000000000
--- a/calendar/gui/calendar-view-factory.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-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_finalize (GObject *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;
-
-
-
-E_MAKE_TYPE (calendar_view_factory, "CalendarViewFactory", CalendarViewFactory,
-	     calendar_view_factory_class_init, calendar_view_factory_init, GAL_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;
-	GObjectClass *gobject_class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	gal_view_factory_class = (GalViewFactoryClass *) class;
-	gobject_class = (GObjectClass *) 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;
-
-	gobject_class->finalize = calendar_view_factory_finalize;
-}
-
-/* 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;
-}
-
-/* Finalize method for the calendar view factory */
-static void
-calendar_view_factory_finalize (GObject *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 (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (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");
-
-	case GNOME_CAL_LIST_VIEW:
-		return _("List 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";
-
-	case GNOME_CAL_LIST_VIEW:
-		return "list_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 = g_object_new (TYPE_CALENDAR_VIEW_FACTORY, NULL);
-	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 6d1de25590..0000000000
--- a/calendar/gui/calendar-view-factory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Evolution calendar - Generic view factory for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_VIEW_FACTORY_H
-#define CALENDAR_VIEW_FACTORY_H
-
-#include <gal/menus/gal-view-factory.h>
-#include "gnome-cal.h"
-
-G_BEGIN_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);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
deleted file mode 100644
index 1aec23ef36..0000000000
--- a/calendar/gui/calendar-view.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "calendar-view.h"
-
-
-
-/* Private part of the CalendarView structure */
-struct _CalendarViewPrivate {
-	/* Type of the view */
-	GnomeCalendarViewType view_type;
-
-	/* Title of the view */
-	char *title;
-};
-
-
-
-static void calendar_view_class_init (CalendarViewClass *class);
-static void calendar_view_init (CalendarView *cview);
-static void calendar_view_finalize (GObject *object);
-
-static void calendar_view_edit (GalView *view, GtkWindow *parent_window);
-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;
-
-
-
-E_MAKE_TYPE (calendar_view, "CalendarView", CalendarView, calendar_view_class_init,
-	     calendar_view_init, GAL_VIEW_TYPE);
-
-/* Class initialization function for the calendar view */
-static void
-calendar_view_class_init (CalendarViewClass *class)
-{
-	GalViewClass *gal_view_class;
-	GObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	gal_view_class = (GalViewClass *) class;
-	object_class = (GObjectClass *) 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->finalize = calendar_view_finalize;
-}
-
-/* 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_finalize (GObject *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 (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/* edit method of the calendar view */
-static void
-calendar_view_edit (GalView *view, GtkWindow *parent_window)
-{
-	/* 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 = g_object_new (TYPE_CALENDAR_VIEW, NULL);
-	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 = g_object_new (TYPE_CALENDAR_VIEW, NULL);
-	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 8b85966a90..0000000000
--- a/calendar/gui/calendar-view.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Evolution calendar - Generic view object for calendar views
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_VIEW_H
-#define CALENDAR_VIEW_H
-
-#include <gal/menus/gal-view.h>
-#include "gnome-cal.h"
-
-G_BEGIN_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);
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
deleted file mode 100644
index a50b135f90..0000000000
--- a/calendar/gui/comp-editor-factory.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkmessagedialog.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
-#include <evolution-calendar.h>
-#include <e-util/e-url.h>
-#include <libecal/e-cal.h>
-#include "calendar-config.h"
-#include "e-comp-editor-registry.h"
-#include "comp-editor-factory.h"
-#include "comp-util.h"
-#include "dialogs/event-editor.h"
-#include "dialogs/task-editor.h"
-
-extern ECompEditorRegistry *comp_editor_registry;
-
-
-
-/* A pending request */
-
-typedef enum {
-	REQUEST_EXISTING,
-	REQUEST_NEW
-} RequestType;
-
-typedef struct {
-	RequestType type;
-
-	union {
-		struct {
-			char *uid;
-		} existing;
-
-		struct {
-			 GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type;
-		} new;
-	} u;
-} Request;
-
-/* A client we have open */
-typedef struct {
-	/* Our parent CompEditorFactory */
-	CompEditorFactory *factory;
-
-	/* Uri of the calendar, used as key in the clients hash table */
-	char *uri;
-
-	/* Client of the calendar */
-	ECal *client;
- 
-	/* Count editors using this client */
-	int editor_count;
-
-	/* Pending requests; they are pending if the client is still being opened */
-	GSList *pending;
-
-	/* Whether this is open or still waiting */
-	guint open : 1;
-} OpenClient;
-
-/* Private part of the CompEditorFactory structure */
-struct CompEditorFactoryPrivate {
-	/* Hash table of URI->OpenClient */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void comp_editor_factory_class_init (CompEditorFactoryClass *class);
-static void comp_editor_factory_init (CompEditorFactory *factory);
-static void comp_editor_factory_finalize (GObject *object);
-
-static void impl_editExisting (PortableServer_Servant servant,
-			       const CORBA_char *str_uri,
-			       const CORBA_char *uid,
-			       CORBA_Environment *ev);
-static void impl_editNew (PortableServer_Servant servant,
-			  const CORBA_char *str_uri,
-			  const GNOME_Evolution_Calendar_CalObjType type,
-			  CORBA_Environment *ev);
-
-static BonoboObjectClass *parent_class = NULL;
-
-
-
-BONOBO_TYPE_FUNC_FULL (CompEditorFactory,
-		       GNOME_Evolution_Calendar_CompEditorFactory,
-		       BONOBO_OBJECT_TYPE,
-		       comp_editor_factory);
-
-/* Class initialization function for the component editor factory */
-static void
-comp_editor_factory_class_init (CompEditorFactoryClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	class->epv.editExisting = impl_editExisting;
-	class->epv.editNew = impl_editNew;
-
-	object_class->finalize = comp_editor_factory_finalize;
-}
-
-/* Object initialization function for the component editor factory */
-static void
-comp_editor_factory_init (CompEditorFactory *factory)
-{
-	CompEditorFactoryPrivate *priv;
-
-	priv = g_new (CompEditorFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* Frees a Request structure */
-static void
-free_request (Request *r)
-{
-	if (r->type == REQUEST_EXISTING) {
-		g_assert (r->u.existing.uid != NULL);
-		g_free (r->u.existing.uid);
-	}
-
-	g_free (r);
-}
-
-/* Frees an OpenClient structure */
-static void
-free_client (OpenClient *oc)
-{
-	GSList *l;
-
-	g_free (oc->uri);
-	oc->uri = NULL;
-
-	g_object_unref (oc->client);
-	oc->client = NULL;
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *r;
-
-		r = l->data;
-		free_request (r);
-	}
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-
-	g_free (oc);
-}
-
-/* Used from g_hash_table_foreach(); frees a client structure */
-static void
-free_client_cb (gpointer key, gpointer value, gpointer data)
-{
-	OpenClient *oc;
-
-	oc = value;
-	free_client (oc);
-}
-
-/* Destroy handler for the component editor factory */
-static void
-comp_editor_factory_finalize (GObject *object)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_COMP_EDITOR_FACTORY (object));
-
-	factory = COMP_EDITOR_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->uri_client_hash, free_client_cb, NULL);
-	g_hash_table_destroy (priv->uri_client_hash);
-	priv->uri_client_hash = NULL;
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/* Callback used when a component editor gets destroyed */
-static void
-editor_destroy_cb (GtkObject *object, gpointer data)
-{
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-
-	oc = data;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	oc->editor_count--;
-
-	/* See if we need to free the client */
-	g_assert (oc->pending == NULL);
-
-	if (oc->editor_count != 0)
-		return;
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Starts editing an existing component on a client that is already open */
-static void
-edit_existing (OpenClient *oc, const char *uid)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	CompEditor *editor;
-	ECalComponentVType vtype;
-
-	g_assert (oc->open);
-
-	/* Get the object */
-	if (!e_cal_get_object (oc->client, uid, NULL, &icalcomp, NULL)) {
-		/* FIXME Better error handling */
-		g_warning (G_STRLOC ": Syntax error while getting component `%s'", uid);
-
-		return;
-	}
-	
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return;
-	}
-	
-	/* Create the appropriate type of editor */
-	
-	vtype = e_cal_component_get_vtype (comp);
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		editor = COMP_EDITOR (event_editor_new (oc->client));
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		editor = COMP_EDITOR (task_editor_new (oc->client));
-		break;
-
-	default:
-		g_message ("edit_exiting(): Unsupported object type %d", (int) vtype);
-		g_object_unref (comp);
-		return;
-	}
-
-	/* Set the object on the editor */
-	comp_editor_edit_comp (editor, comp);
-	comp_editor_focus (editor);
-
-	oc->editor_count++;
-	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
-
-	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
-}
-
-/* Creates a component with the appropriate defaults for the specified component
- * type.
- */
-static ECalComponent *
-get_default_event (ECal *client, gboolean all_day) 
-{
-	ECalComponent *comp;
-	struct icaltimetype itt;
-	ECalComponentDateTime dt;
-	char *location;
-	icaltimezone *zone;
-
-	comp = cal_comp_event_new_with_defaults (client);
-
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-
-	if (all_day) {
-		itt = icaltime_from_timet_with_zone (time (NULL), 1, zone);
-
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		e_cal_component_set_dtend (comp, &dt);		
-	} else {
-		itt = icaltime_current_time_with_zone (zone);
-		icaltime_adjust (&itt, 0, 1, -itt.minute, -itt.second);
-		
-		dt.value = &itt;
-		dt.tzid = icaltimezone_get_tzid (zone);
-		
-		e_cal_component_set_dtstart (comp, &dt);
-		icaltime_adjust (&itt, 0, 1, 0, 0);
-		e_cal_component_set_dtend (comp, &dt);
-	}
-
-	e_cal_component_commit_sequence (comp);
-
-	return comp;
-}
-
-static ECalComponent *
-get_default_task (ECal *client)
-{
-	ECalComponent *comp;
-	
-	comp = cal_comp_task_new_with_defaults (client);
-
-	return comp;
-}
-
-/* Edits a new object in the context of a client */
-static void
-edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	ECalComponent *comp;
-	CompEditor *editor;
-	
-	switch (type) {
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:
-		editor = COMP_EDITOR (event_editor_new (oc->client));
-		comp = get_default_event (oc->client, FALSE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:
-		editor = COMP_EDITOR (event_editor_new (oc->client));
-		comp = get_default_event (oc->client, TRUE);
-		break;
-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
-		editor = COMP_EDITOR (task_editor_new (oc->client));
-		comp = get_default_task (oc->client);
-		break;
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	comp_editor_edit_comp (editor, comp);
-	if (type == GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING)
-		event_editor_show_meeting (EVENT_EDITOR (editor));
-	comp_editor_focus (editor);
-
-	oc->editor_count++;
-	g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
-
-	e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
-}
-
-/* Resolves all the pending requests for a client */
-static void
-resolve_pending_requests (OpenClient *oc)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	GSList *l;
-	char *location;
-	icaltimezone *zone;
-
-	factory = oc->factory;
-	priv = factory->priv;
-
-	if (!oc->pending)
-		return;
-
-	/* Set the default timezone in the backend. */
-	location = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (location);
-	if (zone)
-		/* FIXME Error handling? */
-		e_cal_set_default_timezone (oc->client, zone, NULL);
-
-	for (l = oc->pending; l; l = l->next) {
-		Request *request;
-
-		request = l->data;
-
-		switch (request->type) {
-		case REQUEST_EXISTING:
-			edit_existing (oc, request->u.existing.uid);
-			break;
-
-		case REQUEST_NEW:
-			edit_new (oc, request->u.new.type);
-			break;
-		}
-
-		free_request (request);
-	}
-
-	g_slist_free (oc->pending);
-	oc->pending = NULL;
-}
-
-/* Callback used when a client is finished opening.  We resolve all the pending
- * requests.
- */
-static void
-cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
-{
-	OpenClient *oc;
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	GtkWidget *dialog = NULL;
-
-	oc = data;
-	factory = oc->factory;
-	priv = factory->priv;
-
-	switch (status) {
-	case E_CALENDAR_STATUS_OK:
-		oc->open = TRUE;
-		resolve_pending_requests (oc);
-		return;
-
-	case E_CALENDAR_STATUS_OTHER_ERROR:
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Error while opening the calendar"));
-		break;
-
-	case E_CALENDAR_STATUS_NO_SUCH_CALENDAR:
-		/* oops - we specified only_if_exists = FALSE */
-		g_assert_not_reached ();
-		return;
-
-	case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED:
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Method not supported when opening the calendar"));
-		break;
-
-	case E_CALENDAR_STATUS_PERMISSION_DENIED :
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Permission denied to open the calendar"));
-		break;
-		
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-
-	g_hash_table_remove (priv->uri_client_hash, oc->uri);
-	free_client (oc);
-}
-
-/* Creates a new OpenClient structure and queues the component editing/creation
- * process until the client is open.  Returns NULL if it could not issue the
- * open request.
- */
-static OpenClient *
-open_client (CompEditorFactory *factory, const char *uristr)
-{
-	CompEditorFactoryPrivate *priv;
-	ECal *client;
-	OpenClient *oc;
-	GError *error = NULL;
-
-	priv = factory->priv;
-
-	client = e_cal_new_from_uri (uristr, CALOBJ_TYPE_ANY);
-	if (!client)
-		return NULL;
-
-	oc = g_new (OpenClient, 1);
-	oc->factory = factory;
-
-	oc->uri = g_strdup (uristr);
-
-	oc->client = client;
-	oc->editor_count = 0;
-	oc->pending = NULL;
-	oc->open = FALSE;
-
-	g_signal_connect (oc->client, "cal_opened", G_CALLBACK (cal_opened_cb), oc);
-
-	g_hash_table_insert (priv->uri_client_hash, oc->uri, oc);
-
-	if (!e_cal_open (oc->client, FALSE, &error)) {
-		g_warning (_("open_client(): %s"), error->message);
-		g_free (oc->uri);
-		g_object_unref (oc->client);
-		g_free (oc);
-		g_error_free (error);
-
-		return NULL;
-	}
-
-	return oc;
-}
-
-/* Looks up an open client or queues it for being opened.  Returns the client or
- * NULL on failure; in the latter case it sets the ev exception.
- */
-static OpenClient *
-lookup_open_client (CompEditorFactory *factory, const char *str_uri, CORBA_Environment *ev)
-{
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	EUri *uri;
-
-	priv = factory->priv;
-
-	/* Look up the client */
-
-	uri = e_uri_new (str_uri);
-	if (!uri) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI);
-		return NULL;
-	}
-	e_uri_free (uri);
-
-	oc = g_hash_table_lookup (priv->uri_client_hash, str_uri);
-	if (!oc) {
-		oc = open_client (factory, str_uri);
-		if (!oc) {
-			bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError);
-			return NULL;
-		}
-	}
-
-	return oc;
-}
-
-/* Queues a request for editing an existing object */
-static void
-queue_edit_existing (OpenClient *oc, const char *uid)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_EXISTING;
-	request->u.existing.uid = g_strdup (uid);
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editExisting() method implementation */
-static void
-impl_editExisting (PortableServer_Servant servant,
-		   const CORBA_char *str_uri,
-		   const CORBA_char *uid,
-		   CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
-	CompEditor *editor;
-
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	oc = lookup_open_client (factory, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open) {
-		queue_edit_existing (oc, uid);
-		return;
-	}
-
-	/* Look up the component */
-	editor = e_comp_editor_registry_find (comp_editor_registry, uid);	
-	if (editor == NULL) {
-		edit_existing (oc, uid);
-	} else {
-		comp_editor_focus (editor);
-	}
-}
-
-/* Queues a request for creating a new object */
-static void
-queue_edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)
-{
-	Request *request;
-
-	g_assert (!oc->open);
-
-	request = g_new (Request, 1);
-	request->type = REQUEST_NEW;
-	request->u.new.type = type;
-
-	oc->pending = g_slist_append (oc->pending, request);
-}
-
-/* ::editNew() method implementation */
-static void
-impl_editNew (PortableServer_Servant servant,
-	      const CORBA_char *str_uri,
-	      const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,
-	      CORBA_Environment *ev)
-{
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
-	OpenClient *oc;
- 
-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	oc = lookup_open_client (factory, str_uri, ev);
-	if (!oc)
-		return;
-
-	if (!oc->open)
-		queue_edit_new (oc, corba_type);
-	else
-		edit_new (oc, corba_type);
-}
-
-
-
-/**
- * comp_editor_factory_new:
- * 
- * Creates a new calendar component editor factory.
- * 
- * Return value: A newly-created component editor factory.
- **/
-CompEditorFactory *
-comp_editor_factory_new (void)
-{
-	return g_object_new (TYPE_COMP_EDITOR_FACTORY, NULL);
-}
-
-
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
deleted file mode 100644
index fca4573497..0000000000
--- a/calendar/gui/comp-editor-factory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_EDITOR_FACTORY_H
-#define COMP_EDITOR_FACTORY_H
-
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-
-
-#define TYPE_COMP_EDITOR_FACTORY            (comp_editor_factory_get_type ())
-#define COMP_EDITOR_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_FACTORY,	\
-					     CompEditorFactory))
-#define COMP_EDITOR_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			\
-					     TYPE_COMP_EDITOR_FACTORY, CompEditorFactoryClass))
-#define IS_COMP_EDITOR_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))
-#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))
-
-typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;
-
-typedef struct {
-	BonoboObject object;
-
-	/* Private data */
-	CompEditorFactoryPrivate *priv;
-} CompEditorFactory;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;
-} CompEditorFactoryClass;
-
-GtkType comp_editor_factory_get_type (void);
-
-CompEditorFactory *comp_editor_factory_new (void);
-
-
-
-#endif
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
deleted file mode 100644
index 170adb0cf5..0000000000
--- a/calendar/gui/comp-util.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include "calendar-config.h"
-#include "comp-util.h"
-#include "dialogs/delete-comp.h"
-
-
-
-/**
- * cal_comp_util_add_exdate:
- * @comp: A calendar component object.
- * @itt: Time for the exception.
- * 
- * Adds an exception date to the current list of EXDATE properties in a calendar
- * component object.
- **/
-void
-cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone)
-{
-	GSList *list;
-	ECalComponentDateTime *cdt;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-
-	e_cal_component_get_exdate_list (comp, &list);
-
-	cdt = g_new (ECalComponentDateTime, 1);
-	cdt->value = g_new (struct icaltimetype, 1);
-	*cdt->value = icaltime_from_timet_with_zone (t, FALSE, zone);
-	cdt->tzid = g_strdup (icaltimezone_get_tzid (zone));
-
-	list = g_slist_append (list, cdt);
-	e_cal_component_set_exdate_list (comp, list);
-	e_cal_component_free_exdate_list (list);
-}
-
-
-
-/* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
-static gboolean
-e_cal_component_compare_tzid (const char *tzid1, const char *tzid2)
-{
-	gboolean retval = TRUE;
-
-	if (tzid1) {
-		if (!tzid2 || strcmp (tzid1, tzid2))
-			retval = FALSE;
-	} else {
-		if (tzid2)
-			retval = FALSE;
-	}
-
-	return retval;
-}
-
-/**
- * cal_comp_util_compare_event_timezones:
- * @comp: A calendar component object.
- * @client: A #ECal.
- * 
- * Checks if the component uses the given timezone for both the start and
- * the end time, or if the UTC offsets of the start and end times are the same
- * as in the given zone.
- *
- * Returns: TRUE if the component's start and end time are at the same UTC
- * offset in the given timezone.
- **/
-gboolean
-cal_comp_util_compare_event_timezones (ECalComponent *comp,
-				       ECal *client,
-				       icaltimezone *zone)
-{
-	ECalComponentDateTime start_datetime, end_datetime;
-	const char *tzid;
-	gboolean retval = FALSE;
-	icaltimezone *start_zone, *end_zone;
-	int offset1, offset2;
-
-	tzid = icaltimezone_get_tzid (zone);
-
-	e_cal_component_get_dtstart (comp, &start_datetime);
-	e_cal_component_get_dtend (comp, &end_datetime);
-
-	/* If either the DTSTART or the DTEND is a DATE value, we return TRUE.
-	   Maybe if one was a DATE-TIME we should check that, but that should
-	   not happen often. */
-	if ((start_datetime.value && start_datetime.value->is_date)
-	    || (end_datetime.value && end_datetime.value->is_date)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook
-	   will send single events as UTC, so we don't want to mark all of
-	   these. */
-	if ((!start_datetime.value || start_datetime.value->is_utc)
-	    && (!end_datetime.value || end_datetime.value->is_utc)) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* If the event uses floating time for DTSTART & DTEND, return TRUE.
-	   Imported vCalendar files will use floating times, so we don't want
-	   to mark all of these. */
-	if (!start_datetime.tzid && !end_datetime.tzid) {
-		retval = TRUE;
-		goto out;
-	}
-
-	/* FIXME: DURATION may be used instead. */
-	if (e_cal_component_compare_tzid (tzid, start_datetime.tzid)
-	    && e_cal_component_compare_tzid (tzid, end_datetime.tzid)) {
-		/* If both TZIDs are the same as the given zone's TZID, then
-		   we know the timezones are the same so we return TRUE. */
-		retval = TRUE;
-	} else {
-		/* If the TZIDs differ, we have to compare the UTC offsets
-		   of the start and end times, using their own timezones and
-		   the given timezone. */
-		if (!e_cal_get_timezone (client, start_datetime.tzid,
-					      &start_zone, NULL))
-			goto out;
-
-		if (start_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (start_zone,
-							       start_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       start_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		if (!e_cal_get_timezone (client, end_datetime.tzid,
-					      &end_zone, NULL))
-			goto out;
-
-		if (end_datetime.value) {
-			offset1 = icaltimezone_get_utc_offset (end_zone,
-							       end_datetime.value,
-							       NULL);
-			offset2 = icaltimezone_get_utc_offset (zone,
-							       end_datetime.value,
-							       NULL);
-			if (offset1 != offset2)
-				goto out;
-		}
-
-		retval = TRUE;
-	}
-
- out:
-
-	e_cal_component_free_datetime (&start_datetime);
-	e_cal_component_free_datetime (&end_datetime);
-
-	return retval;
-}
-
-/**
- * cal_comp_confirm_delete_empty_comp:
- * @comp: A calendar component.
- * @client: Calendar client where the component purportedly lives.
- * @widget: Widget to be used as the basis for UTF8 conversion.
- * 
- * Assumming a calendar component with an empty SUMMARY property (as per
- * string_is_empty()), asks whether the user wants to delete it based on
- * whether the appointment is on the calendar server or not.  If the
- * component is on the server, this function will present a confirmation
- * dialog and delete the component if the user tells it to.  If the component
- * is not on the server it will just return TRUE.
- * 
- * Return value: A result code indicating whether the component
- * was not on the server and is to be deleted locally, whether it
- * was on the server and the user deleted it, or whether the
- * user cancelled the deletion.
- **/
-gboolean
-cal_comp_is_on_server (ECalComponent *comp, ECal *client)
-{
-	const char *uid;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (E_IS_CAL (client), FALSE);
-
-	/* See if the component is on the server.  If it is not, then it likely
-	 * means that the appointment is new, only in the day view, and we
-	 * haven't added it yet to the server.  In that case, we don't need to
-	 * confirm and we can just delete the event.  Otherwise, we ask
-	 * the user.
-	 */
-	e_cal_component_get_uid (comp, &uid);
-
-	if (e_cal_get_object (client, uid, NULL, &icalcomp, &error)) {
-		icalcomponent_free (icalcomp);
-
-		return TRUE;
-	}
-
-	if (error->code != E_CALENDAR_STATUS_OBJECT_NOT_FOUND)
-		g_warning (G_STRLOC ": %s", error->message);
-
-	g_clear_error (&error);
-
-	return FALSE;
-}
-
-/**
- * cal_comp_event_new_with_defaults:
- * 
- * Creates a new VEVENT component and adds any default alarms to it as set in
- * the program's configuration values.
- * 
- * Return value: A newly-created calendar component.
- **/
-ECalComponent *
-cal_comp_event_new_with_defaults (ECal *client)
-{
-	icalcomponent *icalcomp;
-	ECalComponent *comp;
-	int interval;
-	CalUnits units;
-	ECalComponentAlarm *alarm;
-	icalproperty *icalprop;
-	ECalComponentAlarmTrigger trigger;
-
-	if (!e_cal_get_default_object (client, &icalcomp, NULL))
-		return NULL;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return NULL;
-	}
-	
-	if (!calendar_config_get_use_default_reminder ())
-		return comp;
-
-	interval = calendar_config_get_default_reminder_interval ();
-	units = calendar_config_get_default_reminder_units ();
-
-	alarm = e_cal_component_alarm_new ();
-
-	/* We don't set the description of the alarm; we'll copy it from the
-	 * summary when it gets committed to the server. For that, we add a
-	 * X-EVOLUTION-NEEDS-DESCRIPTION property to the alarm's component.
-	 */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalproperty_new_x ("1");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-	icalcomponent_add_property (icalcomp, icalprop);
-
-	e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
-
-	trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-
-	memset (&trigger.u.rel_duration, 0, sizeof (trigger.u.rel_duration));
-
-	trigger.u.rel_duration.is_neg = TRUE;
-
-	switch (units) {
-	case CAL_MINUTES:
-		trigger.u.rel_duration.minutes = interval;
-		break;
-
-	case CAL_HOURS:	
-		trigger.u.rel_duration.hours = interval;
-		break;
-
-	case CAL_DAYS:	
-		trigger.u.rel_duration.days = interval;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	e_cal_component_alarm_set_trigger (alarm, trigger);
-
-	e_cal_component_add_alarm (comp, alarm);
-	e_cal_component_alarm_free (alarm);
-
-	return comp;
-}
-
-ECalComponent *
-cal_comp_task_new_with_defaults (ECal *client)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-
-	if (!e_cal_get_default_object (client, &icalcomp, NULL))
-		return NULL;
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-
-		return NULL;
-	}
-
-	comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-		g_object_unref (comp);
-		icalcomponent_free (icalcomp);
-		return NULL;
-	}
-
-	return comp;
-}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
deleted file mode 100644
index 0f4542aba1..0000000000
--- a/calendar/gui/comp-util.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef COMP_UTIL_H
-#define COMP_UTIL_H
-
-#include <gtk/gtkwidget.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal.h>
-
-void cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone);
-
-
-/* Returns TRUE if the component uses the given timezone for both DTSTART
-   and DTEND, or if the UTC offsets of the start and end times are the same
-   as in the given zone. */
-gboolean cal_comp_util_compare_event_timezones (ECalComponent *comp,
-						ECal *client,
-						icaltimezone *zone);
-
-gboolean cal_comp_is_on_server (ECalComponent *comp,
-				ECal *client);
-
-ECalComponent *cal_comp_event_new_with_defaults (ECal *client);
-ECalComponent *cal_comp_task_new_with_defaults (ECal *client);
-
-#endif
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index 58436ec841..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <string.h>
-#include <gtk/gtksignal.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 <bonobo/bonobo-property-bag.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libecal/e-cal-time-util.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-#include <gui/calendar-config.h>
-
-#include "control-factory.h"
-
-#define PROPERTY_CALENDAR_URI      "folder_uri"
-#define PROPERTY_CALENDAR_URI_IDX  1
-
-#define PROPERTY_CALENDAR_VIEW     "view"
-#define PROPERTY_CALENDAR_VIEW_IDX 2
-
-
-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;
-	const char *uri;
-	BonoboControl *control = user_data;
-
-	gcal = (GnomeCalendar *) bonobo_control_get_widget (control);
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		uri = e_cal_get_uri (e_cal_model_get_default_client (gnome_calendar_get_calendar_model (gcal)));
-		BONOBO_ARG_SET_STRING (arg, uri);
-		break;
-
-	case PROPERTY_CALENDAR_VIEW_IDX:
-		switch (gnome_calendar_get_view (gcal)) {
-		case GNOME_CAL_DAY_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "day");
-			break;
-		case GNOME_CAL_WEEK_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "week");
-			break;
-		case GNOME_CAL_WORK_WEEK_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "workweek");
-			break;
-		case GNOME_CAL_MONTH_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "month");
-			break;
-		case GNOME_CAL_LIST_VIEW:
-			BONOBO_ARG_SET_STRING (arg, "list");
-			break;
-		default:
-		}
-		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;
-	char *string;
-	GnomeCalendarViewType view;
-	BonoboControl *control = user_data;
-
-	gcal = (GnomeCalendar *) bonobo_control_get_widget (control);
-
-	switch (arg_id) {
-	case PROPERTY_CALENDAR_URI_IDX:
-		string = BONOBO_ARG_GET_STRING (arg);
-		if (gnome_calendar_add_event_uri (gcal, string)) {
-			calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
-		} else {
-			char *msg;
-
-			msg = g_strdup_printf (_("Could not open the folder in '%s'"), string);
-			gnome_error_dialog_parented (
-				msg,
-				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-			g_free (msg);
-		}
-		break;
-
-	case PROPERTY_CALENDAR_VIEW_IDX:
-		string = BONOBO_ARG_GET_STRING (arg);
-		if (!strcmp (string, "week"))
-			view = GNOME_CAL_WEEK_VIEW;
-		else if (!strcmp (string, "workweek"))
-			view = GNOME_CAL_WORK_WEEK_VIEW;
-		else if (!strcmp (string, "month"))
-			view = GNOME_CAL_MONTH_VIEW;
-		else if (!strcmp (string, "day"))
-			view = GNOME_CAL_DAY_VIEW;
-		else
-			view = calendar_config_get_default_view ();
-
-		/* This doesn't actually work, because the GalView
-		 * comes along and resets the view. FIXME.
-		 */
-		gnome_calendar_set_view (gcal, view, FALSE, TRUE);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (get_prop, set_prop, control);
-
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_VIEW,
-				 PROPERTY_CALENDAR_VIEW_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The type of view to show"),
-				 0);
-
-	bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (pbag)), NULL);
-	bonobo_object_unref (BONOBO_OBJECT (pbag));
-}
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (gnome_calendar_new ());
-	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;
-	}
-	g_object_set_data (G_OBJECT (gcal), "control", control);
-
-	calendar_properties_init (gcal, control);
-					      
-	g_signal_connect (control, "activate", G_CALLBACK (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 bab1611c03..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000, 2001, 2002, 2003  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-#include <bonobo/bonobo-control.h>
-
-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 182657d5ac..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.pure
-Makefile
-Makefile.in
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index 7e3b76fd97..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-IDLS = $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED_H =                 			\
-	Evolution-Addressbook-SelectNames.h
-IDL_GENERATED = $(IDL_GENERATED_H)
-
-$(IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)	\
-		--nostubs --noskels --nocommon		\
-                $(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_builddir)						\
-	-I$(top_srcdir)/calendar					\
-	-I$(top_srcdir)/calendar/cal-client				\
-	-I$(top_builddir)/calendar/cal-client				\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
-	-DPREFIX=\""$(prefix)"\"					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-noinst_LTLIBRARIES = libcal-dialogs.la
-
-libcal_dialogs_la_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	\
-	copy-source-dialog.c	\
-	copy-source-dialog.h	\
-	delete-comp.c		\
-	delete-comp.h		\
-	delete-error.c		\
-	delete-error.h		\
-	e-delegate-dialog.c	\
-	e-delegate-dialog.h	\
-	event-editor.c		\
-	event-editor.h		\
-	event-page.c		\
-	event-page.h		\
-	meeting-page.c		\
-	meeting-page.h		\
-	new-calendar.c		\
-	new-calendar.h		\
-	new-task-list.c		\
-	new-task-list.h		\
-	recurrence-page.c	\
-	recurrence-page.h	\
-	recur-comp.c		\
-	recur-comp.h		\
-	save-comp.c		\
-	save-comp.h		\
-	schedule-page.c		\
-	schedule-page.h		\
-	send-comp.c		\
-	send-comp.h		\
-	task-editor.c		\
-	task-editor.h		\
-	task-details-page.c	\
-	task-details-page.h	\
-	task-page.c		\
-	task-page.h
-
-glade_DATA =				\
-	alarm-options.glade		\
-	alarm-page.glade		\
-	cal-prefs-dialog.glade		\
-	e-delegate-dialog.glade		\
-	event-page.glade		\
-	meeting-page.glade		\
-	new-calendar.glade		\
-	new-task-list.glade		\
-	recurrence-page.glade		\
-	schedule-page.glade		\
-	task-details-page.glade		\
-	task-page.glade
-
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST =			\
-	$(glade_DATA)
diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c
deleted file mode 100644
index 512020d4d6..0000000000
--- a/calendar/gui/dialogs/alarm-options.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/* Evolution calendar - Alarm options dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-widget.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <glade/glade.h>
-#include <addressbook/util/eab-destination.h>
-#include "Evolution-Addressbook-SelectNames.h"
-#include "e-util/e-dialog-widgets.h"
-#include "alarm-options.h"
-
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* The alarm action selected */
-	ECalComponentAlarmAction action;
-
-	/* Toplevel */
-	GtkWidget *toplevel;
-
-	/* Alarm repeat widgets */
-	gboolean repeat;
-	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;
-
-	/* Mail alarm widgets */
-	const char *email;
-	GtkWidget *malarm_group;
-	GtkWidget *malarm_address_group;
-	GtkWidget *malarm_addresses;
-	GtkWidget *malarm_addressbook;
-	GtkWidget *malarm_description;
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-
-	/* Procedure alarm widgets */
-	GtkWidget *palarm_group;
-	GtkWidget *palarm_program;
-	GtkWidget *palarm_args;
-} Dialog;
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
-static const char *section_name = "Send To";
-
-
-
-/* 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->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->malarm_address_group = GW ("malarm-address-group");
-	dialog->malarm_addressbook = GW ("malarm-addressbook");
-	dialog->malarm_description = GW ("malarm-description");
-	
-	dialog->palarm_group = GW ("palarm-group");
-	dialog->palarm_program = GW ("palarm-program");
-	dialog->palarm_args = GW ("palarm-args");
-
-	return (dialog->toplevel
-		&& 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->malarm_address_group
-		&& dialog->malarm_addressbook
-		&& dialog->malarm_description
-		&& dialog->palarm_group
-		&& dialog->palarm_program
-		&& dialog->palarm_args);
-}
-
-static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	Dialog *dialog = data;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (dialog->corba_select_names, 
-								section_name, &ev);
-	
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-setup_select_names (Dialog *dialog)
-{
-	Bonobo_Control corba_control;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	dialog->corba_select_names = bonobo_activation_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-	if (BONOBO_EX (&ev))
-		return FALSE;
-	
-	GNOME_Evolution_Addressbook_SelectNames_addSection (dialog->corba_select_names, 
-							    section_name, section_name, &ev);
-	if (BONOBO_EX (&ev))
-		return FALSE;
-
-	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (dialog->corba_select_names, 
-										   section_name, &ev);
-
-	if (BONOBO_EX (&ev))
-		return FALSE;
-	
-	CORBA_exception_free (&ev);
-
-	dialog->malarm_addresses = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
-	gtk_widget_show (dialog->malarm_addresses);
-	gtk_box_pack_end_defaults (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->malarm_addressbook), "clicked",
-			    GTK_SIGNAL_FUNC (addressbook_clicked_cb), dialog);
-
-	return TRUE;
-}
-
-static void
-palarm_options_changed_cb (GtkEditable *entry, gpointer user_data)
-{
-	const gchar *text;
-	Dialog *dialog = user_data;
-
-	text = gtk_entry_get_text (GTK_ENTRY (dialog->palarm_program));
-	if (text && *text)
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, TRUE);
-	else
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, FALSE);
-}
-
-/* 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);
-
-	/* activate the 'OK' button */
-	if (dialog->action == E_CAL_COMPONENT_ALARM_PROCEDURE)
-		palarm_options_changed_cb (GTK_EDITABLE (dialog->palarm_program), dialog);
-}
-
-static void
-repeat_spin_button_changed_cb (GtkWidget *spin, gpointer user_data)
-{
-	Dialog *dialog = user_data;
-
-	if (dialog->action == E_CAL_COMPONENT_ALARM_PROCEDURE)
-		palarm_options_changed_cb (GTK_EDITABLE (dialog->palarm_program), dialog);
-}
-
-
-static void
-repeat_unit_changed_cb (GtkWidget *option_menu, gpointer user_data)
-{
-	Dialog *dialog = user_data;
-
-	if (dialog->action == E_CAL_COMPONENT_ALARM_PROCEDURE)
-		palarm_options_changed_cb (GTK_EDITABLE (dialog->palarm_program), dialog);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (Dialog *dialog)
-{
-	/* Alarm repeat */
-
-	g_signal_connect (G_OBJECT (dialog->repeat_toggle), "toggled",
-			  G_CALLBACK (repeat_toggle_toggled_cb), dialog);
-
-	g_signal_connect (G_OBJECT (dialog->repeat_quantity), "value_changed",
-			  G_CALLBACK (repeat_spin_button_changed_cb), dialog);
-	g_signal_connect (G_OBJECT (dialog->repeat_value), "value_changed",
-			  G_CALLBACK (repeat_spin_button_changed_cb), dialog);
-
-	g_signal_connect (G_OBJECT (dialog->repeat_unit), "changed",
-			  G_CALLBACK (repeat_unit_changed_cb), dialog);
-}
-
-/* Fills the audio alarm widgets with the values from the alarm component */
-static void
-alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	icalattach *attach;
-	const char *url;
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-
-	if (!attach) {
-		e_dialog_editable_set (dialog->aalarm_attach, NULL);
-		return;
-	}
-
-	/* FIXME: this does not support inline data */
-
-	url = NULL;
-
-	if (icalattach_get_is_url (attach))
-		url = icalattach_get_url (attach);
-	else
-		g_message ("alarm_to_aalarm_widgets(): FIXME: we don't support inline data yet");
-
-	e_dialog_editable_set (dialog->aalarm_attach, url);
-
-	icalattach_unref (attach);
-}
-
-/* Fills the display alarm widgets with the values from the alarm component */
-static void
-alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentText description;
-	GtkTextBuffer *text_buffer;
-	
-	e_cal_component_alarm_get_description (alarm, &description);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	gtk_text_buffer_set_text (text_buffer, description.value ? description.value : "", -1);
-}
-
-/* Fills the mail alarm widgets with the values from the alarm component */
-static void
-alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentText description;
-	GtkTextBuffer *text_buffer;	
-	GSList *attendee_list, *l;
-	EABDestination **destv;
-	int len, i;
-	
-	/* Recipients */
-	e_cal_component_alarm_get_attendee_list (alarm, &attendee_list);
-	len = g_slist_length (attendee_list);
-
-	if (len <= 0) {
-		destv = g_new0 (EABDestination *, 2);
-		destv[0] = eab_destination_new ();
-		eab_destination_set_email (destv[0], dialog->email);
-		destv[1] = NULL;
-		len = 1;
-	} else {
-		destv = g_new0 (EABDestination *, len + 1);
-		for (l = attendee_list, i = 0; l != NULL; l = l->next, i++) {
-			ECalComponentAttendee *a = l->data;
-			EABDestination *dest;
-			
-			dest = eab_destination_new ();
-			if (a->cn != NULL && *a->cn)
-				eab_destination_set_name (dest, a->cn);
-			if (a->value != NULL && *a->value)
-				eab_destination_set_email (dest, a->value);
-			
-			destv[i] = dest;
-		}
-		destv[i] = NULL;
-	}
-	
-	bonobo_widget_set_property (BONOBO_WIDGET (dialog->malarm_addresses), 
-				    "destinations", eab_destination_exportv (destv), NULL);
-
-	for (i = 0; i < len; i++)
-		g_object_unref (GTK_OBJECT (destv[i]));
-	g_free (destv);
-
-	e_cal_component_free_attendee_list (attendee_list);
-
-	/* Description */
-	e_cal_component_alarm_get_description (alarm, &description);
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-	gtk_text_buffer_set_text (text_buffer, description.value ? description.value : "", -1);
-}
-
-/* Fills the procedure alarm widgets with the values from the alarm component */
-static void
-alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	icalattach *attach;
-	ECalComponentText description;
-
-	e_cal_component_alarm_get_attach (alarm, &attach);
-	e_cal_component_alarm_get_description (alarm, &description);
-
-	if (attach) {
-		const char *url;
-
-		if (icalattach_get_is_url (attach)) {
-			url = icalattach_get_url (attach);
-			e_dialog_editable_set (dialog->palarm_program, url);
-		} else
-			g_message ("alarm_to_palarm_widgets(): Don't know what to do with non-URL "
-				   "attachments");
-
-		icalattach_unref (attach);
-	}
-
-	e_dialog_editable_set (dialog->palarm_args, description.value);
-}
-
-enum duration_units {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS
-};
-
-static const int duration_units_map[] = {
-	DUR_MINUTES,
-	DUR_HOURS,
-	DUR_DAYS,
-	-1
-};
-
-/* Sigh.  Takes an overcomplicated duration value and reduces it to its lowest
- * common denominator.
- */
-static void
-normalize_duration (struct icaldurationtype dur, int *value, enum duration_units *units)
-{
-	if (dur.seconds != 0 || dur.minutes != 0) {
-		*value = ((((dur.weeks * 7 + dur.days) * 24 + dur.hours) * 60) + dur.minutes
-			  + dur.seconds / 60 + ((dur.seconds % 60) >= 30 ? 1 : 0));
-		*units = DUR_MINUTES;
-	} else if (dur.hours) {
-		*value = ((dur.weeks * 7) + dur.days) * 24 + dur.hours;
-		*units = DUR_HOURS;
-	} else if (dur.days != 0 || dur.weeks != 0) {
-		*value = dur.weeks * 7 + dur.days;
-		*units = DUR_DAYS;
-	} else {
-		*value = 0;
-		*units = DUR_MINUTES;
-	}
-}
-
-/* Fills the repeat widgets with the values from the alarm component */
-static void
-alarm_to_repeat_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmRepeat repeat;
-	int value;
-	enum duration_units units;
-
-	e_cal_component_alarm_get_repeat (alarm, &repeat);
-
-	/* Sensitivity */
-
-	if (!dialog->repeat || repeat.repetitions == 0) {
-		gtk_widget_set_sensitive (dialog->repeat_toggle, dialog->repeat);
-		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, ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmAction action;
-
-	alarm_to_repeat_widgets (dialog, alarm);
-
-	e_cal_component_alarm_get_action (alarm, &action);
-
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_NONE:
-		g_assert_not_reached ();
-		return;
-
-	case E_CAL_COMPONENT_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 E_CAL_COMPONENT_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 E_CAL_COMPONENT_ALARM_EMAIL:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Email 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 E_CAL_COMPONENT_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);
-
-		/* make sure the 'OK' button is disabled while the program entry is empty */
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->toplevel), GTK_RESPONSE_OK, FALSE);
-		g_signal_connect (G_OBJECT (dialog->palarm_program), "changed",
-				  G_CALLBACK (palarm_options_changed_cb), dialog);
-		g_signal_connect (G_OBJECT (dialog->palarm_args), "changed",
-				  G_CALLBACK (palarm_options_changed_cb), dialog);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_UNKNOWN:
-		gtk_window_set_title (GTK_WINDOW (dialog->toplevel), _("Unknown Alarm Options"));
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	dialog->action = action;
-}
-
-
-
-/* Fills the alarm data with the values from the repeat/duration widgets */
-static void
-repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmRepeat repeat;
-
-	if (!e_dialog_toggle_get (dialog->repeat_toggle)) {
-		repeat.repetitions = 0;
-
-		e_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 ();
-	}
-
-	e_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, ECalComponentAlarm *alarm)
-{
-	char *url;
-	icalattach *attach;
-
-	url = e_dialog_editable_get (dialog->aalarm_attach);
-	attach = icalattach_new_from_url (url ? url : "");
-	g_free (url);
-
-	e_cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-}
-
-/* Fills the display alarm data with the values from the widgets */
-static void
-dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *str;
-	ECalComponentText description;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	description.value = str;
-	description.altrep = NULL;
-
-	e_cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* Fills the mail alarm data with the values from the widgets */
-static void
-malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *str;
-	ECalComponentText description;
-	GSList *attendee_list = NULL;
-	EABDestination **destv;
-	GtkTextBuffer *text_buffer;
-	GtkTextIter text_iter_start, text_iter_end;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-	int i;
-	
-	/* Attendees */
-	bonobo_widget_get_property (BONOBO_WIDGET (dialog->malarm_addresses), "destinations", 
-				    TC_CORBA_string, &str, NULL);
-	destv = eab_destination_importv (str);
-	g_free (str);
-	
-	for (i = 0; destv[i] != NULL; i++) {
-		EABDestination *dest;
-		ECalComponentAttendee *a;
-
-		dest = destv[i];
-		
-		a = g_new0 (ECalComponentAttendee, 1);
-		a->value = eab_destination_get_email (dest);
-		a->cn = eab_destination_get_name (dest);
-
-		attendee_list = g_slist_append (attendee_list, a);
-	}
-
-	e_cal_component_alarm_set_attendee_list (alarm, attendee_list);
-
-	e_cal_component_free_attendee_list (attendee_list);
-	eab_destination_freev (destv);	
-
-	/* Description */
-	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start);
-	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
-	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
-
-	description.value = str;
-	description.altrep = NULL;
-
-	e_cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* Fills the procedure alarm data with the values from the widgets */
-static void
-palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	char *program;
-	icalattach *attach;
-	char *str;
-	ECalComponentText description;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-
-	program = e_dialog_editable_get (dialog->palarm_program);
-	attach = icalattach_new_from_url (program ? program : "");
-	g_free (program);
-
-	e_cal_component_alarm_set_attach (alarm, attach);
-	icalattach_unref (attach);
-
-	str = e_dialog_editable_get (dialog->palarm_args);
-	description.value = str;
-	description.altrep = NULL;
-
-	e_cal_component_alarm_set_description (alarm, &description);
-	g_free (str);
-
-	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
-	 * we don't re-set the alarm's description */
-	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-	while (icalprop) {
-		const char *x_name;
-
-		x_name = icalproperty_get_x_name (icalprop);
-		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-			icalcomponent_remove_property (icalcomp, icalprop);
-			break;
-		}
-
-		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-	}
-}
-
-/* Fills the alarm data with the values from the widgets */
-static void
-dialog_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
-{
-	ECalComponentAlarmAction action;
-
-	repeat_widgets_to_alarm (dialog, alarm);
-
-	e_cal_component_alarm_get_action (alarm, &action);
-
-	switch (action) {
-	case E_CAL_COMPONENT_ALARM_NONE:
-		g_assert_not_reached ();
-		break;
-
-	case E_CAL_COMPONENT_ALARM_AUDIO:
-		aalarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_DISPLAY:
-		dalarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_EMAIL:
-		malarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_PROCEDURE:
-		palarm_widgets_to_alarm (dialog, alarm);
-		break;
-
-	case E_CAL_COMPONENT_ALARM_UNKNOWN:
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-
-/**
- * alarm_options_dialog_run:
- * @alarm: Alarm that is to be edited.
- * 
- * Runs an alarm options dialog modally.
- * 
- * Return value: TRUE if the dialog could be created, FALSE otherwise.
- **/
-gboolean
-alarm_options_dialog_run (ECalComponentAlarm *alarm, const char *email, gboolean repeat)
-{
-	Dialog dialog;
-	int response_id;
-
-	g_return_val_if_fail (alarm != NULL, FALSE);
-
- 	dialog.repeat = repeat;
- 	dialog.email = email;
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-options.glade", NULL, NULL);
-	if (!dialog.xml) {
-		g_message ("alarm_options_dialog_new(): Could not load the Glade XML file!");
-		return FALSE;
-	}
-
-	if (!get_widgets (&dialog)) {
-		g_object_unref(dialog.xml);
-		return FALSE;
-	}
-
-	if (!setup_select_names (&dialog)) {
-  		g_object_unref (dialog.xml);
-  		return FALSE;
-  	}
-
-	init_widgets (&dialog);
-
-	alarm_to_dialog (&dialog, alarm);
-
-	response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel));
-	gtk_widget_hide (dialog.toplevel);
-
-	if (response_id == GTK_RESPONSE_OK)
-		dialog_to_alarm (&dialog, alarm);
-
-	gtk_widget_destroy (dialog.toplevel);
-	g_object_unref(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 d58e817ba3..0000000000
--- a/calendar/gui/dialogs/alarm-options.glade
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="alarm-options-toplevel">
-  <property name="border_width">12</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">dialog1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox1">
-	  <property name="border_width">4</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame1">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox1">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="repeat-toggle">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="has_focus">True</property>
-		      <property name="label" translatable="yes">Repeat the alarm</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="repeat-group">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">4</property>
-
-		      <child>
-			<widget class="GtkSpinButton" id="repeat-quantity">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 999 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">extra times every</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="repeat-value">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 0 999 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="repeat-unit">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget1">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">minutes</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">hours</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget4">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">days</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Alarm Repeat</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="dalarm-group">
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label2">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Message to Display:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow1">
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="dalarm-description">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="aalarm-group">
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label3">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Play sound:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GnomeFileEntry" id="file-entry1">
-		  <property name="visible">True</property>
-		  <property name="max_saved">10</property>
-		  <property name="directory_entry">False</property>
-		  <property name="modal">True</property>
-
-		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="aalarm-attach">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="malarm-group">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkHBox" id="malarm-address-group">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="malarm-addressbook">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Send To:</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label7">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Message to Send</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow2">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="malarm-description">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="palarm-group">
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label5">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Run program:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="palarm-program">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label6">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">With these arguments:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="palarm-args">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/alarm-options.h b/calendar/gui/dialogs/alarm-options.h
deleted file mode 100644
index 5a07935810..0000000000
--- a/calendar/gui/dialogs/alarm-options.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Evolution calendar - Alarm options dialog
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_OPTIONS_H
-#define ALARM_OPTIONS_H
-
-#include <libecal/e-cal-component.h>
-
-gboolean alarm_options_dialog_run (ECalComponentAlarm *alarm, const char *email, gboolean repeat);
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
deleted file mode 100644
index 603cd5c8b6..0000000000
--- a/calendar/gui/dialogs/alarm-page.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Alarm page of the calendar component dialogs
- *
- * Copyright (C) 2001-2003 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>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 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/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkoptionmenu.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
-#include "../calendar-config.h"
-#include "comp-editor-util.h"
-#include "alarm-options.h"
-#include "../e-alarm-list.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 */
-	ECalComponentAlarm *alarm;
-
-	/* Alarm store for the GtkTreeView list widget */
-	EAlarmList *list_store;
-
-	gboolean updating;
-
-	/* Old summary, to detect changes */
-	gchar *old_summary;
-};
-
-/* "relative" types */
-enum {
-	BEFORE,
-	AFTER
-};
-
-/* Time units */
-enum {
-	MINUTES,
-	HOURS,
-	DAYS
-};
-
-/* Option menu maps */
-static const int action_map[] = {
-	E_CAL_COMPONENT_ALARM_DISPLAY,
-	E_CAL_COMPONENT_ALARM_AUDIO,
-	E_CAL_COMPONENT_ALARM_PROCEDURE,
-	E_CAL_COMPONENT_ALARM_EMAIL,
-	-1
-};
-
-static const char *action_map_cap[] = {
-	CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS,
-	CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS,
-        CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS,
-	CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS
-};
-
-static const int value_map[] = {
-	MINUTES,
-	HOURS,
-	DAYS,
-	-1
-};
-
-static const int relative_map[] = {
-	BEFORE,
-	AFTER,
-	-1
-};
-
-static const int time_map[] = {
-	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START,
-	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END,
-	-1
-};
-
-
-
-static void alarm_page_class_init (AlarmPageClass *class);
-static void alarm_page_init (AlarmPage *apage);
-static void alarm_page_finalize (GObject *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, ECalComponent *comp);
-static gboolean alarm_page_fill_component (CompEditorPage *page, ECalComponent *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.
- **/
-
-E_MAKE_TYPE (alarm_page, "AlarmPage", AlarmPage, alarm_page_class_init,
-	     alarm_page_init, TYPE_COMP_EDITOR_PAGE);
-
-/* Class initialization function for the alarm page */
-static void
-alarm_page_class_init (AlarmPageClass *class)
-{
-	CompEditorPageClass *editor_page_class;
-	GObjectClass *gobject_class;
-
-	editor_page_class = (CompEditorPageClass *) class;
-	gobject_class = (GObjectClass *) class;
-
-	parent_class = g_type_class_ref (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;
-
-	gobject_class->finalize = alarm_page_finalize;
-}
-
-/* Object initialization function for the alarm page */
-static void
-alarm_page_init (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-	icalcomponent *icalcomp;
-	icalproperty *icalprop;
-
-	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;
-
-	/* create the default alarm, which will contain the
-	 * X-EVOLUTION-NEEDS-DESCRIPTION property, so that we
-	 * set a correct description if none is set */
-	priv->alarm = e_cal_component_alarm_new ();
-
-	icalcomp = e_cal_component_alarm_get_icalcomponent (priv->alarm);
-	icalprop = icalproperty_new_x ("1");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-        icalcomponent_add_property (icalcomp, icalprop);
-
-	priv->updating = FALSE;
-	priv->old_summary = NULL;
-}
-
-/* Destroy handler for the alarm page */
-static void
-alarm_page_finalize (GObject *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->main)
-		gtk_widget_unref (priv->main);
-
-	if (priv->xml) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
-	}
-
-	if (priv->alarm) {
-		e_cal_component_alarm_free (priv->alarm);
-		priv->alarm = NULL;
-	}
-
-	if (priv->list_store) {
-		g_object_unref (priv->list_store);
-		priv->list_store = NULL;
-	}
-
-	if (priv->old_summary) {
-		g_free (priv->old_summary);
-		priv->old_summary = NULL;
-	}
-
-	g_free (priv);
-	apage->priv = NULL;
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-
-/* get_widget handler for the alarm page */
-static GtkWidget *
-alarm_page_get_widget (CompEditorPage *page)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	return priv->main;
-}
-
-/* focus_main_widget handler for the alarm page */
-static void
-alarm_page_focus_main_widget (CompEditorPage *page)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	gtk_widget_grab_focus (priv->action);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-
-	priv = apage->priv;
-
-	/* Summary */
-	gtk_label_set_text (GTK_LABEL (priv->summary), "");
-
-	/* Start date */
-	gtk_label_set_text (GTK_LABEL (priv->date_time), "");
-
-	/* Sane defaults */
-	e_dialog_option_menu_set (priv->action, E_CAL_COMPONENT_ALARM_DISPLAY, action_map);
-	e_dialog_spin_set (priv->interval_value, 15);
-	e_dialog_option_menu_set (priv->value_units, MINUTES, value_map);
-	e_dialog_option_menu_set (priv->relative, BEFORE, relative_map);
-	e_dialog_option_menu_set (priv->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map);
-
-	/* List data */
-	e_alarm_list_clear (priv->list_store);
-}
-
-static void
-sensitize_buttons (AlarmPage *apage)
-{
-	AlarmPagePrivate *priv;
-	ECal *client;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	gboolean have_selected;
-
-	priv = apage->priv;
-
-	client = COMP_EDITOR_PAGE (apage)->client;
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list));
-	have_selected = gtk_tree_selection_get_selected (selection, NULL, &iter);
-
-	gtk_widget_set_sensitive (priv->add,
-				  e_cal_get_one_alarm_only (client) && have_selected ? FALSE : TRUE);
-	gtk_widget_set_sensitive (priv->delete, have_selected);
-}
-
-/* Appends an alarm to the list */
-static void
-append_reminder (AlarmPage *apage, ECalComponentAlarm *alarm)
-{
-	AlarmPagePrivate *priv;
-	GtkTreeView *view;
-	GtkTreeIter  iter;
-
-	priv = apage->priv;
-	view = GTK_TREE_VIEW (priv->list);
-
-	e_alarm_list_append (priv->list_store, &iter, alarm);
-	gtk_tree_selection_select_iter (gtk_tree_view_get_selection (view), &iter);
-
-	sensitize_buttons (apage);
-}
-
-/* fill_widgets handler for the alarm page */
-static void
-alarm_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	GtkWidget *menu;
-	ECalComponentText text;
-	GList *alarms, *l;
-	CompEditorPageDates dates;
-	int i;
-	
-	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 */
-	e_cal_component_get_summary (comp, &text);
-	alarm_page_set_summary (page, text.value);
-
-	/* Dates */
-	comp_editor_dates (&dates, comp);
-	alarm_page_set_dates (page, &dates);
-	comp_editor_free_dates (&dates);
-
-	/* List */
-	if (!e_cal_component_has_alarms (comp))
-		goto out;
-
-	alarms = e_cal_component_get_alarm_uids (comp);
-
-	for (l = alarms; l != NULL; l = l->next) {
-		ECalComponentAlarm *ca, *ca_copy;
-		const char *auid;
-
-		auid = l->data;
-		ca = e_cal_component_get_alarm (comp, auid);
-		g_assert (ca != NULL);
-
-		ca_copy = e_cal_component_alarm_clone (ca);
-		e_cal_component_alarm_free (ca);
-
-		append_reminder (apage, ca_copy);
-	}
-	cal_obj_uid_list_free (alarms);
-
- out:
-
-	/* Alarm types */
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->action));
-	for (i = 0, l = GTK_MENU_SHELL (menu)->children; action_map[i] != -1; i++, l = l->next) {
-		if (e_cal_get_static_capability (page->client, action_map_cap[i]))
-			gtk_widget_set_sensitive (l->data, FALSE);
-		else
-			gtk_widget_set_sensitive (l->data, TRUE);
-	}
-	
-	sensitize_buttons (apage);
-
-	priv->updating = FALSE;
-}
-
-/* fill_component handler for the alarm page */
-static gboolean
-alarm_page_fill_component (CompEditorPage *page, ECalComponent *comp)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	GtkTreeView *view;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid_iter;
-	GList *list, *l;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	/* Remove all the alarms from the component */
-
-	list = e_cal_component_get_alarm_uids (comp);
-	for (l = list; l; l = l->next) {
-		const char *auid;
-
-		auid = l->data;
-		e_cal_component_remove_alarm (comp, auid);
-	}
-	cal_obj_uid_list_free (list);
-
-	/* Add the new alarms */
-
-	view  = GTK_TREE_VIEW  (priv->list);
-	model = GTK_TREE_MODEL (priv->list_store);
-
-	for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter;
-	     valid_iter = gtk_tree_model_iter_next (model, &iter)) {
-		ECalComponentAlarm *alarm, *alarm_copy;
-		icalcomponent *icalcomp;
-		icalproperty *icalprop;
-
-		alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->list_store, &iter);
-		g_assert (alarm != NULL);
-
-		/* We set the description of the alarm if it's got
-		 * the X-EVOLUTION-NEEDS-DESCRIPTION property.
-		 */
-		icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-		icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
-		while (icalprop) {
-			const char *x_name;
-			ECalComponentText summary;
-
-			x_name = icalproperty_get_x_name (icalprop);
-			if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
-				e_cal_component_get_summary (comp, &summary);
-				e_cal_component_alarm_set_description (alarm, &summary);
-
-				icalcomponent_remove_property (icalcomp, icalprop);
-				break;
-			}
-
-			icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
-		}
-
-		/* We clone the alarm to maintain the invariant that the alarm
-		 * structures in the list did *not* come from the component.
-		 */
-
-		alarm_copy = e_cal_component_alarm_clone (alarm);
-		e_cal_component_add_alarm (comp, alarm_copy);
-		e_cal_component_alarm_free (alarm_copy);
-	}
-
-	return TRUE;
-}
-
-/* set_summary handler for the alarm page */
-static void
-alarm_page_set_summary (CompEditorPage *page, const char *summary)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	gtk_label_set_text (GTK_LABEL (priv->summary), summary);
-
-	/* iterate over all alarms */
-	if (priv->old_summary) {
-		GtkTreeView *view;
-		GtkTreeModel *model;
-		GtkTreeIter iter;
-		gboolean valid_iter;
-
-		view = GTK_TREE_VIEW (priv->list);
-		model = GTK_TREE_MODEL (priv->list_store);
-
-		for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter;
-		     valid_iter = gtk_tree_model_iter_next (model, &iter)) {
-			ECalComponentAlarm *alarm;
-			ECalComponentText desc;
-
-			alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->list_store, &iter);
-			g_assert (alarm != NULL);
-
-			e_cal_component_alarm_get_description (alarm, &desc);
-			if (desc.value && *desc.value) {
-				if (!strcmp (desc.value, priv->old_summary)) {
-					desc.value = summary;
-					e_cal_component_alarm_set_description (alarm, &desc);
-				}
-			}
-		}
-
-		g_free (priv->old_summary);
-	}
-	
-	/* update old summary */
-	priv->old_summary = g_strdup (summary);
-}
-
-/* set_dates handler for the alarm page */
-static void
-alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-
-	apage = ALARM_PAGE (page);
-	priv = apage->priv;
-
-	comp_editor_date_label (dates, priv->date_time);
-}
-
-
-
-/* Gets the widgets from the XML file and returns TRUE if they are all available. */
-static gboolean
-get_widgets (AlarmPage *apage)
-{
-	CompEditorPage *page = COMP_EDITOR_PAGE (apage);
-	AlarmPagePrivate *priv;
-	GSList *accel_groups;
-	GtkWidget *toplevel;
-
-	priv = apage->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("alarm-page");
-	if (!priv->main)
-		return FALSE;
-
-	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
-	toplevel = gtk_widget_get_toplevel (priv->main);
-	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
-
-	gtk_widget_ref (priv->main);
-	gtk_container_remove (GTK_CONTAINER (priv->main->parent), 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;
-	ECalComponentAlarm *alarm;
-	ECalComponentAlarmTrigger trigger;
-	ECalComponentAlarmAction action;
-	
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	alarm = e_cal_component_alarm_clone (priv->alarm);
-
-	memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger));
-	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 ();
-	}
-	e_cal_component_alarm_set_trigger (alarm, trigger);
-
-	action = e_dialog_option_menu_get (priv->action, action_map);
-	e_cal_component_alarm_set_action (alarm, action);
-	if (action == E_CAL_COMPONENT_ALARM_EMAIL && !e_cal_component_alarm_has_attendees (alarm)) {
-		char *email;
-		
-		if (!e_cal_get_alarm_email_address (COMP_EDITOR_PAGE (apage)->client, &email, NULL)) {
-			ECalComponentAttendee *a;
-			GSList attendee_list;
-
-			a = g_new0 (ECalComponentAttendee, 1);
-			a->value = email;
-			attendee_list.data = a;
-			attendee_list.next = NULL;
-			e_cal_component_alarm_set_attendee_list (alarm, &attendee_list);
-			g_free (email);
-			g_free (a);
-		}
-	}
-
-	append_reminder (apage, alarm);
-}
-
-/* Callback used for the "delete reminder" button */
-static void
-delete_clicked_cb (GtkButton *button, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	gboolean valid_iter;
-
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list));
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to delete.");
-		return;
-	}
-
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->list_store), &iter);
-	e_alarm_list_remove (priv->list_store, &iter);
-
-	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path);
-	if (!valid_iter) {
-		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path);
-	}
-
-	if (valid_iter)
-		gtk_tree_selection_select_iter (selection, &iter);
-
-	sensitize_buttons (apage);
-
-	gtk_tree_path_free (path);
-}
-
-/* Callback used when the alarm options button is clicked */
-static void
-button_options_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmPage *apage;
-	AlarmPagePrivate *priv;
-	gboolean repeat;
-	char *email;
-	
-	apage = ALARM_PAGE (data);
-	priv = apage->priv;
-
-	e_cal_component_alarm_set_action (priv->alarm,
-					e_dialog_option_menu_get (priv->action, action_map));
-
-	repeat = !e_cal_get_static_capability (COMP_EDITOR_PAGE (apage)->client,
-						    CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT);
-
-	if (e_cal_get_alarm_email_address (COMP_EDITOR_PAGE (apage)->client, &email, NULL)) {
-		if (!alarm_options_dialog_run (priv->alarm, email, repeat))
-			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;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *cell_renderer;
-
-	priv = apage->priv;
-
-	/* Reminder buttons */
-	g_signal_connect ((priv->add), "clicked",
-			  G_CALLBACK (add_clicked_cb), apage);
-	g_signal_connect ((priv->delete), "clicked",
-			  G_CALLBACK (delete_clicked_cb), apage);
-
-	/* Connect the default signal handler to use to make sure we notify
-	 * upstream of changes to the widget values.
-	 */
-	g_signal_connect ((priv->add), "clicked",
-			  G_CALLBACK (field_changed_cb), apage);
-	g_signal_connect ((priv->delete), "clicked",
-			  G_CALLBACK (field_changed_cb), apage);
-
-	/* Options button */
-	g_signal_connect ((priv->button_options), "clicked",
-			  G_CALLBACK (button_options_clicked_cb), apage);
-
-	/* Alarm list */
-
-	/* Model */
-	priv->list_store = e_alarm_list_new ();
-	gtk_tree_view_set_model (GTK_TREE_VIEW (priv->list),
-				 GTK_TREE_MODEL (priv->list_store));
-
-	/* View */
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Action/Trigger"));
-	cell_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
-	gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
-	gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_ALARM_LIST_COLUMN_DESCRIPTION);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (priv->list), column);
-
-#if 0
-	/* If we want the alarm setup widgets to reflect the currently selected alarm, we
-	 * need to do something like this */
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list)), "changed",
-			  G_CALLBACK (alarm_selection_changed_cb), apage);
-#endif
-}
-
-
-
-/**
- * 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, 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 = g_object_new (TYPE_ALARM_PAGE, NULL);
-	if (!alarm_page_construct (apage)) {
-		g_object_unref (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 7c2f06bae3..0000000000
--- a/calendar/gui/dialogs/alarm-page.glade
+++ /dev/null
@@ -1,490 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="alarm-toplevel">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="alarm-page">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-	<widget class="GtkFrame" id="frame33">
-	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	  <child>
-	    <widget class="GtkTable" id="table13">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">2</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label62">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Summary:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label63">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Date/Time:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="summary">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">4</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="date-time">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">4</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Basics</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkFrame" id="frame34">
-	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox53">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox54">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="action">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget1">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Display a message</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Play a sound</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget4">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Run a program</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="send_an_email1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Send an Email</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="interval-value">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">True</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 999 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="value-units">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget5">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget6">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">minute(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget7">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">hour(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">day(s)</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="relative">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget9">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">before</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget11">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">after</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkOptionMenu" id="time">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget12">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget13">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">start of appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget14">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">end of appointment</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="button-options">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Options...</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox55">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow13">
-		      <property name="visible">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="list">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">False</property>
-			  <property name="reorderable">False</property>
-			  <property name="enable_search">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVButtonBox" id="vbuttonbox2">
-		      <property name="visible">True</property>
-		      <property name="layout_style">GTK_BUTTONBOX_START</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkButton" id="add">
-			  <property name="visible">True</property>
-			  <property name="can_default">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label">gtk-add</property>
-			  <property name="use_stock">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="delete">
-			  <property name="visible">True</property>
-			  <property name="can_default">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label">gtk-remove</property>
-			  <property name="use_stock">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label64">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Reminders</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/calendar/gui/dialogs/alarm-page.h b/calendar/gui/dialogs/alarm-page.h
deleted file mode 100644
index d814e850b3..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-2003 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>
- *          Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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"
-
-G_BEGIN_DECLS
-
-
-
-#define TYPE_ALARM_PAGE            (alarm_page_get_type ())
-#define ALARM_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALARM_PAGE, AlarmPage))
-#define ALARM_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALARM_PAGE, AlarmPageClass))
-#define IS_ALARM_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALARM_PAGE))
-#define IS_ALARM_PAGE_CLASS(klass) (G_TYPE_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);
-
-
-
-G_END_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 83363a3ac0..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "../e-timezone-entry.h"
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-
-
-struct _DialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *page;
-
-	GtkWidget *timezone;
-	GtkWidget *working_days[7];
-	GtkWidget *week_start_day;
-	GtkWidget *start_of_day;
-	GtkWidget *end_of_day;
-	GtkWidget *use_12_hour;
-	GtkWidget *use_24_hour;
-	GtkWidget *time_divisions;
-	GtkWidget *show_end_times;
-	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-
-	/* Widgets for the task list options */
-	GtkWidget *tasks_due_today_color;
-	GtkWidget *tasks_overdue_color;
-
-	GtkWidget *tasks_hide_completed_checkbutton;
-	GtkWidget *tasks_hide_completed_spinbutton;
-	GtkWidget *tasks_hide_completed_optionmenu;
-
-	/* Other page options */
-	GtkWidget *confirm_delete;
-	GtkWidget *default_reminder;
-	GtkWidget *default_reminder_interval;
-	GtkWidget *default_reminder_units;
-};
-typedef struct _DialogData DialogData;
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-/* The following two are kept separate in case we need to re-order each menu individually */
-static const int hide_completed_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-static const int default_reminder_units_map[] = {
-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
-};
-
-
-static gboolean get_widgets (DialogData *data);
-
-static void widget_changed_callback (GtkWidget *, void *data);
-static void connect_changed (GtkWidget *widget, const char *signal_name, EvolutionConfigControl *config_control);
-static void setup_changes (DialogData *data, EvolutionConfigControl *config_control);
-
-static void init_widgets (DialogData *data);
-static void show_config (DialogData *data);
-static void update_config (DialogData *dialog_data);
-
-static void config_control_apply_callback (EvolutionConfigControl *config_control, void *data);
-static void config_control_destroy_callback (GtkObject *object, void *data);
-
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget *button, void *data);
-static void cal_prefs_dialog_end_of_day_changed (GtkWidget *button, void *data);
-static void cal_prefs_dialog_start_of_day_changed (GtkWidget *button, void *data);
-static void cal_prefs_dialog_hide_completed_tasks_toggled (GtkWidget *button, void *data);
-
-GtkWidget *cal_prefs_dialog_create_time_edit (void);
-
-
-/**
- * cal_prefs_dialog_new:
- *
- * Creates a new #CalPrefsDialog.
- *
- * Return value: a new #CalPrefsDialog.
- **/
-EvolutionConfigControl *
-cal_prefs_dialog_new (void)
-{
-	DialogData *dialog_data;
-	EvolutionConfigControl *config_control;
-
-	dialog_data = g_new0 (DialogData, 1);
-
-	/* Load the content widgets */
-
-	dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL, NULL);
-	if (!dialog_data->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		return NULL;
-	}
-
-	if (!get_widgets (dialog_data)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		return NULL;
-	}
-
-	init_widgets (dialog_data);
-	show_config (dialog_data);
-
-	gtk_widget_ref (dialog_data->page);
-	gtk_container_remove (GTK_CONTAINER (dialog_data->page->parent), dialog_data->page);
-	config_control = evolution_config_control_new (dialog_data->page);
-	gtk_widget_unref (dialog_data->page);
-
-	g_signal_connect((config_control), "apply",
-			    G_CALLBACK (config_control_apply_callback), dialog_data);
-	g_signal_connect((config_control), "destroy",
-			    G_CALLBACK (config_control_destroy_callback), dialog_data);
-
-	setup_changes (dialog_data, config_control);
-
-	return config_control;
-}
-
-static void
-widget_changed_callback (GtkWidget *widget,
-			 void *data)
-{
-	EvolutionConfigControl *config_control;
-
-	config_control = EVOLUTION_CONFIG_CONTROL (data);
-
-	evolution_config_control_changed (config_control);
-}
-
-/* ^*&%!!#! GnomeColorPicker.  */
-static void
-color_set_callback (GnomeColorPicker *cp,
-		    guint r,
-		    guint g,
-		    guint b,
-		    guint a,
-		    void *data)
-{
-	EvolutionConfigControl *config_control;
-
-	config_control = EVOLUTION_CONFIG_CONTROL (data);
-
-	evolution_config_control_changed (config_control);
-}
-
-static void
-connect_changed (GtkWidget *widget,
-		 const char *signal_name,
-		 EvolutionConfigControl *config_control)
-{
-	g_signal_connect((widget), signal_name,
-			    G_CALLBACK (widget_changed_callback), config_control);
-}
-
-static void
-setup_changes (DialogData *dialog_data,
-	       EvolutionConfigControl *config_control)
-{
-	int i;
-
-	for (i = 0; i < 7; i ++)
-		connect_changed (dialog_data->working_days[i], "toggled", config_control);
-
-	connect_changed (dialog_data->timezone, "changed", config_control);
-
-	connect_changed (dialog_data->start_of_day, "changed", config_control);
-	connect_changed (dialog_data->end_of_day, "changed", config_control);
-
-	connect_changed (GTK_OPTION_MENU (dialog_data->week_start_day)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->use_12_hour, "toggled", config_control);
-
-	connect_changed (GTK_OPTION_MENU (dialog_data->time_divisions)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->show_end_times, "toggled", config_control);
-	connect_changed (dialog_data->compress_weekend, "toggled", config_control);
-	connect_changed (dialog_data->dnav_show_week_no, "toggled", config_control);
-
-	connect_changed (dialog_data->tasks_hide_completed_checkbutton, "toggled", config_control);
-	connect_changed (dialog_data->tasks_hide_completed_spinbutton, "changed", config_control);
-	connect_changed (GTK_OPTION_MENU (dialog_data->tasks_hide_completed_optionmenu)->menu, "selection_done", config_control);
-
-	connect_changed (dialog_data->confirm_delete, "toggled", config_control);
-	connect_changed (dialog_data->default_reminder, "toggled", config_control);
-	connect_changed (dialog_data->default_reminder_interval, "changed", config_control);
-	connect_changed (GTK_OPTION_MENU (dialog_data->default_reminder_units)->menu, "selection_done", config_control);
-
-	/* These use GnomeColorPicker so we have to use a different signal.  */
-	g_signal_connect((dialog_data->tasks_due_today_color), "color_set",
-			    G_CALLBACK (color_set_callback), config_control);
-	g_signal_connect((dialog_data->tasks_overdue_color), "color_set",
-			    G_CALLBACK (color_set_callback), config_control);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (DialogData *data)
-{
-#define GW(name) glade_xml_get_widget (data->xml, name)
-
-	data->page = GW ("toplevel-notebook");
-
-	/* The indices must be 0 (Sun) to 6 (Sat). */
-	data->working_days[0] = GW ("sun_button");
-	data->working_days[1] = GW ("mon_button");
-	data->working_days[2] = GW ("tue_button");
-	data->working_days[3] = GW ("wed_button");
-	data->working_days[4] = GW ("thu_button");
-	data->working_days[5] = GW ("fri_button");
-	data->working_days[6] = GW ("sat_button");
-
-	data->timezone = GW ("timezone");
-	data->week_start_day = GW ("first_day_of_week");
-	data->start_of_day = GW ("start_of_day");
-	gtk_widget_show (data->start_of_day);
-	data->end_of_day = GW ("end_of_day");
-	gtk_widget_show (data->end_of_day);
-	data->use_12_hour = GW ("use_12_hour");
-	data->use_24_hour = GW ("use_24_hour");
-	data->time_divisions = GW ("time_divisions");
-	data->show_end_times = GW ("show_end_times");
-	data->compress_weekend = GW ("compress_weekend");
-	data->dnav_show_week_no = GW ("dnav_show_week_no");
-
-	data->tasks_due_today_color = GW ("tasks_due_today_color");
-	data->tasks_overdue_color = GW ("tasks_overdue_color");
-
-	data->tasks_hide_completed_checkbutton = GW ("tasks-hide-completed-checkbutton");
-	data->tasks_hide_completed_spinbutton = GW ("tasks-hide-completed-spinbutton");
-	data->tasks_hide_completed_optionmenu = GW ("tasks-hide-completed-optionmenu");
-
-	data->confirm_delete = GW ("confirm-delete");
-	data->default_reminder = GW ("default-reminder");
-	data->default_reminder_interval = GW ("default-reminder-interval");
-	data->default_reminder_units = GW ("default-reminder-units");
-
-#undef GW
-
-	return (data->page
-		&& data->timezone
-		&& data->working_days[0]
-		&& data->working_days[1]
-		&& data->working_days[2]
-		&& data->working_days[3]
-		&& data->working_days[4]
-		&& data->working_days[5]
-		&& data->working_days[6]
-		&& data->week_start_day
-		&& data->start_of_day
-		&& data->end_of_day
-		&& data->use_12_hour
-		&& data->use_24_hour
-		&& data->time_divisions
-		&& data->show_end_times
-		&& data->compress_weekend
-		&& data->dnav_show_week_no
-		&& data->tasks_due_today_color
-		&& data->tasks_overdue_color
-		&& data->tasks_hide_completed_checkbutton
-		&& data->tasks_hide_completed_spinbutton
-		&& data->tasks_hide_completed_optionmenu
-		&& data->confirm_delete
-		&& data->default_reminder
-		&& data->default_reminder_interval
-		&& data->default_reminder_units);
-}
-
-
-static void
-config_control_destroy_callback (GtkObject *object,
-				 void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-
-	g_object_unref (dialog_data->xml);
-	
-	g_free (dialog_data);
-}
-
-
-static void
-config_control_apply_callback (EvolutionConfigControl *control,
-			       void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-
-	update_config (dialog_data);
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dedit), calendar_config_get_24_hour_format ());
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-init_widgets (DialogData *dialog_data)
-{
-	g_signal_connect((dialog_data->use_24_hour), "toggled",
-			    G_CALLBACK (cal_prefs_dialog_use_24_hour_toggled),
-			    dialog_data);
-
-	g_signal_connect((dialog_data->start_of_day), "changed",
-			    G_CALLBACK (cal_prefs_dialog_start_of_day_changed),
-			    dialog_data);
-
-	g_signal_connect((dialog_data->end_of_day), "changed",
-			    G_CALLBACK (cal_prefs_dialog_end_of_day_changed),
-			    dialog_data);
-
-	g_signal_connect((dialog_data->tasks_hide_completed_checkbutton),
-			    "toggled",
-			    G_CALLBACK (cal_prefs_dialog_hide_completed_tasks_toggled),
-			    dialog_data);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled (GtkWidget	*button,
-				      void *data)
-{
-	DialogData *dialog_data;
-	gboolean use_24_hour;
-
-	dialog_data = (DialogData *) data;
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->start_of_day), use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data->end_of_day), use_24_hour);
-}
-
-static void
-cal_prefs_dialog_start_of_day_changed (GtkWidget *button, void *data)
-{
-	DialogData *dialog_data;
-	EDateEdit *start, *end;
-	int start_hour, start_minute, end_hour, end_minute;
-	
-	dialog_data = (DialogData *) data;
-
-	start = E_DATE_EDIT (dialog_data->start_of_day);
-	end = E_DATE_EDIT (dialog_data->end_of_day);
-	
-	e_date_edit_get_time_of_day (start, &start_hour, &start_minute);
-	e_date_edit_get_time_of_day (end, &end_hour, &end_minute);
-
-	if ((start_hour > end_hour) 
-	    || (start_hour == end_hour && start_minute > end_minute)) {
-
-		if (start_hour < 23)
-			e_date_edit_set_time_of_day (end, start_hour + 1, start_minute);
-		else
-			e_date_edit_set_time_of_day (end, 23, 59);
-	}
-}
-
-static void
-cal_prefs_dialog_end_of_day_changed (GtkWidget *button, void *data)
-{
-	DialogData *dialog_data;
-	EDateEdit *start, *end;
-	int start_hour, start_minute, end_hour, end_minute;
-	
-	dialog_data = (DialogData *) data;
-
-	start = E_DATE_EDIT (dialog_data->start_of_day);
-	end = E_DATE_EDIT (dialog_data->end_of_day);
-	
-	e_date_edit_get_time_of_day (start, &start_hour, &start_minute);
-	e_date_edit_get_time_of_day (end, &end_hour, &end_minute);
-
-	if ((end_hour < start_hour) 
-	    || (end_hour == start_hour && end_minute < start_minute)) {
-		if (end_hour < 1)
-			e_date_edit_set_time_of_day (start, 0, 0);
-		else
-			e_date_edit_set_time_of_day (start, end_hour - 1, end_minute);
-	}
-}
-
-static void
-cal_prefs_dialog_hide_completed_tasks_toggled	(GtkWidget *button,
-						 void *data)
-{
-	DialogData *dialog_data;
-	gboolean hide_completed_tasks;
-
-	dialog_data = (DialogData *) data;
-
-	hide_completed_tasks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data->tasks_hide_completed_checkbutton));
-
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton, hide_completed_tasks);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu, hide_completed_tasks);
-}
-
-/* Sets the color in a color picker from an X color spec */
-static void
-set_color_picker (GtkWidget *picker, const char *spec)
-{
-	GdkColor color;
-
-	g_assert (spec != NULL);
-
-	if (!gdk_color_parse (spec, &color)) {
-		color.red = color.green = color.blue = 0;
-		return;
-	}
-
-	gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker),
-				    color.red,
-				    color.green,
-				    color.blue,
-				    65535);
-}
-
-/* Shows the current task list settings in the dialog */
-static void
-show_task_list_config (DialogData *dialog_data)
-{
-	CalUnits units;
-	gboolean hide_completed_tasks;
-
-	set_color_picker (dialog_data->tasks_due_today_color, calendar_config_get_tasks_due_today_color ());
-	set_color_picker (dialog_data->tasks_overdue_color, calendar_config_get_tasks_overdue_color ());
-
-	/* Hide Completed Tasks. */
-	hide_completed_tasks = calendar_config_get_hide_completed_tasks ();
-	e_dialog_toggle_set (dialog_data->tasks_hide_completed_checkbutton,
-			     hide_completed_tasks);
-
-	/* Hide Completed Tasks Units. */
-	units = calendar_config_get_hide_completed_tasks_units ();
-	e_dialog_option_menu_set (dialog_data->tasks_hide_completed_optionmenu,
-				  units, hide_completed_units_map);
-
-	/* Hide Completed Tasks Value. */
-	e_dialog_spin_set (dialog_data->tasks_hide_completed_spinbutton,
-			   calendar_config_get_hide_completed_tasks_value ());
-
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_spinbutton,
-				  hide_completed_tasks);
-	gtk_widget_set_sensitive (dialog_data->tasks_hide_completed_optionmenu,
-				  hide_completed_tasks);
-}
-
-/* Shows the current config settings in the dialog. */
-static void
-show_config (DialogData *dialog_data)
-{
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-	char *zone_name;
-	icaltimezone *zone;
-	gboolean sensitive;
-
-	/* Timezone. */
-	zone_name = calendar_config_get_timezone ();
-	zone = icaltimezone_get_builtin_timezone (zone_name);
-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone),
-				       zone);
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		e_dialog_toggle_set (dialog_data->working_days[day], (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (dialog_data->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		e_dialog_toggle_set (dialog_data->use_24_hour, TRUE);
-	else
-		e_dialog_toggle_set (dialog_data->use_12_hour, TRUE);
-
-	sensitive = calendar_config_locale_supports_12_hour_format ();
-	gtk_widget_set_sensitive (dialog_data->use_12_hour, sensitive);
-	gtk_widget_set_sensitive (dialog_data->use_24_hour, sensitive);
-
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (dialog_data->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	e_dialog_toggle_set (dialog_data->show_end_times, calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	e_dialog_toggle_set (dialog_data->compress_weekend, calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	e_dialog_toggle_set (dialog_data->dnav_show_week_no, calendar_config_get_dnav_show_week_no ());
-
-	/* Task list */
-
-	show_task_list_config (dialog_data);
-
-	/* Other page */
-
-	e_dialog_toggle_set (dialog_data->confirm_delete, calendar_config_get_confirm_delete ());
-
-	e_dialog_toggle_set (dialog_data->default_reminder,
-			     calendar_config_get_use_default_reminder ());
-	e_dialog_spin_set (dialog_data->default_reminder_interval,
-			   calendar_config_get_default_reminder_interval ());
-	e_dialog_option_menu_set (dialog_data->default_reminder_units,
-				  calendar_config_get_default_reminder_units (),
-				  default_reminder_units_map);
-}
-
-/* Returns a pointer to a static string with an X color spec for the current
- * value of a color picker.
- */
-static const char *
-spec_from_picker (GtkWidget *picker)
-{
-	static char spec[8];
-	guint8 r, g, b;
-
-	gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL);
-	g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b);
-
-	return spec;
-}
-
-/* Updates the task list config values from the settings in the dialog */
-static void
-update_task_list_config (DialogData *dialog_data)
-{
-	calendar_config_set_tasks_due_today_color (spec_from_picker (dialog_data->tasks_due_today_color));
-	calendar_config_set_tasks_overdue_color (spec_from_picker (dialog_data->tasks_overdue_color));
-
-	calendar_config_set_hide_completed_tasks (e_dialog_toggle_get (dialog_data->tasks_hide_completed_checkbutton));
-	calendar_config_set_hide_completed_tasks_units (e_dialog_option_menu_get (dialog_data->tasks_hide_completed_optionmenu, hide_completed_units_map));
-	calendar_config_set_hide_completed_tasks_value (e_dialog_spin_get_int (dialog_data->tasks_hide_completed_spinbutton));
-}
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-update_config (DialogData *dialog_data)
-{
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-	icaltimezone *zone;
-
-	/* Timezone. */
-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (dialog_data->timezone));
-	calendar_config_set_timezone (icaltimezone_get_location (zone));
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (e_dialog_toggle_get (dialog_data->working_days[day]))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	calendar_config_set_working_days (working_days);
-
-	/* Week Start Day. */
-	week_start_day = e_dialog_option_menu_get (dialog_data->week_start_day, week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data->start_of_day), &hour, &minute);
-	calendar_config_set_day_start_hour (hour);
-	calendar_config_set_day_start_minute (minute);
-
-	/* End of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data->end_of_day), &hour, &minute);
-	calendar_config_set_day_end_hour (hour);
-	calendar_config_set_day_end_minute (minute);
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (e_dialog_toggle_get (dialog_data->use_24_hour));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (dialog_data->time_divisions, time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (e_dialog_toggle_get (dialog_data->show_end_times));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (e_dialog_toggle_get (dialog_data->compress_weekend));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (e_dialog_toggle_get (dialog_data->dnav_show_week_no));
-
-	/* Task list */
-	update_task_list_config (dialog_data);
-
-	/* Other page */
-
-	calendar_config_set_confirm_delete (e_dialog_toggle_get (dialog_data->confirm_delete));
-
-	calendar_config_set_use_default_reminder (e_dialog_toggle_get (dialog_data->default_reminder));
-
-	calendar_config_set_default_reminder_interval (
-		e_dialog_spin_get_int (dialog_data->default_reminder_interval));
-
-	calendar_config_set_default_reminder_units (
-		e_dialog_option_menu_get (dialog_data->default_reminder_units, default_reminder_units_map));
-}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
deleted file mode 100644
index d566368611..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,1319 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="cal-prefs-dialog">
-  <property name="title" translatable="yes">Calendar and Tasks Settings</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="toplevel-notebook">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox10">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame12">
-		  <property name="border_width">3</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table5">
-		      <property name="border_width">6</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
-		      <property name="n_columns">3</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label22">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Time _zone:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timezone</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label20">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Time format:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox10">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">True</property>
-			  <property name="spacing">4</property>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment2">
-			      <property name="visible">True</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">3.35276e-08</property>
-			      <property name="yscale">1</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="use_12_hour">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_12 hour (AM/PM)</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">