2018 files changed, 61 insertions, 1778420 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index cdaa00a91e..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,29 +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
-xml-i18n-*
-xlibtool
-xltmain.sh
-intltool-*
-*.pc
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 9c92e1e01f..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,514 +0,0 @@
-2004-02-18  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Require ORBit 2.9.8 or newer
-
-2004-02-12  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (%-$(BASE_VERSION).pc): cp the unversioned file
-	rather than mv'ing it so it doesn't get regenerated at install
-	time.
-
-2004-02-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in (IMPORTERS_*): Added libebook-1.0.  Added back
-	mail/importers/Makefile.am.
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: Add addressbook/importers to AC_OUTPUT
-
-2004-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version, requirements
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* tools/killev.c: Use the AlarmNotify_Factory for --force-shutdown
-
-	Fixes #54084
-
-2004-02-09  Rodney Dawes  <dobey@ximian.com>
-
-	* data/evolution.desktop.in.in: Updated BugzillaOtherBinaries tag
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Revert previous change.
-
-2004-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Update to require glib-2.0 >= 2.3.2 (needed for
-	some GValue usage).
-
-2004-01-28  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Disable the possibility of using OpenSSL until someone
-	decides it is worthy and ends up maintaining the code, though porting
-	to GNUTLS would probably be a better option, if that happens
-
-2004-01-26  David Trowbridge <trowbrds@cs.colorado.edu>
- 
- 	* configure.in: add facilities for installing a help dir
-	
-2004-01-26  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump requirements, version
-
-2004-01-24  Sanlig Badral  <badral@openmn.org>
-
-	* configure.in: added "mn" to ALL_LINGUAS.
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* data/Makefile.am: Add rule to substitute BASE_VERSION in keys
-	* data/evolution.keys.in: Removed this file from CVS
-	* data/evolution.keys.in.in: Update to use BASE_VERSION and the
-	new addressbook vcard control that replaces the MiniCard control
-
-2004-01-22  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Don't require $LIBBONOBOUI_REQUIRED version of
-	libbonobo
-
-2004-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: added mail/default/Makefile and
-	mail/default/C/Makefile.
-
-2004-01-13  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Check for libsoup separately
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: bump version and requirements
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add soup as a calendar dep
-
-2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
-
-	* configure.in: enable NNTP support by default
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: compile flags for the test component and a
-	conditional compile
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: dont kill the quote
-
-2004-01-11  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: add enable option to build test component
-
-2004-01-08  Rodney Dawes  <dobey@ximian.com>
-
-	* configure.in: Add BONOBOUI_REQUIRED variable and depend on
-	libbonoboui >= 2.4.3, add an AC_SUBST() for EDS_REQUIRED also
-	* evolution-shell.pc.in: Require the same version of bonoboui that we
-	do in configure.in
-
-2004-01-08 Sivaiah Nallagatla <snallagatla@novell.com>
-
-	* configure.in : add camel/providers/groupwise/Makefile to
-	AC_OUTPUT section
-
-2004-01-08  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-	* configure.in: Added "hr" (Croatian) to ALL_LINGUAS.
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* tools/Makefile.am: Add e-util libs
-
-	* configure.in: try compiling with sys/types for freebsd
-
-	(Joe Marcus Clarke <marcus@freebsd.org>)	
-
-2004-01-05  Laurent Dhima  <laurenti@alblinux.net>
-
-	* configure.in: Added "sq" to ALL_LINGUAS.
-
-2004-01-01  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* configure.in: Added "fa" (Persian) to ALL_LINGUAS.
-
-2003-12-30 Nicel KM <mnicel@novell.com>
-
-	* configure.in: removed default_user directory references from AC_OUTPUT
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: default_user is gone
-
-	* Makefile.am: ditto
-
-2003-12-29  JP Rosevear <jpr@ximian.com>
-
-	* configure.in: bump version and gal, e-d-s and gtkhtml
-	requirements
-
-2003-12-22  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added camel/providers/groupwise to the build.
-
-2003-12-15  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (ACLOCAL_AMFLAGS): remove.
-
-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-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-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 8eb9e4c671..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,19 +0,0 @@
-Overall Maintainers:
-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 4391bc6672..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-changelogs =				\
-	ChangeLog			\
-	ChangeLog.pre-1-4
-
-%-$(BASE_VERSION).pc: %.pc
-	 cp $< $@
-
-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			\
-	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
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/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 b9bd0c8da8..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,3824 +0,0 @@
-2004-02-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	Fixes #45308 and duplicates.
-
-	* gui/widgets/e-addressbook-model.c (eab_model_set_property): Store
-	the IDs of book signals connected to, so we can disconnect from them
-	later.
-
-2004-02-18  Hao Sheng  <hao.sheng@sun.com>
-
-	[ fixes bug #52765 ]
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_confirm_delete): make delete dialog support
-	ESC press.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add image_set slot.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_image_changed_cb): set image_set = TRUE.
-	(e_contact_list_editor_init): init image_set = FALSE
-	(extract_info): only set the LOGO attribute if image_set = TRUE.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add image_set slot.
-
-	* gui/contact-editor/e-contact-editor.c (extract_info): only set
-	the PHOTO attribute if image_set == TRUE.
-	(image_chooser_changed): new function, set image_set = TRUE and
-	call widget_changed.
-	(e_contact_editor_init): init image_set to FALSE.
-	(_address_arrow_pressed): quiet compiler.
-
-2004-02-17  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53620 ]
-	
-	* gui/merging/eab-contact-compare.c (eab_contact_compare_name): ""
-	is a valid (and common) value for elements of EContactName now.
-	it's semantically equivalent to NULL in the old ECard foo.
-
-2004-02-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_contacts): free up
-	the list returned by e_book_get_contacts.
-
-2004-01-12  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	Fix capitalization of Address Book usage in sentence form
-	* gui/component/ldap-config.glade: Use Address Book instead of
-	Addressbook in here (Patch from Aaron Weber <aaron@ximian.com>)
-
-2004-02-11  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb):
-	(fill_popup_menu_callback):
-	* gui/widgets/e-addressbook-view.c (init_collection):
-	* gui/widgets/eab-gui-util.c (eab_error_dialog):
-	* gui/widgets/eab-popup-control.c (eab_popup_control_contstruct):
-	Address Book, not Addressbook
-
-	Fixes #54166 and #54120
-
-2004-02-10  JP Rosevear <jpr@ximian.com>
-
-	* Makefile.am: build importers dir
-
-2004-02-08  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): Initialize the
-	personal_source to NULL
-
-	Fixes #54015
-
-2004-02-08  Sivaiah Nallagatla <snallagatla@novell.com>
-                                                                                
-        * gui/widgets/e-addressbook-view.c (delete) : pass contact
-        as an argument instead of contact id to e_book_async_remove_contact
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): don't
-	bother using a function-wide variable to store the personal
-	source.  also, use g_build_filename properly (because fejj is a
-	whiner.)
-	(migrate_local_folders): same (wrt fejj whining).
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_new_control): Hide the
-	border on the notebook also
-	* gui/widgets/e-addressbook-view.c (eab_view_new): Don't pack another
-	scrolled window inside of a scrolled window, just pack the contact
-	display inside the paned, since it already has a scrolled window
-
-2004-02-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Use "Address Book" instead of
-	"folder" or "Addressbook" for the "Address Book Sources..." and
-	copy/move contact menu items
-
-	Fixes #53654
-
-2004-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* importers/evolution-ldif-importer.c (getNextLDIFEntry): only set
-	the address if something in it's been filled in.
-	(resolve_list_card): build up a separate list representing the xml
-	formatted crud.
-	(process_item_fn): remove FIXME.
-	(factory_fn): use g_new0 since we test for NULL-ness later on.
-
-	* importers/evolution-vcard-importer.c (factory_fn): use g_new0
-	since we test for NULL-ness later on.
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-ldif-importer.c (importer_destroy_cb):
-	implement
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/evolution-vcard-importer.c (importer_destroy_cb):
-	implement
-	(load_file_fn): use g_file_get_contents to get a string we can
-	convert to a contact list with eab_contact_list_from_string 
-
-2004-02-06  JP Rosevear <jpr@ximian.com>
-
-	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
-	shlib importer info
-
-	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
-	ditto
-	
-	* importers/Makefile.am: build shlib addressbook importers
-
-	* importers/evolution-ldif-importer.c: First crack at resurrecting
-
-	* importers/evolution-vcard-importer.c: ditto
-	
-2004-02-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/eab-contact-display.c (on_url_requested): remove
-	some spew, and add an evo-icon: handler, for things in evolution's
-	imagedir.
-	(render_address): hack up the html.
-	(render_name_value): new function, just render a name/value/icon.
-	(render_attribute): split out most of this function into
-	render_name_value.  this just checks to see if the EContact
-	attribute has something in it before passing it along.
-	(render_contact_list): split this out from
-	eab_contact_display_render_normal.
-	(start_block): new function, insert a row of height 20 with a
-	header.
-	(end_block): new function, insert a row of height 20.
-	(render_contact): split this out from
-	eab_contact_display_render_normal, and prettify the contact
-	display.
-	(eab_contact_display_render_normal): call render_contact and
-	render_contact_list.
-	(eab_contact_display_new): create a scrolled window and add the
-	GtkHTML to it so we actually have scrollbars.
-
-2004-02-03  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): add
-	widgets/misc for e-activity-handler.h
-
-2004-02-03 Sivaiah Nallagatla <snallagatla@novell.com>
-
-        * gui/component/addressbook-config.c (dialog_to_source)
-        (source_to_dialog) : use gtk_spin_button_* apis to get and set
-        values for download limit spin button instead of gtk_entry
-        Fixes #53432
-
-2004-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_new): hook up
-	contact_changed/contact_removed signals.
-	(contact_changed): new function.  if the changed contact is the
-	one we're displaying, re-render it.
-	(contact_removed): new function.  if the removed contact is the
-	one we're displaying, clear the display.
-	(render_contact): set displayed_contact to the row.
-	(eab_view_init): init displayed_contact to -1.
-	(selection_changed): set displayed_contact to -1 when we clear the
-	display.
-	
-	* gui/widgets/e-addressbook-view.h (struct _EABView): add
-	"displayed_contact" so we can update the contact preview when it
-	changes.
-
-2004-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: enable d&d drop photos.
-
-	* gui/contact-editor/contact-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: abstract out
-	all the d&d image support (it's now in
-	widgets/misc/e-image-chooser.[ch]).
-
-	* gui/contact-list-editor/contact-list-editor.glade: use
-	eab_create_image_chooser_widget for the d&d'able image.
-
-	* gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
-	new function.
-
-	* gui/widgets/eab-gui-util.h: add prototype for
-	eab_create_image_chooser_widget.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/eab-gui-util.c (source_selection_changed_cb): Implement.
-	(eab_select_source): Implement. Public function that prompts user to
-	select a source from a list.
-	(eab_transfer_contacts): Enable and use eab_select_source () and
-	ESource, instead of old shell folder/URI stuff.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/ldap-config.glade: Changed "Finish" to "Apply" in
-	dialog finish page text.
-
-2004-01-29  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): Sync the
-	modified source list.
-
-	* gui/component/addressbook-component.c (delete_addressbook_cb): Sync
-	the modified source list.
-
-2004-01-29  Chris Toshok  <toshok@m198-139.dsl.rawbw.com>
-
-	* gui/component/addressbook-migrate.c (setup_progress_dialog): use
-	the MigrationContext struct.
-	(dialog_close): same.
-	(dialog_set_folder_name): same.
-	(dialog_set_progress): same.
-	(migrate_contacts): same, and pass it along to other functions.
-	(migrate_contact_folder_to_source): same.
-	(migrate_contact_folder): same.  also, add the old path/uid to the
-	folder_uid_map.
-	(migrate_local_folders): same.
-	(create_groups): use the MigrationContext struct.
-	(migrate_completion_folders): if it's a file uri, look up the old
-	path in our hash table for a uid to use.  otherwise use the old
-	behavior.
-	(migration_context_new): new function, initialize the
-	MigrationContext.
-	(migration_context_free): free up everything.
-	(addressbook_migrate): create the context, pass it to everything,
-	destroy the context, shine toshok's shoes, etc.
-
-2004-01-29  Radek Doulik  <rodo@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_temp_source): set
-	group to temporary source
-
-2004-01-28  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Get file_as instead of full_name.
-
-	* gui/compoent/select-names/e-select-names.etspec: Show the file_as
-	column instead of full_name.
-
-2004-01-27  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_property): Handle NULL name. Fixes
-	#53071.
-
-2004-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (dialog_to_source): set the
-	relative_uri of a local source to be its uid.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): remove the dest_group arg,
-	since we don't use it.
-	(migrate_contact_folder): set the relative uri of the source to be
-	its uid.
-	(PERSONAL_RELATIVE_URI): "Personal" -> "system".
-	(create_groups): don't actually make the directory hierarchy for
-	the personal folder here.  let e-d-s do that.  Also remove
-	OnThisComputer from the base uri.
-	(migrate_local_folders): track change to
-	migrate_contact_folder_to_source.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ Should fix #53361 and other migration problems/crashes ]
-	* gui/component/addressbook-migrate.c
-	(migrate_contact_folder_to_source): new function, takes most of
-	migrate_contact_folder's contents.  Fix some of the refcounting
-	problems though, by not unreffing dest_group, and using
-	e_group_add_source instead of e_source_set_group.
-	(migrate_contact_folder): convert to calling
-	migrate_contact_folder_to_source.
-	(create_groups): add an out parameter for *personal_source.
-	(migrate_local_folders): add personal_source as an arg, so we can
-	get the source that create_groups created/found.  Call
-	migrate_contact_folder_to_source for the personal_source.
-	(addressbook_migrate): pass personal_source to
-	migrate_local_folders.
-
-2004-01-26  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes #53238 ]
-	* util/eab-destination.c (nonempty): make this accept NULL's (and
-	return FALSE for them).
-	(eab_destination_is_empty): shorten some of the tests since
-	nonempty takes NULL now.
-	(eab_destination_get_address): only call
-	camel_internet_address_add if both name and email are non-empty.
-	otherwise call camel_address_decode and let camel try to deal with
-	it.
-	(eab_destination_xml_encode): call xmlEncodeEntitiesReentrant on
-	the strings before adding them to the xml, so people that enter
-	[<>&] won't end up with broken EABDestinations.
-
-2004-01-26  Radek Doulik  <rodo@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (selection_received): make sure
-	we pass \0 terminated string to eab_contact_list_from_string
-	[it may fix #51743]
-
-2004-01-25  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #51171 ]
-	* gui/widgets/eab-gui-util.c (eab_send_contact_list): get this
-	working.
-
-2004-01-24  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (e_select_names_init):
-	Select Contacts from Address Book, not Contents
-
-	Fixes #53263
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	oops.
-	(migrate_contact_folder): fix the unreffing.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	_("Personal"), not "Personal".
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders):
-	don't create/add the source here.  it's done in
-	migrate_contact_folder.
-
-2004-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (migrate_local_folders): use
-	e_folder_map_local_folders.
-	(find_addressbook_dirs): nuke.
-
-2004-01-24  JP Rosevear <jpr@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (init_collection): use
-	.evolution to store view info
-
-2004-01-23  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52571 ]
-	* util/eab-book-util.c (escape): ugh.  name fields that have \"
-	around the name break our queries, because it turns it into (for
-	instance): (contains "full_name" ""Toshok"").  so we need to turn
-	that into: (contains "full_name" "\"Toshok\"").
-	(eab_name_and_email_query): escape both the name and email, and
-	use an EBookQuery instead of passing the string to
-	e_book_async_get_contacts.  Looks like ross missed a couple of
-	spots.
-	(eab_nickname_query): same.
-
-	* gui/component/addressbook.c (free_load_source_data): new
-	function, free up the data and unref the source if there is one.
-	(load_source_auth_cb): call free_load_source_data instead of just
-	g_free'ing the struct.
-	(load_source_cb): same.
-	(default_book_cb): new function, we need this so we can fill in
-	the source for the default book.  get the source, then call
-	load_source_cb to continue processing as normal.
-	(addressbook_load_default_book): use default_book_cb instead of
-	load_source_cb.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #53184 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): handle
-	the fact that the xml 1.4 spits out contains unescaped ';'s in the
-	EMAIL attributes for mailing lists.
-
-2004-01-22  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52944 ]
-	* gui/component/addressbook-migrate.c (migrate_contacts): do some
-	massaging of contacts as we import them, to fix up the differences
-	between 1.4 and 1.5 vcards.
-
-2004-01-21  Nat Friedman <nat@novell.com>
-
-	* gui/contact-editor/contact-editor.glade: Added missing
-	entry-blog widget.
-
-2004-01-21  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-config.c (create_source_dir): Remove.
-	(dialog_to_source): Don't create source dir, backend takes care of
-	that now.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_peek_gconf_client): new function.
-
-	* gui/component/addressbook-component.h: add prototype for
-	addressbook_component_peek_gconf_client.
-
-	* gui/component/addressbook-migrate.c
-	(migrate_completion_folders): more gross hacking.  migrate the
-	completion settings.
-	(get_source_by_uri): function to search for an ESource given the
-	entire uri.  used for migrate_completion_folders.
-	(migrate_ldap_servers): get_string_value -> get_string_child.
-	same with get_integer_child.
-	(get_string_child): rename to make it apparent it's a child, not a
-	property.
-	(get_integer_child): same.
-	(addressbook_migrate): call migrate_completion_folders.
-
-2004-01-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): call
-	widget_changed here too, since we're changing the destination.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	[ fixes bug #52955 ]
-	* gui/merging/eab-contact-compare.c (use_common_book_cb): handle
-	the case properly where there are no query parts (p == 0).
-	Instead of passing "" to e_book_query_from_string, just set the
-	query to NULL.
-
-	* util/eab-book-util.c (eab_contact_list_to_string): we need to
-	put a blank line here, so \r\n\r\n, not just \r\n.
-
-2004-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (create_groups): deal with
-	the groups/sources already being there.  Essentially make this
-	function idempotent.
-	(addressbook_migrate): unconditionally call create_groups now.
-	move the version logic here from ipl_upgradeFromVersion, and
-	include more versions in the set of those we upgrade from.
-
-	* gui/component/addressbook-migrate.h: add major/minor/revision
-	args to addressbook_migrate.
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	remove the version logic from here.
-
-2004-01-20 Sivaiah Nallagatla   <snallagatla@novell.com>
-
-	* printing/e-contact-print.c (e_contact_print_response): do not 
-	try to unref when query is NULL
-
-2004 -01-20 Sivaiah Nallagatla  <snallagatla@novell.com>
-
-	* gui/contact-editor/e-contact-editor.c (edit_im_clicked) : do not call
-	gtk_tree_model_get when nothing in the list is selected 
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/select-names/e-select-names.etspec: Get name from
-	correct model column.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* printing/e-contact-print.c (complete_sequence): Only unref if we
-	have a query.
-
-2004-01-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(get_primary_source): Implement.
-	(load_primary_selection): Use get_primary_source ().
-	(impl_requestCreateItem): Use get_primary_source (), fixing a crash
-	when we're asked to create a new item and we don't have the controls.
-
-2004-01-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (load_source_auth_cb): Don't run
-	callback if the action was cancelled.
-	(load_source_cb): Ditto.
-	(addressbook_load_source): Return an ID for the load attempt.
-	(addressbook_load_source_cancel): Implement, allows cancelling a
-	load attempt.
-
-	* gui/contact-editor/e-contact-editor.c (new_target_cb): Clear the
-	values for in-progress load operation. Only unref new_book if it's
-	non-NULL.
-	(cancel_load): Implement. Cancels the load operation if one is in
-	progress.
-	(source_selected): Cancel any running load operation before starting
-	a new one. Set up in-progress values.
-	(e_contact_editor_init): Clear the in-progress values.
-	(e_contact_editor_dispose): Cancel load operation.
-	(e_contact_editor_set_property): If a new target book is set, cancel
-	any conflicting load operation in progress.
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Remove
-	debug output.
-	(get_paned_position): Ditto.
-
-2004-01-16  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c (set_prop): only set the menus and
-	command state if we actually are already displayed, otherwise wait
-	for activation
-
-2004-01-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (set_paned_position): Implement.
-	(get_paned_position): Implement.
-	(eab_view_new): Connect signal to get paned position changes.
-	Remove old hack.
-	(display_view): Set paned position properly.
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	revert dumb upgrade change
-
-2004-01-12  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook-component.c (impl_upgradeFromVersion):
-	migrate from 1.5.0 and 1.5.1 properly
-
-2004-01-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: de-bold ui elements
-
-2004-01-09  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (add_popup_menu_item): Take a
-	sensitivity flag per menu item, and fall back to stock icons.
-	(delete_addressbook_cb): Implement.
-	(fill_popup_menu_callback): Reorder items, remove "remove" item, set
-	sensitivity.
-
-	* gui/component/ldap-config.glade: "Edit LDAP Server" ->
-	"Addressbook Properties".
-
-2004-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-
-2004-01-09  Ross Burton  <ross@burtonini.com>
-
-	* gui/component/select-names/e-select-names-completion.c:
-	* gui/merging/eab-contact-compare.c:
-	* gui/widgets/e-addressbook-model.c:
-	* printing/e-contact-print.c:
-	Update for API changes to e-book-async.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* gui/contact-editor/contact-editor.glade:
-	* gui/contact-editor/e-contact-editor.c:
-	Add the video conferencing field.
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c:
-	* gui/component/select-names/select-names.glade: Make the ESelectNames
-	object be a HIG-compliant dialog, change "Folder" to be "Address Book",
-	and fix a mnemonic conflict with "Category" and "Cancel"
-
-	Fixes #51966
-
-2004-01-07  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/addressbook-component.c: Move the smime_component_init
-	call to the instance init callback, rather than the class init, and
-	wrap it in #if HAVE_NSS, so the addressbook works without smime support
-
-2004-01-07  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/Makefile.am: link in printer stuff
-
-	Fixes #51172
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-migrate.c (check_for_conflict): remove
-	spew.
-	(migrate_contacts): same.
-	(migrate_contact_folder): same.
-	(migrate_local_folders): same, and plug a leak.
-
-2004-01-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
-	add addressbook-migrate.[ch].
-
-	* gui/component/addressbook-component.c
-	(addressbook_component_init): remove the source creation from
-	here, it's in the migration code now.
-	(impl_upgradeFromVersion): new function, call the
-	addressbook-migration stuff.
-	(addressbook_component_class_init): fill in
-	epv->upgradeFromVersion, and call smime_component_init.
-	(addressbook_component_peek_base_directory): new function.
-	(addressbook_component_peek_source_list): same.
-
-	* gui/component/addressbook-component.h: add prototypes for
-	_peek_base_directory and _peek_source_list.
-
-	* gui/component/addressbook-migrate.[ch]: add migration code to
-	convert stuff from 1.x over to 1.5/2.0.
-
-2004-01-06  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c: Apply
-	patch from Roozbeh Pournader to update countries list
-
-	Fixes #48151
-
-2004-01-06  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_info_cleanup): disconnect from selection-done signal
-
-2004-01-05  JP Rosevear <jpr@ximian.com>
-
-	* gui/component/addressbook.c
-	(addressbook_show_load_error_dialog): these line breaks in the
-	error messages should actually be spaces
-
-	Fixes #51732
-	
-2003-12-19  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook-component.c (find_first_source): Impl.
-	from calendar.
-	(save_primary_selection): Implement, similar to calendar.
-	(load_primary_selection): Implement, similar to calendar.
-	(primary_source_selection_changed_callback): Save selection.
-	(impl_createControls): Load selection.
-
-2003-12-18  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (widget_changed):
-	editable -> target_editable
-	(e_contact_editor_get_property): Same.
-	(_email_arrow_pressed): Same.
-	(enable_writable_fields): Same.
-	(set_editable): Same.
-	(contact_added_cb): Make sure source book is editable before trying
-	to remove contact from there.
-	(e_contact_editor_init): Set up source/target editability.
-	(command_state_changed): Allow save only if target editable. Allow
-	delete only if source editable.
-	(e_contact_editor_set_property): Set editability flags for
-	source/target.
-
-	* gui/contact-editor/e-contact-editor.h: Add source_editable,
-	target_editable flags in place of old editable flag.
-
-2003-12-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (eab_view_class_init): install
-	the "source" property.
-	(eab_view_init): init eav->source to NULL.
-	(eab_view_dispose): disconnect the ecml_changed_id and unref
-	source.
-	(eab_view_new): create the search bar here.
-	(view_preview): c&p the mailer's code mostly for this - this is
-	the toggle listener for the Preview Pane menuitem.
-	(setup_menus): add a listener for the ContactsViewPreview toggle.
-	(eab_view_set_property): sensitize the search bar based on whether
-	or not we have a book set.  This makes it so you can't search
-	until the book is loaded.  Also add handling for the "source"
-	attribute and print a warning when it's set multiple times
-	(something that's not supported at the moment.)
-	(eab_view_get_property): add "source" case.
-	(search_activated, query_changed, compare_subitems, make_subitems,
-	ecml_changed, get_master_list, connect_master_list_changed): move
-	this here from addressbook.c
-	(eab_view_show_contact_preview): implement - just show or hide the
-	scrolled window.
-	(eab_view_setup_menus): call e_search_bar_set_ui_component here,
-	kind of a hack.
-
-	* gui/widgets/e-addressbook-view.h: make this inherit from GtkVBox
-	instead of GtkEventBox since we'll be packing children.  Add a
-	prototype for eab_view_show_contact_preview.
-
-	* gui/component/addressbook.c (get_current_view): return the
-	EABView associated with the active notebook page.
-	(save_contact_cb): use the current view.
-	(view_contact_cb): same.
-	(search_cb): same.
-	(delete_contact_cb): same.
-	(print_cb): same.
-	(print_preview_cb): same.
-	(stop_loading_cb): same.
-	(cut_contacts_cb): same.
-	(copy_contacts_cb): same.
-	(paste_contacts_cb): same.
-	(select_all_contacts_cb): same.
-	(send_contact_cb): same.
-	(send_contact_to_cb): same.
-	(copy_contact_to_cb): same.
-	(move_contact_to_cb): same.
-	(update_command_state): same.
-	(change_view_type): nuke, nothing uses this.
-	(control_activate): use the current view.
-	(control_activate_cb): same.
-	(source_list_changed_cb): new function, remove the notebook pages
-	(and destroy the EABView's) for sources that no longer exist.
-	(addressbook_view_clear): dispose of the uid_to_view hash.
-	(book_open_cb): store the ESource on the EABView too.  this
-	function now takes a struct containing both EABView and ESource
-	since we can't store either in the AddressbookView.
-	(set_prop): if we have a view already for this uid, bring it up.
-	otherwise create a new one and start the book loading.
-	(addressbook_search_activated): nuked - this is being moved to
-	e-addressbook-view.
-	(addressbook_query_changed): same.
-	(compare_subitems, make_subitems, ecml_changed,
-	connect_master_list_changed): same.
-	(addressbook_new_control): simplify things a bunch.  create a
-	notebook to store the views in.  the search/vbox stuff is gone.
-	use e_source_list_new_for_gconf_default, and handle the source
-	list's "changed" signal.
-	
-2003-12-17  Rodney Dawes  <dobey@ximian.com>
-
-	* gui/component/autocompletion-config.c:
-	(autocompletion_config_control_new): Embed Tree in GtkScrolledWindow
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (contact_added_cb): Update
-	the contact's UID after normal add.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_show_load_error_dialog):
-	Make a public function that shows an error dialog, which can be used
-	when a source fails to load.
-	(book_open_cb): Call addressbook_show_load_error_dialog () on error.
-	(set_prop): Don't reuse the book when loading a new source. This was
-	confusing the contact-editor, which gets the book passed in.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	Make "source_book" and "target_book" distinct properties.
-	(new_target_cb): Implement.
-	(source_selected): Implement.
-	(contact_moved_cb): Implement.
-	(contact_added_cb): Handle the case where source_book != target_book as
-	a move - if the add was successful, remove contact from source book.
-	(save_contact): Handle case where source_book != target_book.
-	(delete_cb): "book" renamed to "source_book".
-	(e_contact_editor_init): Set up source_selected signal.
-	(e_contact_editor_dispose): Dispose of both source and target books.
-	(e_contact_editor_new): "book" renamed to "source_book".
-	(e_contact_editor_set_property): If a source book is set, and we don't
-	have a target book, make target_book == source_book. Allow setting
-	target book, and base editability on that. If we're editing an existing
-	contact, treat book change as a change, and update command state.
-	(e_contact_editor_get_property): Allow getting target book.
-	(set_source_field): Indicate the selected book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (set_source_field): Implement.
-	Makes the source menu reflect the source for the current book.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(e_contact_editor_create_source_option_menu): Implement. Creates
-	source selection option menu.
-
-	* gui/contact-editor/contact-editor.glade: Add source selection custom
-	widget.
-
-2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Disable cell editing.
-
-2003-12-15  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (address_to_text): Implement.
-	(text_to_address): Implement, using EAddressWestern.
-	(address_text_changed): Adapt to EContactAddress.
-	(full_addr_clicked): Ditto. Fix field IDs.
-	(e_contact_editor_init): Init address_choice.
-	(_email_arrow_pressed): Fix field IDs.
-	(_address_arrow_pressed): Adapt to EContactAddress and fix field IDs.
-	(find_address_mailing): Leave out for now. Addresses don't have flags
-	anymore...
-	(set_fields): Adapt to EContactAddress and fix field IDs. Make sure
-	changes to other widgets don't make us go back to the first listed
-	address.
-	(set_address_field): Adapt to EContactAddress and fix field IDs.
-	(enable_writable_fields): Ditto.
-	(fill_in_info): Disable find_address_mailing () for now.
-
-2003-12-10  Hans Petter Jansson  <hpj@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): Make "address" a boxed type.
-	(e_contact_editor_address_init): Set address to NULL.
-	(e_contact_editor_address_dispose): Free address.
-	(e_contact_editor_address_new): Take an EContactAddress.
-	(e_contact_editor_address_set_property): Re-implement setting the
-	address property.
-	(e_contact_editor_address_get_property): Ditto for getting.
-	(fill_in_info): Enable, use EContactAddress fields.
-	(extract_info): Ditto.
-
-	* gui/contact-editor/e-contact-editor-address.h:
-	Re-enable the address field, as EContactAddress.
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	free email list properly
-
-2003-12-09  JP Rosevear <jpr@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	free the list, not unref it, and free the elements
-
-	Fixes #51976
-	
-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-04  Christian Hammond  <chipx86@gnupdate.org>
-
-	* addressbook/gui/contact-editor/e-contact-editor-im.[ch],
-	  addressbook/gui/contact-editor/im.glade: Added a dialog for
-	  adding a new IM account.
-	* addressbook/gui/contact-editor/Makefile.am: Added the previously
-	  mentioned files, and depend on camel for necessary MIME parsing.
-
-	* addressbook/gui/contact-editor/contact-editor.[ch],
-	  addressbook/gui/contact-editor/contact-editor.glade: Add and implement
-	  the Instant Messaging tab.
-
-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 0c88960b89..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	util printing gui importers $(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 594beaac72..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 847efaf29c..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,15 +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
-*.schemas
-\ No newline at end of file
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 f9cf8b78fa..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,111 +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		\
-	addressbook-migrate.c		\
-	addressbook-migrate.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/printing/libecontactprint.la			\
-	$(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 9468fbaf87..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,547 +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-migrate.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>
-
-#if HAVE_NSS
-#include "smime/gui/component.h"
-#endif
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _AddressbookComponentPrivate {
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-	GtkWidget *source_selector;
-	char *base_directory;
-
-	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 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
-save_primary_selection (AddressbookComponent *addressbook_component)
-{
-	AddressbookComponentPrivate *priv;
-	ESource *source;
-
-	priv = addressbook_component->priv;
-	
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
-	if (!source)
-		return;
-
-	/* Save the selection for next time we start up */
-	gconf_client_set_string (priv->gconf_client,
-				 "/apps/evolution/addressbook/display/primary_addressbook",
-				 e_source_peek_uid (source), NULL);
-}
-
-static ESource *
-get_primary_source (AddressbookComponent *addressbook_component)
-{
-	AddressbookComponentPrivate *priv;
-	ESource *source;
-	char *uid;
-
-	priv = addressbook_component->priv;
-
-	uid = gconf_client_get_string (priv->gconf_client,
-				       "/apps/evolution/addressbook/display/primary_addressbook",
-				       NULL);
-	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
-		g_free (uid);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = find_first_source (priv->source_list);
-	}
-
-	return source;
-}
-
-static void
-load_primary_selection (AddressbookComponent *addressbook_component)
-{
-	AddressbookComponentPrivate *priv;
-	ESource *source;
-	char *uid;
-
-	priv = addressbook_component->priv;
-
-	source = get_primary_source (addressbook_component);
-	if (source)
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
-}
-
-/* Folder popup menu 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 */
-		if (g_file_test (pixmap, G_FILE_TEST_EXISTS))
-			image = gtk_image_new_from_file (pixmap);
-		else
-			image = gtk_image_new_from_stock (pixmap, GTK_ICON_SIZE_MENU);
-
-		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
-delete_addressbook_cb (GtkWidget *widget, AddressbookComponent *comp)
-{
-	ESource *selected_source;
-	AddressbookComponentPrivate *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,
-		_("Address book '%s' will be removed. Are you sure you want to continue?"),
-		e_source_peek_name (selected_source));
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-	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);
-
-		e_source_list_sync (priv->source_list, NULL);
-
-		/* FIXME: Remove local data */
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-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);
-}
-
-/* Callbacks.  */
-
-static void
-primary_source_selection_changed_callback (ESourceSelector *selector,
-					   BonoboControl *view_control)
-{
-	load_uri_for_selection (selector, view_control);
-	save_primary_selection (addressbook_component_peek ());
-}
-
-static void
-fill_popup_menu_callback (ESourceSelector *selector, GtkMenu *menu, AddressbookComponent *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 Address Book"), NULL, G_CALLBACK (new_addressbook_cb), comp, TRUE);
-	add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_addressbook_cb), comp, sensitive);
-	add_popup_menu_item (menu, _("Properties..."), NULL, G_CALLBACK (edit_addressbook_cb), comp, sensitive);
-}
-
-/* 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_primary_selection (addressbook_component);
-	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 = get_primary_source (addressbook_component);
-	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);
-}
-
-static CORBA_boolean
-impl_upgradeFromVersion (PortableServer_Servant servant, short major, short minor, short revision, CORBA_Environment *ev)
-{
-	return addressbook_migrate (addressbook_component_peek (), major, minor, revision);
-}
-
-/* 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;
-	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-
-	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;
-
-	priv = g_new0 (AddressbookComponentPrivate, 1);
-
-	/* EPFIXME: Should use a custom one instead? */
-	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 ();
-	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
-
-	component->priv = priv;
-
-#if HAVE_NSS
-	smime_component_init ();
-#endif
-}
-
-
-/* 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;
-}
-
-GConfClient*
-addressbook_component_peek_gconf_client (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->gconf_client;
-}
-
-const char *
-addressbook_component_peek_base_directory (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->base_directory;
-}
-
-ESourceList *
-addressbook_component_peek_source_list (AddressbookComponent *component)
-{
-	g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL);
-
-	return component->priv->source_list;
-}
-
-
-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 76884b0bb8..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,65 +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"
-#include <libedataserver/e-source-list.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);
-
-GConfClient       *addressbook_component_peek_gconf_client     (AddressbookComponent *component);
-const char        *addressbook_component_peek_base_directory   (AddressbookComponent *component);
-EActivityHandler  *addressbook_component_peek_activity_handler (AddressbookComponent *component);
-ESourceList       *addressbook_component_peek_source_list      (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 eaf0093c77..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,1421 +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 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)));
-		str = g_strdup_printf ("%d", gtk_spin_button_get_value_as_int (GTK_ENTRY (dialog->limit_spinbutton)));
-		e_source_set_property (source, "limit", str);
-		g_free (str);
-		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_uid (source));
-	}
-
-	if (!temporary) {
-		if (!e_source_peek_group (source))
-			e_source_group_add_source (dialog->source_group, source, -1);
-
-		e_source_list_sync (addressbook_component_peek_source_list (
-			addressbook_component_peek ()), NULL);
-	}
-}
-
-static ESource *
-dialog_to_temp_source (AddressbookSourceDialog *dialog)
-{
-	ESource *source;
-
-	source = e_source_new ("", "");
-	e_source_set_group (source, dialog->source_group);
-	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_spin_button_set_value ( GTK_SPIN_BUTTON (dialog->limit_spinbutton),
-				    g_strtod ( source && e_source_get_property (source, "limit") ?
-					       e_source_get_property (source, "limit") : "100", NULL));
-	
-	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-migrate.c b/addressbook/gui/component/addressbook-migrate.c
deleted file mode 100644
index 4076e04de0..0000000000
--- a/addressbook/gui/component/addressbook-migrate.c
+++ /dev/null
@@ -1,810 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004, 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.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
-#include <glib.h>
-#include <string.h>
-#include "addressbook-migrate.h"
-#include <libebook/e-book-async.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
-#include <e-util/e-folder-map.h>
-
-typedef struct {
-	/* this hash table maps old folder uris to new uids.  It's
-	   build in migrate_contact_folder and it's used in
-	   migrate_completion_folders. */
-	GHashTable *folder_uid_map;
-
-	ESourceList *source_list;
-
-	AddressbookComponent *component;
-
-	GtkWidget *window;
-	GtkLabel *label;
-	GtkProgressBar *progress;
-} MigrationContext;
-
-static void
-setup_progress_dialog (MigrationContext *context)
-{
-	GtkWidget *vbox, *hbox, *w;
-
-	context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title (GTK_WINDOW (context->window), _("Migrating..."));
-	gtk_window_set_modal (GTK_WINDOW (context->window), TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (context->window), 6);
-	
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (context->window), vbox);
-	
-	w = gtk_label_new (_("The location and hierarchy of the Evolution contact "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
-	gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start_defaults (GTK_BOX (vbox), w);
-	
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox);
-	
-	context->label = GTK_LABEL (gtk_label_new (""));
-	gtk_widget_show (GTK_WIDGET (context->label));
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), GTK_WIDGET (context->label));
-	
-	context->progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
-	gtk_widget_show (GTK_WIDGET (context->progress));
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), GTK_WIDGET (context->progress));
-	
-	gtk_widget_show (context->window);
-
-}
-
-static void
-dialog_close (MigrationContext *context)
-{
-	gtk_widget_destroy (context->window);
-}
-
-static void
-dialog_set_folder_name (MigrationContext *context, const char *folder_name)
-{
-	char *text;
-	
-	text = g_strdup_printf (_("Migrating `%s':"), folder_name);
-	gtk_label_set_text (context->label, text);
-	g_free (text);
-	
-	gtk_progress_bar_set_fraction (context->progress, 0.0);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (MigrationContext *context, double percent)
-{
-	char text[5];
-	
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
-	
-	gtk_progress_bar_set_fraction (context->progress, percent);
-	gtk_progress_bar_set_text (context->progress, text);
-	
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, char *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static char *
-get_source_name (ESourceGroup *group, const char *path)
-{
-	char **p = g_strsplit (path, "/", 0);
-	int i, j, starting_index;
-	int num_elements;
-	gboolean conflict;
-	GString *s = g_string_new ("");
-
-	for (i = 0; p[i]; i ++) ;
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		g_string_assign (s, "");
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-
-	return g_string_free (s, FALSE);
-}
-
-static void
-migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book)
-{
-	EBookQuery *query = e_book_query_any_field_contains ("");
-	GList *l, *contacts;
-	int num_added = 0;
-	int num_contacts;
-
-	/* both books are loaded, start the actual migration */
-	e_book_get_contacts (old_book, query, &contacts, NULL);
-
-	num_contacts = g_list_length (contacts);
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		GError *e = NULL;
-		GList *attrs, *attr;
-
-		/* do some last minute massaging of the contact's attributes */
-
-		attrs = e_vcard_get_attributes (E_VCARD (contact));
-		for (attr = attrs; attr;) {
-			EVCardAttribute *a = attr->data;
-
-			/* evo 1.4 used the non-standard X-EVOLUTION-OFFICE attribute,
-			   evo 1.5 uses the third element in the ORG list attribute. */
-			if (!strcmp ("X-EVOLUTION-OFFICE", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-				GList *next_attr;
-
-				if (v && v->data)
-					e_contact_set (contact, E_CONTACT_OFFICE, v->data);
-
-				next_attr = attr->next;
-				e_vcard_remove_attribute (E_VCARD (contact), a);
-				attr = next_attr;
-			}
-			/* evo 1.4 didn't put TYPE=VOICE in for phone numbers.
-			   evo 1.5 does.
-
-			   so we search through the attribute params for
-			   either TYPE=VOICE or TYPE=FAX.  If we find
-			   either we do nothing.  If we find neither, we
-			   add TYPE=VOICE.
-			*/
-			else if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					EVCardAttributeParam *p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						if (v && v->data)
-							if (!strcmp ("VOICE", v->data)
-							    || !strcmp ("FAX", v->data))
-								found = TRUE;
-					}
-				}
-
-				if (!found)
-					e_vcard_attribute_add_param_with_value (a,
-										e_vcard_attribute_param_new (EVC_TYPE),
-										"VOICE");
-				attr = attr->next;
-			}
-			/* this is kinda gross.  The new vcard parser
-			   needs ';'s to be escaped by \'s.  but the
-			   1.4 vcard generator would put unescaped xml
-			   (including entities like &gt;) in the value
-			   of attributes, so we need to go through and
-			   escape those ';'s. */
-			else if (!strcmp ("EMAIL", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-
-				if (v && v->data) {
-					if (!strncmp ((char*)v->data, "<?xml", 5)) {
-						/* k, this is the nasty part.  we glomb all the
-						   value strings back together again (if there is
-						   more than one), then work our magic */
-						GString *str = g_string_new ("");
-						while (v) {
-							g_string_append (str, v->data);
-							if (v->next)
-								g_string_append_c (str, ';');
-							v = v->next;
-						}
-
-						e_vcard_attribute_remove_values (a);
-						e_vcard_attribute_add_value (a, str->str);
-						g_string_free (str, TRUE);
-					}
-				}
-
-				attr = attr->next;
-			}
-			else {
-				attr = attr->next;
-			}
-		}
-
-		if (!e_book_add_contact (new_book,
-					 contact,
-					 &e))
-			g_warning ("contact add failed: `%s'", e->message);
-
-		num_added ++;
-
-		dialog_set_progress (context, (double)num_added / num_contacts);
-	}
-
-	g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-	g_list_free (contacts);
-}
-
-static void
-migrate_contact_folder_to_source (MigrationContext *context, char *old_path, ESource *new_source)
-{
-	char *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *e = NULL;
-
-	EBook *old_book = NULL, *new_book = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (context, e_source_peek_name (new_source));
-
-	old_book = e_book_new ();
-	if (!e_book_load_source (old_book, old_source, TRUE, &e)) {
-		g_warning ("failed to load source book for migration: `%s'", e->message);
-		goto finish;
-	}
-
-	new_book = e_book_new ();
-	if (!e_book_load_source (new_book, new_source, FALSE, &e)) {
-		g_warning ("failed to load destination book for migration: `%s'", e->message);
-		goto finish;
-	}
-
-	migrate_contacts (context, old_book, new_book);
-
- finish:
-	g_object_unref (old_source);
-	g_object_unref (group);
-	if (old_book)
-		g_object_unref (old_book);
-	if (new_book)
-		g_object_unref (new_book);
-	g_free (old_uri);
-}
-
-static void
-migrate_contact_folder (MigrationContext *context, char *old_path, ESourceGroup *dest_group, char *source_name)
-{
-	ESource *new_source;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	g_hash_table_insert (context->folder_uid_map, g_strdup (old_path), g_strdup (e_source_peek_uid (new_source)));
-
-	migrate_contact_folder_to_source (context, old_path, new_source);
-
-	g_object_unref (new_source);
-}
-
-#define LDAP_BASE_URI "ldap://"
-#define PERSONAL_RELATIVE_URI "system"
-
-static void
-create_groups (MigrationContext *context,
-	       ESourceGroup **on_this_computer,
-	       ESourceGroup **on_ldap_servers,
-	       ESource      **personal_source)
-{
-	GSList *groups;
-	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
-
-	*on_this_computer = NULL;
-	*on_ldap_servers = NULL;
-	*personal_source = NULL;
-
-	base_uri = g_build_filename (addressbook_component_peek_base_directory (context->component),
-				     "addressbook", "local",
-				     NULL);
-
-	base_uri_proto = g_strconcat ("file://", base_uri, NULL);
-
-	groups = e_source_list_peek_groups (context->source_list);
-	if (groups) {
-		/* groups are already there, we need to search for things... */
-		GSList *g;
-
-		for (g = groups; g; g = g->next) {
-
-			group = E_SOURCE_GROUP (g->data);
-
-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
-				*on_this_computer = g_object_ref (group);
-			else if (!*on_ldap_servers && !strcmp (LDAP_BASE_URI, e_source_group_peek_base_uri (group)))
-				*on_ldap_servers = g_object_ref (group);
-		}
-	}
-
-	if (*on_this_computer) {
-		/* make sure "Personal" shows up as a source under
-		   this group */
-		GSList *sources = e_source_group_peek_sources (*on_this_computer);
-		GSList *s;
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
-				*personal_source = g_object_ref (source);
-				break;
-			}
-		}
-	}
-	else {
-		/* create the local source group */
-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
-		e_source_list_add_group (context->source_list, group, -1);
-
-		*on_this_computer = group;
-	}
-
-	if (!*personal_source) {
-		/* Create the default Person addressbook */
-		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
-		e_source_group_add_source (*on_this_computer, source, -1);
-
-		*personal_source = source;
-	}
-
-	if (!*on_ldap_servers) {
-		/* Create the LDAP source group */
-		group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI);
-		e_source_list_add_group (context->source_list, group, -1);
-
-		*on_ldap_servers = group;
-	}
-
-	g_free (base_uri_proto);
-	g_free (base_uri);
-}
-
-static gboolean
-migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer, ESource *personal_source)
-{
-	char *old_path = NULL;
-	GSList *dirs, *l;
-	char *local_contact_folder = NULL;
-
-	old_path = g_strdup_printf ("%s/evolution/local", g_get_home_dir ());
-
-	dirs = e_folder_map_local_folders (old_path, "contacts");
-
-	/* migrate the local addressbook first, to local/system */
-	local_contact_folder = g_build_filename (g_get_home_dir (),
-						 "evolution", "local", "Contacts",
-						 NULL);
-
-	for (l = dirs; l; l = l->next) {
-		char *source_name;
-		/* we handle the system folder differently */
-		if (personal_source && !strcmp ((char*)l->data, local_contact_folder)) {
-			g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source)));
-			migrate_contact_folder_to_source (context, local_contact_folder, personal_source);
-			continue;
-		}
-
-		source_name = get_source_name (on_this_computer, (char*)l->data);
-		migrate_contact_folder (context, l->data, on_this_computer, source_name);
-		g_free (source_name);
-	}
-
-	g_slist_foreach (dirs, (GFunc)g_free, NULL);
-	g_slist_free (dirs);
-	g_free (local_contact_folder);
-	g_free (old_path);
-
-	return TRUE;
-}
-
-static char *
-get_string_child (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static int
-get_integer_child (xmlNode *node,
-		   const char *name,
-		   int defval)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	int retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return defval;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the default */
-		return defval;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = atoi (xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
-{
-	char *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml",
-					     g_get_home_dir ());
-
-	printf ("trying to migrate from %s\n", sources_xml);
-
-	if (g_file_test (sources_xml, G_FILE_TEST_EXISTS)) {
-		xmlDoc  *doc = xmlParseFile (sources_xml);
-		xmlNode *root;
-		xmlNode *child;
-		int num_contactservers;
-		int servernum;
-
-		if (!doc)
-			return FALSE;
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		/* count the number of servers, so we can give progress */
-		num_contactservers = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "contactserver")) {
-				num_contactservers++;
-			}
-		}
-		printf ("found %d contact servers to migrate\n", num_contactservers);
-
-		dialog_set_folder_name (context, _("LDAP Servers"));
-
-		servernum = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "contactserver")) {
-				char *port, *host, *rootdn, *scope, *authmethod, *ssl;
-				char *emailaddr, *binddn, *limitstr;
-				int limit;
-				char *name, *description;
-				GString *uri = g_string_new ("");
-				ESource *source;
-
-				name        = get_string_child (child, "name");
-				description = get_string_child (child, "description");
-				port        = get_string_child (child, "port");
-				host        = get_string_child (child, "host");
-				rootdn      = get_string_child (child, "rootdn");
-			        scope       = get_string_child (child, "scope");
-				authmethod  = get_string_child (child, "authmethod");
-				ssl         = get_string_child (child, "ssl");
-				emailaddr   = get_string_child (child, "emailaddr");
-				binddn      = get_string_child (child, "binddn");
-				limit       = get_integer_child (child, "limit", 100);
-				limitstr    = g_strdup_printf ("%d", limit);
-
-				g_string_append_printf (uri,
-							"%s:%s/%s?"/*trigraph prevention*/"?%s",
-							host, port, rootdn, scope);
-
-				source = e_source_new (name, uri->str);
-				e_source_set_property (source, "description", description);
-				e_source_set_property (source, "limit", limitstr);
-				e_source_set_property (source, "ssl", ssl);
-				e_source_set_property (source, "auth", authmethod);
-				if (emailaddr)
-					e_source_set_property (source, "email_addr", emailaddr);
-				if (binddn)
-					e_source_set_property (source, "binddn", binddn);
-
-				e_source_group_add_source (on_ldap_servers, source, -1);
-
-				g_string_free (uri, TRUE);
-				g_free (port);
-				g_free (host);
-				g_free (rootdn);
-				g_free (scope);
-				g_free (authmethod);
-				g_free (ssl);
-				g_free (emailaddr);
-				g_free (binddn);
-				g_free (limitstr);
-				g_free (name);
-				g_free (description);
-
-				servernum++;
-				dialog_set_progress (context, (double)servernum/num_contactservers);
-			}
-		}
-
-		xmlFreeDoc (doc);
-	}
-
-	g_free (sources_xml);
-
-	return TRUE;
-}
-
-static ESource*
-get_source_by_uri (ESourceList *source_list, const char *uri)
-{
-	GSList *groups;
-	GSList *g;
-
-	groups = e_source_list_peek_groups (source_list);
-	if (!groups)
-		return NULL;
-
-	for (g = groups; g; g = g->next) {
-		GSList *sources;
-		GSList *s;
-		ESourceGroup *group = E_SOURCE_GROUP (g->data);
-
-		sources = e_source_group_peek_sources (group);
-		if (!sources)
-			continue;
-
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			char *source_uri = e_source_get_uri (source);
-			gboolean found = FALSE;
-
-			if (!strcmp (uri, source_uri))
-				found = TRUE;
-
-			g_free (source_uri);
-			if (found)
-				return source;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-migrate_completion_folders (MigrationContext *context)
-{
-	char *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (context->component),
-						  "/apps/evolution/addressbook/completion/uris",
-						  NULL);
-
-	printf ("trying to migrate completion folders\n");
-
-	if (uris_xml) {
-		xmlDoc  *doc = xmlParseMemory (uris_xml, strlen (uris_xml));
-		xmlNode *root;
-		xmlNode *child;
-
-		if (!doc)
-			return FALSE;
-
-		dialog_set_folder_name (context, _("Autocompletion Settings"));
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp (root->name, "EvolutionFolderList") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp (child->name, "folder")) {
-				char *physical_uri = e_xml_get_string_prop_by_name (child, "physical-uri");
-				ESource *source = NULL;
-
-				/* if the physical uri is file://...
-				   we look it up in our folder_uid_map
-				   hashtable.  If it's a folder we
-				   converted over, we should get back
-				   a uid we can search for.
-
-				   if the physical_uri is anything
-				   else, we strip off the args
-				   (anything after ;) before searching
-				   for the uri. */
-
-				if (!strncmp (physical_uri, "file://", 7)) {
-					char *uid = g_hash_table_lookup (context->folder_uid_map,
-									 physical_uri + 7);
-
-					if (uid)
-						source = e_source_list_peek_source_by_uid (context->source_list, uid);
-				}
-				else {
-					char *uri;
-					char *semi = strchr (physical_uri, ';');
-					if (semi)
-						uri = g_strndup (physical_uri, semi - physical_uri);
-					else
-						uri = g_strdup (physical_uri);
-
-					source = get_source_by_uri (context->source_list, uri);
-
-					g_free (uri);
-				}
-
-				if (source) {
-					e_source_set_property (source, "completion", "true");
-				}
-				else {
-					g_warning ("found completion folder with uri `%s' that "
-						   "doesn't correspond to anything we migrated.", physical_uri);
-				}
-
-				g_free (physical_uri);
-			}
-		}
-
-		g_free (uris_xml);
-	}
-	else {
-		g_message ("no completion folder settings to migrate");
-	}
-
-	return TRUE;
-}
-
-static MigrationContext*
-migration_context_new (AddressbookComponent *component)
-{
-	MigrationContext *context = g_new (MigrationContext, 1);
-	
-	/* set up the mapping from old uris to new uids */
-	context->folder_uid_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
-
-	context->source_list = addressbook_component_peek_source_list (component);
-
-	/* initialize our dialog */
-	setup_progress_dialog (context);
-
-	context->component = component;
-
-	return context;
-}
-
-static void
-migration_context_free (MigrationContext *context)
-{
-	e_source_list_sync (context->source_list, NULL);
-
-	g_hash_table_destroy (context->folder_uid_map);
-	g_free (context);
-}
-
-int
-addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision)
-{
-	ESourceGroup *on_this_computer;
-	ESourceGroup *on_ldap_servers;
-	ESource *personal_source;
-	MigrationContext *context = migration_context_new (component);
-
-	printf ("addressbook_migrate (%d.%d.%d)\n", major, minor, revision);
-
-	/* we call this unconditionally now - create_groups either
-	   creates the groups/sources or it finds the necessary
-	   groups/sources. */
-	create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source);
-
-	if (major <= 1) {
-		
-		if (/* we're <= 1.5.2 */
-		    (major == 1
-		     && ((minor == 5 && revision <= 2) 
-			 || (minor < 5)))
-		    ||
-		    /* we're 0.x */
-		    (major == 0)) {
-
-			if (on_this_computer) {
-				migrate_local_folders (context, on_this_computer, personal_source);
-				g_object_unref (on_this_computer);
-			}
-			if (on_ldap_servers) {
-				migrate_ldap_servers (context, on_ldap_servers);
-				g_object_unref (on_ldap_servers);
-			}
-			if (personal_source)
-				g_object_unref (personal_source);
-
-			migrate_completion_folders (context);
-
-			dialog_close (context);
-		}
-	}
-
-	migration_context_free (context);
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h
deleted file mode 100644
index 89dce7a91b..0000000000
--- a/addressbook/gui/component/addressbook-migrate.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004, 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.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
-#ifndef _ADDRESSBOOK_MIGRATE_H_
-#define _ADDRESSBOOK_MIGRATE_H_
-
-#include "addressbook-component.h"
-
-int addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision);
-
-#endif /* _ADDRESSBOOK_MIGRATE_H_ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 372767f043..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,1086 +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/gtknotebook.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-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>
-
-/* 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;
-	GHashTable *uid_to_view;
-	GtkWidget *notebook;
-	EBook *book;
-	guint activity_id;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	ESourceList *source_list;
-	char *passwd;
-} 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 set_status_message (EABView *eav, const char *message, AddressbookView *view);
-static void search_result (EABView *eav, EBookViewStatus status, AddressbookView *view);
-
-static EABView *
-get_current_view (AddressbookView *view)
-{
-	return EAB_VIEW (gtk_notebook_get_nth_page (GTK_NOTEBOOK (view->notebook),
-						    gtk_notebook_get_current_page (GTK_NOTEBOOK (view->notebook))));
-}
-
-static void
-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_save_as(v);
-}
-
-static void
-view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_view(v);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		gtk_widget_show(eab_search_dialog_new(v));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_delete_selection(v);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_print(v);
-}
-
-static void
-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_print_preview(v);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_stop(v);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_cut(v);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_copy(v);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_paste(v);
-}
-
-static void
-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_select_all (v);
-}
-
-static void
-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_send (v);
-}
-
-static void
-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_send_to (v);
-}
-
-static void
-copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_copy_to_folder (v);
-}
-
-static void
-move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	EABView *v = get_current_view (view);
-	if (v)
-		eab_view_move_to_folder (v);
-}
-
-static void
-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	e_passwords_forget_passwords();
-}
-
-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 void
-update_command_state (EABView *eav, AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	if (eav != get_current_view (view))
-		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 (eav) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsView",
-					      "sensitive",
-					      eab_view_can_view (eav) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrint",
-					      "sensitive",
-					      eab_view_can_print (eav) ? "1" : "0", NULL);
-
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrintPreview",
-					      "sensitive",
-					      eab_view_can_print (eav) ? "1" : "0", NULL);
-
-		/* Delete Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactDelete",
-					      "sensitive",
-					      eab_view_can_delete (eav) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCut",
-					      "sensitive",
-					      eab_view_can_cut (eav) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopy",
-					      "sensitive",
-					      eab_view_can_copy (eav) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPaste",
-					      "sensitive",
-					      eab_view_can_paste (eav) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSelectAll",
-					      "sensitive",
-					      eab_view_can_select_all (eav) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendContactToOther",
-					      "sensitive",
-					      eab_view_can_send (eav) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendMessageToContact",
-					      "sensitive",
-					      eab_view_can_send_to (eav) ? "1" : "0", NULL);
-
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsMoveToFolder",
-					      "sensitive",
-					      eab_view_can_move_to_folder (eav) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopyToFolder",
-					      "sensitive",
-					      eab_view_can_copy_to_folder (eav) ? "1" : "0", NULL);
-
-		/* Stop */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactStop",
-					      "sensitive",
-					      eab_view_can_stop (eav) ? "1" : "0", NULL);
-	}
-
-	addressbook_view_unref (view);
-}
-
-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),
-	/* ContactsViewPreview is a toggle */
-
-	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;
-	EABView *v = get_current_view (view);
-
-	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);
-
-	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);
-
-	if (v)
-		eab_view_setup_menus (v, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	if (v)
-		update_command_state (v, view);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-	EABView *v = get_current_view (view);
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (activate) {
-		control_activate (control, uic, view);
-		if (activate && v && v->model)
-			eab_model_force_folder_bar_message (v->model);
-	} else {
-		bonobo_ui_component_unset_container (uic, NULL);
-		eab_view_discard_menus (v);
-	}
-}
-
-static void
-gather_uids_foreach (char *key,
-		     gpointer value,
-		     GList **list)
-{
-	(*list) = g_list_prepend (*list, key);
-}
-
-static void
-source_list_changed_cb (ESourceList *source_list, AddressbookView *view)
-{
-	GList *uids, *l;
-	EABView *v;
-
-	uids = NULL;
-	g_hash_table_foreach (view->uid_to_view, (GHFunc)gather_uids_foreach, &uids);
-
-	for (l = uids; l; l = l->next) {
-		char *uid = l->data;
-		if (e_source_list_peek_source_by_uid (source_list, uid)) {
-			/* the source still exists, do nothing */
-		}
-		else {
-			/* the source no longer exists, remove the
-			   view and remove it from our hash table. */
-			v = g_hash_table_lookup (view->uid_to_view,
-						 uid);
-			g_hash_table_remove (view->uid_to_view, uid);
-			gtk_notebook_remove_page (GTK_NOTEBOOK (view->notebook),
-						  gtk_notebook_page_num (GTK_NOTEBOOK (view->notebook),
-									 GTK_WIDGET (v)));
-			g_object_unref (v);
-		}
-	}
-
-	/* make sure we've got the current view selected and updated
-	   properly */
-	v = get_current_view (view);
-	if (v) {
-		eab_view_setup_menus (v, bonobo_control_get_ui_component (view->control));
-		update_command_state (v, view);
-	}
-}
-
-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->uid_to_view) {
-		g_hash_table_destroy (view->uid_to_view);
-		view->uid_to_view = NULL;
-	}
-}
-
-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);
-	}
-}
-
-void
-addressbook_show_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
-{
-	char *label_string;
-	GtkWidget *warning_dialog;
-	GtkWidget *href = NULL;
-	gchar *uri;
-
-	g_return_if_fail (source != NULL);
-
-	uri = e_source_get_uri (source);
-
-	if (!strncmp (uri, "file:", 5)) {
-		label_string = 
-			_("We were unable to open this addressbook.  Please check that the "
-			  "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 "
-			  "means you have entered an incorrect URI, or the LDAP server "
-			  "is unreachable.");
-#else
-		label_string =
-			_("This version of Evolution does not have LDAP support "
-			  "compiled in to it.  If you want to use LDAP in Evolution "
-			  "you must compile the program from the CVS sources after "
-			  "retrieving OpenLDAP from the link below.");
-		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 "
-			  "means you have entered an incorrect URI, or the server "
-			  "is unreachable.");
-	}
-
-	warning_dialog = gtk_message_dialog_new (parent ? GTK_WINDOW (parent) : NULL,
-						 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);
-}
-
-typedef struct {
-	EABView *view;
-	ESource *source;
-} BookOpenData;
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	BookOpenData *data = closure;
-	EABView *view = data->view;
-	ESource *source = data->source;
-
-	g_free (data);
-
-	/* we always set the "source" property on the EABView, since
-	   we use it to reload a previously failed book. */
-	g_object_set(view,
-		     "source", source,
-		     NULL);
-
-	if (status == E_BOOK_ERROR_OK) {
-		g_object_set(view,
-			     "book", book,
-			     NULL);
-	}
-	else {
-		addressbook_show_load_error_dialog (NULL /* XXX */, source, status);
-	}
-
-
-	g_object_unref (source);
-}
-
-static void
-destroy_callback(gpointer data, GObject *where_object_was)
-{
-	AddressbookView *view = data;
-	addressbook_view_unref (view);
-}
-
-typedef struct {
-	EBookCallback cb;
-	ESource *source;
-	gpointer closure;
-	guint cancelled : 1;
-} LoadSourceData;
-
-static void
-free_load_source_data (LoadSourceData *data)
-{
-	if (data->source)
-		g_object_unref (data->source);
-	g_free (data);
-}
-
-static void
-load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *data = closure;
-
-	if (data->cancelled) {
-		free_load_source_data (data);
-		return;
-	}
-
-	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);
-			free_load_source_data (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);
-
-	free_load_source_data (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 (load_source_data->cancelled) {
-		free_load_source_data (load_source_data);
-		return;
-	}
-
-	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);
-	free_load_source_data (load_source_data);
-}
-
-guint
-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);
-	load_source_data->cancelled = FALSE;
-
-	e_book_async_load_source (book, source, load_source_cb, load_source_data);
-
-	return GPOINTER_TO_UINT (load_source_data);
-}
-
-void
-addressbook_load_source_cancel (guint id)
-{
-	LoadSourceData *load_source_data = GUINT_TO_POINTER (id);
-
-	load_source_data->cancelled = TRUE;
-}
-
-static void
-default_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadSourceData *load_source_data = closure;
-
-	if (status == E_BOOK_ERROR_OK)
-		load_source_data->source = g_object_ref (e_book_get_source (book));
-
-	load_source_cb (book, status, closure);
-}
-
-void
-addressbook_load_default_book (EBookCallback cb, gpointer closure)
-{
-	LoadSourceData *load_source_data = g_new (LoadSourceData, 1);
-
-	load_source_data->cb = cb;
-	load_source_data->source = NULL;
-	load_source_data->closure = closure;
-
-	e_book_async_get_default_addressbook (default_book_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;
-
-	switch (arg_id) {
-
-	case PROPERTY_SOURCE_UID_IDX: {
-		ESource *source;
-		const gchar *uid;
-
-		uid = BONOBO_ARG_GET_STRING (arg);
-
-		source = e_source_list_peek_source_by_uid (view->source_list, uid);
-
-		if (source) {
-			GtkWidget *uid_view;
-			EBook *book;
-			BookOpenData *data;
-
-			uid_view = g_hash_table_lookup (view->uid_to_view, uid);
-
-			if (uid_view) {
-				/* there is a view for this uid.  make
-				   sure that the view actually
-				   contains an EBook (if it doesn't
-				   contain an EBook a previous load
-				   failed.  try to load it again */
-				g_object_get (uid_view,
-					      "book", &book,
-					      NULL);
-
-				if (book) {
-					g_object_unref (book);
-				}
-				else {
-					book = e_book_new ();
-
-					g_object_get (uid_view,
-						      "source", &source,
-						      NULL);
-
-					/* source can be NULL here, if
-					   a previous load hasn't
-					   actually made it to
-					   book_open_cb yet. */
-					if (source) {
-						data = g_new (BookOpenData, 1);
-						data->view = g_object_ref (uid_view);
-						data->source = source; /* transfer the ref we get back from g_object_get */
-
-						addressbook_load_source (book, source, book_open_cb, data);
-					}
-				}
-			}
-			else {
-				/* we don't have a view for this uid already
-				   set up. */
-				GtkWidget *label = gtk_label_new (uid);
-
-				uid_view = eab_view_new ();
-
-				gtk_widget_show (uid_view);
-				gtk_widget_show (label);
-
-				g_object_set (uid_view, "type", EAB_VIEW_TABLE, NULL);
-
-				gtk_notebook_append_page (GTK_NOTEBOOK (view->notebook),
-							  uid_view,
-							  label);
-
-				g_hash_table_insert (view->uid_to_view, g_strdup (uid), uid_view);
-
-				g_signal_connect (uid_view, "status_message",
-						  G_CALLBACK(set_status_message), view);
-
-				g_signal_connect (uid_view, "search_result",
-						  G_CALLBACK(search_result), view);
-
-				g_signal_connect (uid_view, "command_state_change",
-						  G_CALLBACK(update_command_state), view);
-
-				book = e_book_new ();
-
-				data = g_new (BookOpenData, 1);
-				data->view = g_object_ref (uid_view);
-				data->source = g_object_ref (source);
-
-				addressbook_load_source (book, source, book_open_cb, data);
-			}
-
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (view->notebook),
-						       gtk_notebook_page_num (GTK_NOTEBOOK (view->notebook),
-									      uid_view));
-
-			/* change menus/toolbars to reflect the new view, assuming we are already displayed */
-			if (bonobo_ui_component_get_container (bonobo_control_get_ui_component (view->control)) != CORBA_OBJECT_NIL) {
-				eab_view_setup_menus (EAB_VIEW (uid_view), bonobo_control_get_ui_component (view->control));
-				update_command_state (EAB_VIEW (uid_view), view);
-			}
-		}
-		else {
-			g_warning ("Could not find source by UID '%s'!", uid);
-		}
-
-		break;
-	}
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-	EABView *v = get_current_view (view);
-	ESource *source = NULL;
-
-	switch (arg_id) {
-
-	case PROPERTY_SOURCE_UID_IDX:
-		if (v) {
-			g_object_get (v,
-				      "source", &source,
-				      NULL);
-		}
-
-		if (source) {
-			BONOBO_ARG_SET_STRING (arg, e_source_peek_uid (source));
-
-			g_object_unref (source);
-		}
-		else {
-			BONOBO_ARG_SET_STRING (arg, "");
-		}
-
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-BonoboControl *
-addressbook_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 1);
-	view->refs = 1;
-
-	view->uid_to_view = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
-
-	view->notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (view->notebook), FALSE);
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (view->notebook), FALSE);
-
-	g_object_weak_ref (G_OBJECT (view->notebook), destroy_callback, view);
-
-	/* Create the control. */
-	view->control = bonobo_control_new (view->notebook);
-
-	gtk_widget_show (view->notebook);
-
-	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);
-
-	view->source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	g_signal_connect (view->source_list,
-			  "changed",
-			  G_CALLBACK (source_list_changed_cb), view);
-
-	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 875752e0c3..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,22 +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
-guint      addressbook_load_source          (EBook *book, ESource *source, EBookCallback cb, gpointer closure);
-void       addressbook_load_source_cancel   (guint id);
-void       addressbook_load_default_book    (EBookCallback open_response, gpointer closure);
-void       addressbook_show_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status);
-
-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 6008c11ff3..0000000000
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
+++ /dev/null
@@ -1,55 +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>
-
-    <!-- View state -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/vpane_position</key>
-      <applyto>/apps/evolution/addressbook/display/vpane_position</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default></default>
-      <locale name="C">
-        <short>Position of the vertical pane in main view</short>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
deleted file mode 100644
index db9904ec7a..0000000000
--- a/addressbook/gui/component/autocompletion-config.c
+++ /dev/null
@@ -1,161 +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/gtkscrolledwindow.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;
-	GtkWidget *scrolledwin;
-
-	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); */
-
-	scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwin),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwin),
-					     GTK_SHADOW_IN);
-
-	ac->control_widget = e_source_selector_new (ac->source_list);
-	gtk_container_add (GTK_CONTAINER (scrolledwin), ac->control_widget);
-
-	initialize_selection (ac);
-
-	gtk_widget_show (ac->control_widget);
-	gtk_widget_show (scrolledwin);
-
-	ac->config_control = evolution_config_control_new (scrolledwin);
-
-	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 b4acc7ca4d..0000000000
--- a/addressbook/gui/component/ldap-config.glade
+++ /dev/null
@@ -1,2726 +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">Address Book Properties</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 Address Book</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">Address Book Creation Assistant</property>
-	  <property name="text" translatable="yes">This assistant will help you
-	      create a new address book. 
-
-Depending on the type of address book 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 address book.</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 address book.
-
-Please click the &quot;Apply&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">Address Book 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 address book.</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 8cd1235be2..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,95 +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/misc			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-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 b80611b9ff..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,1236 +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 EBookQuery*
-book_query_sexp (ESelectNamesCompletion *comp)
-{
-	gint i, j;
-	gchar **queryv;
-	EBookQuery *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 = e_book_query_from_string (queryv[0]);
-		queryv[0] = NULL;
-	} else {
-		gchar *tmp, *tmp2;
-		tmp = g_strjoinv (" ", queryv);
-		tmp2 = g_strdup_printf ("(or %s)", tmp);
-		query = e_book_query_from_string (tmp2);
-		g_free (tmp);
-		g_free (tmp2);
-	}
-
-	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) {
-		EBookQuery *query;
-	
-		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);
-
-		query = book_query_sexp (comp);
-		if (query) {
-			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,
-											       query, 
-											       NULL, -1,
-											       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;
-		}
-		e_book_query_unref (query);
-
-	} 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 eb7c7c5e88..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ /dev/null
@@ -1,401 +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)
-{
-	g_signal_handlers_disconnect_matched (G_OBJECT (w), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, 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 4ff3e3c41a..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_FILE_AS);
-				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 a732e643ec..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,844 +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;
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL, NULL);
-	widget = glade_xml_get_widget (gui, "select-names-box");
-	if (!widget) {
-		g_object_unref (gui);
-		return;
-	}
-	gtk_widget_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
-	gtk_box_pack_start (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_window_set_modal (GTK_WINDOW (e_select_names), TRUE);
-	gtk_window_set_default_size (GTK_WINDOW (e_select_names), 472, 512);
-	gtk_window_set_title (GTK_WINDOW (e_select_names), _("Select Contacts from Address Book"));
-	gtk_window_set_resizable (GTK_WINDOW (e_select_names), TRUE);
-	gtk_dialog_set_has_separator (GTK_DIALOG (e_select_names), FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (e_select_names), 4);
-
-	/* FIXME What to do on error/NULL ? */
-	e_select_names->source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	
-	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;
-
-	gtk_dialog_set_default_response (GTK_DIALOG (e_select_names),
-					 GTK_RESPONSE_OK);
-
-	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);
-
-	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);
-
-	e_select_names->child_count++;
-}
-
-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 1da11315f3..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= "2" _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 e5add45e06..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,405 +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">3</property>
-  <property name="title" translatable="yes">Select Contacts from Address Book</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</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">False</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-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="button5">
-	      <property name="visible">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="select-names-box">
-	  <property name="border_width">4</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label33">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Show Contacts&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox2">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label35">
-		  <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.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="GtkTable" id="show_contacts_table">
-		  <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">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label30">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Address _Book:</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">C_ategory:</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="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>
-		    <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">expand|shrink|fill</property>
-		      <property name="y_options">shrink|fill</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">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label37">
-	      <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.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="GtkLabel" id="label36">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Contacts&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox3">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label38">
-		  <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.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="GtkVBox" id="vbox8">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</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>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</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>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkTable" id="table-recipients">
-		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">18</property>
-		  <property name="column_spacing">12</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="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">True</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="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>
-
-</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 22504b04f5..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,48 +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				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/camel				\
-	-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-im.c		\
-	e-contact-editor-im.h		\
-	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 = 				\
-	im.glade				\
-	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 6b0d2fed31..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2768 +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="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">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="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="image-chooser">
-		  <property name="visible">True</property>
-		  <property name="creation_function">eab_create_image_chooser_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">Sat, 24 Jan 2004 19:28:18 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="source-option-menu-source">
-		  <property name="visible">True</property>
-		  <property name="creation_function">e_contact_editor_create_source_option_menu</property>
-		  <property name="int1">0</property>
-		  <property name="int2">0</property>
-		  <property name="last_modification_time">Tue, 16 Dec 2003 23:18:06 GMT</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">7</property>
-		  <property name="right_attach">8</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="GtkLabel" id="label-addressbook">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">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">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">5</property>
-		  <property name="right_attach">7</property>
-		  <property name="top_attach">12</property>
-		  <property name="bottom_attach">13</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="vbox4">
-	      <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="hbox2">
-		  <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="custom13">
-		      <property name="visible">True</property>
-		      <property name="creation_function">e_create_image_widget</property>
-		      <property name="string1">im.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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label26">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Enter the person's instant messenger accounts 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">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">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="GtkHBox" id="hbox4">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow4">
-		      <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_ALWAYS</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="treeview-im">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">True</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="vbuttonbox1">
-		      <property name="border_width">6</property>
-		      <property name="visible">True</property>
-		      <property name="layout_style">GTK_BUTTONBOX_START</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkButton" id="button-im-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="button-im-edit">
-			  <property name="visible">True</property>
-			  <property name="sensitive">False</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="alignment22">
-			      <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="hbox5">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">2</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image2">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-properties</property>
-				      <property name="icon_size">4</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="GtkLabel" id="label34">
-				      <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="button-im-remove">
-			  <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-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">True</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="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label25">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Instant Messaging</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">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">True</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">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox2">
-		  <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="custom16">
-		      <property name="visible">True</property>
-		      <property name="creation_function">e_create_image_widget</property>
-		      <property name="string1">videoconf.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="label29">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">If this person has the ability to participate in a video conference, enter their address here.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</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">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment20">
-		  <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="table3">
-		      <property name="border_width">6</property>
-		      <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="label-videourl">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Video Conferencing 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">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="entry-videourl">
-			  <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">0</property>
-			  <property name="bottom_attach">1</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 683fa12da0..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,624 +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_boxed ("address",
-							     _("Address"),
-							     /*_( */"XXX blurb" /*)*/,
-							     e_contact_address_get_type (),
-							     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, The Democratic Republic Of The"),
-	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_("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_("Guernsey"),
-	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_("Iran"),
-	N_("Iraq"),
-	N_("Ireland"),
-	N_("Isle of Man"),
-	N_("Israel"),
-	N_("Italy"),
-	N_("Jamaica"),
-	N_("Japan"),
-	N_("Jersey"),
-	N_("Jordan"),
-	N_("Kazakhstan"),
-	N_("Kenya"),
-	N_("Kiribati"),
-	N_("Korea, Democratic People's Republic Of"),
-	N_("Korea, Republic Of"),
-	N_("Kuwait"),
-	N_("Kyrgyzstan"),
-	N_("Laos"),
-	N_("Latvia"),
-	N_("Lebanon"),
-	N_("Lesotho"),
-	N_("Liberia"),
-	N_("Libya"),
-	N_("Liechtenstein"),
-	N_("Lithuania"),
-	N_("Luxembourg"),
-	N_("Macao"),
-	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_("Serbia And Montenegro"),
-	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_("Syria"),
-	N_("Taiwan"),
-	N_("Tajikistan"),
-	N_("Tanzania, United Republic Of"),
-	N_("Thailand"),
-	N_("Timor-Leste"),
-	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_("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);
-
-	e_contact_editor_address->address = NULL;
-
-	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 (e_contact_editor_address->address) {
-		e_contact_address_free (e_contact_editor_address->address);
-		e_contact_editor_address->address = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const EContactAddress *address)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_ADDRESS, NULL);
-
-	g_object_set (widget,
-		      "address", address,
-		      NULL);
-
-	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 (e_contact_editor_address->address)
-			g_boxed_free (e_contact_address_get_type (), e_contact_editor_address->address);
-
-		e_contact_editor_address->address = g_value_dup_boxed (value);
-		fill_in_info (e_contact_editor_address);
-		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);
-		g_value_set_static_boxed (value, e_contact_editor_address->address);
-		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)
-{
-	EContactAddress *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->locality);
-		fill_in_field (editor, "entry-region" , address->region  );
-		fill_in_field (editor, "entry-code"   , address->code    );
-		fill_in_field (editor, "entry-country", address->country );
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	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)
-{
-	EContactAddress *address = editor->address;
-
-	if (address) {
-		g_boxed_free (e_contact_address_get_type (), address);
-	}
-
-	address = g_new0 (EContactAddress, 1);
-	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->locality = extract_field(editor, "entry-city"   );
-	address->region   = extract_field(editor, "entry-region" );
-	address->code     = extract_field(editor, "entry-code"   );
-	address->country  = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index 30fefa0e56..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,71 +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;
-
-	/* item specific fields */
-	EContactAddress *address;
-
-	guint editable : 1;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new      (const EContactAddress *address);
-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 824a4e45a9..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,294 +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);
-
-		if (g_value_get_pointer (value) != NULL) {
-			e_contact_editor_fullname->name = e_contact_name_copy(g_value_get_pointer (value));
-			fill_in_info(e_contact_editor_fullname);
-		}
-		else {
-			e_contact_editor_fullname->name = NULL;
-		}
-		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-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
deleted file mode 100644
index f4932a79f2..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-im.c
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * 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-im.h"
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkstock.h>
-#include <string.h>
-
-static void e_contact_editor_im_init		(EContactEditorIm		 *card);
-static void e_contact_editor_im_class_init	(EContactEditorImClass	 *klass);
-static void e_contact_editor_im_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_contact_editor_im_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void e_contact_editor_im_dispose (GObject *object);
-
-static void fill_in_info(EContactEditorIm *editor);
-static void extract_info(EContactEditorIm *editor);
-
-static GtkDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_SERVICE,
-	PROP_LOCATION,
-	PROP_USERNAME,
-	PROP_EDITABLE
-};
-
-#define FIRST_IM_TYPE E_CONTACT_IM_AIM
-#define LAST_IM_TYPE  E_CONTACT_IM_ICQ
-
-static const char *im_labels[] = {
-	N_("AOL Instant Messenger"),
-	N_("Jabber"),
-	N_("Yahoo Messenger"),
-	N_("MSN Messenger"),
-	N_("ICQ")
-};
-
-static const char *im_images[] = {
-	"im-aim.png",
-	"im-jabber.png",
-	"im-yahoo.png",
-	"im-msn.png",
-	"im-icq.png"
-};
-
-GType
-e_contact_editor_im_get_type (void)
-{
-	static GType contact_editor_im_type = 0;
-
-	if (!contact_editor_im_type) {
-		static const GTypeInfo contact_editor_im_info =  {
-			sizeof (EContactEditorImClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
-			(GClassInitFunc) e_contact_editor_im_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (EContactEditorIm),
-			0,             /* n_preallocs */
-			(GInstanceInitFunc) e_contact_editor_im_init,
-		};
-
-		contact_editor_im_type = g_type_register_static (GTK_TYPE_DIALOG, "EContactEditorIm", &contact_editor_im_info, 0);
-	}
-
-	return contact_editor_im_type;
-}
-
-static void
-e_contact_editor_im_class_init (EContactEditorImClass *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_im_set_property;
-	object_class->get_property = e_contact_editor_im_get_property;
-	object_class->dispose = e_contact_editor_im_dispose;
-
-	g_object_class_install_property (object_class, PROP_SERVICE, 
-					 g_param_spec_int ("service",
-							   _("Service"),
-							   /*_( */"XXX blurb" /*)*/,
-							   FIRST_IM_TYPE,
-							   LAST_IM_TYPE,
-							   FIRST_IM_TYPE,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_LOCATION, 
-					 g_param_spec_string ("location",
-							   _("Location"),
-							   /*_( */"XXX blurb" /*)*/,
-							   "HOME",
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_USERNAME, 
-					 g_param_spec_string ("username",
-							   _("Username"),
-							   /*_( */"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));
-}
-
-static void
-service_changed_cb(GtkWidget *optmenu, EContactEditorIm *editor)
-{
-	editor->service = gtk_option_menu_get_history(GTK_OPTION_MENU(optmenu)) + FIRST_IM_TYPE;
-}
-
-static void
-location_changed_cb(GtkWidget *optmenu, EContactEditorIm *editor)
-{
-	int i = gtk_option_menu_get_history(GTK_OPTION_MENU(optmenu));
-
-	if (editor->location != NULL)
-		g_free(editor->location);
-
-	if (i == 0)
-		editor->location = g_strdup("HOME");
-	else if (i == 1)
-		editor->location = g_strdup("WORK");
-	else
-		editor->location = NULL;
-}
-
-static void
-setup_service_optmenu(EContactEditorIm *editor)
-{
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-	GtkWidget *hbox;
-	GtkWidget *item;
-	GtkWidget *label;
-	GtkWidget *image;
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *scale;
-	GList *p;
-	GtkSizeGroup *sg;
-	char *icon_path;
-	int i;
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-service");
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-					 G_CALLBACK(service_changed_cb), editor);
-
-	menu = gtk_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-	gtk_widget_show(menu);
-
-	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-	for (i = 0; i < G_N_ELEMENTS(im_labels); i++) {
-		item = gtk_menu_item_new();
-
-		hbox = gtk_hbox_new(FALSE, 4);
-		gtk_container_add(GTK_CONTAINER(item), hbox);
-		gtk_widget_show(hbox);
-
-		icon_path = g_concat_dir_and_file(EVOLUTION_IMAGESDIR, im_images[i]);
-		pixbuf = gdk_pixbuf_new_from_file(icon_path, NULL);
-		g_free(icon_path);
-
-		if (pixbuf != NULL) {
-			scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
-			image = gtk_image_new_from_pixbuf(scale);
-
-			g_object_unref(G_OBJECT(pixbuf));
-			g_object_unref(G_OBJECT(scale));
-		}
-		else
-			image = gtk_image_new();
-
-		gtk_size_group_add_widget(sg, image);
-
-		gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-		gtk_widget_show(image);
-
-		label = gtk_label_new(im_labels[i]);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-		gtk_widget_show(label);
-
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show(item);
-	}
-}
-
-static void
-setup_location_optmenu(EContactEditorIm *editor)
-{
-	GtkWidget *item;
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-location");
-
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-					 G_CALLBACK(location_changed_cb), editor);
-
-	menu = gtk_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-	gtk_widget_show(menu);
-
-	item = gtk_menu_item_new_with_label(_("Home"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-
-	item = gtk_menu_item_new_with_label(_("Work"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-
-	item = gtk_menu_item_new_with_label(_("Other"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_widget_show(item);
-}
-
-static void
-e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	char *icon_path;
-
-	gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_im),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
-
-	gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_im), TRUE);
-
-	e_contact_editor_im->service = FIRST_IM_TYPE;
-	e_contact_editor_im->location = g_strdup("HOME");
-	e_contact_editor_im->username = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/im.glade", NULL, NULL);
-	e_contact_editor_im->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "dialog-im");
-	gtk_window_set_title (GTK_WINDOW (e_contact_editor_im),
-			      GTK_WINDOW (widget)->title);
-
-	widget = glade_xml_get_widget(gui, "table-im");
-	g_object_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_im)->vbox), widget, TRUE, TRUE, 0);
-	g_object_unref(widget);
-
-	setup_service_optmenu(e_contact_editor_im);
-	setup_location_optmenu(e_contact_editor_im);
-
-	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
-
-	icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png");
-	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_im), icon_path);
-	g_free (icon_path);
-}
-
-void
-e_contact_editor_im_dispose (GObject *object)
-{
-	EContactEditorIm *e_contact_editor_im = E_CONTACT_EDITOR_IM(object);
-
-	if (e_contact_editor_im->gui) {
-		g_object_unref(e_contact_editor_im->gui);
-		e_contact_editor_im->gui = NULL;
-	}
-
-	if (e_contact_editor_im->location) {
-		g_free(e_contact_editor_im->location);
-		e_contact_editor_im->location = NULL;
-	}
-
-	if (e_contact_editor_im->username) {
-		g_free(e_contact_editor_im->username);
-		e_contact_editor_im->username = NULL;
-	}
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-GtkWidget*
-e_contact_editor_im_new (EContactField service, const char *location, const char *username)
-{
-	GtkWidget *widget = g_object_new (E_TYPE_CONTACT_EDITOR_IM, NULL);
-	g_object_set (widget,
-		      "service", GINT_TO_POINTER(service),
-			  "location", location,
-			  "username", username,
-		      NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_im_set_property (GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	EContactEditorIm *e_contact_editor_im;
-	const char *str;
-
-	e_contact_editor_im = E_CONTACT_EDITOR_IM (object);
-
-	switch (prop_id){
-	case PROP_SERVICE:
-		e_contact_editor_im->service = g_value_get_int(value);
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_LOCATION:
-		if (e_contact_editor_im->location != NULL)
-			g_free(e_contact_editor_im->location);
-
-		str = g_value_get_string(value);
-
-		if (str == NULL)
-			e_contact_editor_im->location = NULL;
-		else if (!g_ascii_strcasecmp(str, "HOME"))
-			e_contact_editor_im->location = g_strdup("HOME");
-		else if (!g_ascii_strcasecmp(str, "WORK"))
-			e_contact_editor_im->location = g_strdup("WORK");
-		else
-			e_contact_editor_im->location = NULL;
-
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_USERNAME:
-		if (e_contact_editor_im->username != NULL)
-			g_free(e_contact_editor_im->username);
-
-		e_contact_editor_im->username = g_strdup(g_value_get_string(value));
-		fill_in_info(e_contact_editor_im);
-		break;
-
-	case PROP_EDITABLE: {
-		int i;
-		char *widget_names[] = {
-			"optmenu-service",
-			"optmenu-location",
-			"entry-username",
-			"label-service",
-			"label-location",
-			"label-username",
-			NULL
-		};
-		e_contact_editor_im->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_im->gui, widget_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_editable_set_editable (GTK_EDITABLE (w),
-							   e_contact_editor_im->editable);
-			}
-			else {
-				gtk_widget_set_sensitive (w, e_contact_editor_im->editable);
-			}
-		}
-		break;
-	}
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-e_contact_editor_im_get_property (GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	EContactEditorIm *e_contact_editor_im;
-
-	e_contact_editor_im = E_CONTACT_EDITOR_IM (object);
-
-	switch (prop_id) {
-	case PROP_SERVICE:
-		g_value_set_int (value, e_contact_editor_im->service);
-		break;
-	case PROP_LOCATION:
-		g_value_set_string (value, e_contact_editor_im->location);
-		break;
-	case PROP_USERNAME:
-		extract_info(e_contact_editor_im);
-		g_value_set_string (value, e_contact_editor_im->username);
-		break;
-	case PROP_EDITABLE:
-		g_value_set_boolean (value, e_contact_editor_im->editable ? TRUE : FALSE);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorIm *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(EContactEditorIm *editor)
-{
-	GtkWidget *optmenu;
-
-	fill_in_field(editor, "entry-username",  editor->username);
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-service");
-
-	if (optmenu != NULL)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), editor->service - FIRST_IM_TYPE);
-
-	optmenu = glade_xml_get_widget(editor->gui, "optmenu-location");
-
-	if (optmenu != NULL)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu),
-									(editor->location == NULL ? 2 :
-									 !strcmp(editor->location, "WORK") ? 1 : 0));
-}
-
-static char *
-extract_field(EContactEditorIm *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(EContactEditorIm *editor)
-{
-	if (editor->username != NULL)
-		g_free(editor->username);
-
-	editor->username = extract_field(editor, "entry-username");
-
-	/*
-	 * NOTE: We don't need to handle the option menus.
-	 *       These are set by the callbacks.
-	 */
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.h b/addressbook/gui/contact-editor/e-contact-editor-im.h
deleted file mode 100644
index da5bd652b2..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-im.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-add-im.h
- * Copyright (C) 2003  Ximian, Inc.
- * Author: Christian Hammond <chipx86@gnupdate.org>
- *
- * 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_IM_H__
-#define __E_CONTACT_EDITOR_IM_H__
-
-#include <gtk/gtkdialog.h>
-#include <glade/glade.h>
-#include <libebook/e-contact.h>
-
-G_BEGIN_DECLS
-
-/* EContactEditorIm - A dialog allowing the user to add an IM account to a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * service      EContactField   RW              The field of the IM service.
- * location     char *          RW              The location type.
- * username     char *          RW              The username of the account.
- */
-
-#define E_TYPE_CONTACT_EDITOR_IM			(e_contact_editor_im_get_type ())
-#define E_CONTACT_EDITOR_IM(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR_IM, EContactEditorIm))
-#define E_CONTACT_EDITOR_IM_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR_IM, EContactEditorImClass))
-#define E_IS_CONTACT_EDITOR_IM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_IM))
-#define E_IS_CONTACT_EDITOR_IM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_IM))
-
-
-typedef struct _EContactEditorIm       EContactEditorIm;
-typedef struct _EContactEditorImClass  EContactEditorImClass;
-
-struct _EContactEditorIm
-{
-	GtkDialog parent;
-	
-	/* item specific fields */
-	EContactField service;
-	char *location;
-	char *username;
-	GladeXML *gui;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-struct _EContactEditorImClass
-{
-	GtkDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_im_new(EContactField service, const char *location, const char *username);
-GType      e_contact_editor_im_get_type (void);
-
-G_END_DECLS
-
-#endif /* __E_CONTACT_EDITOR_IM_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 8474e661e5..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,3537 +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-util.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 <libebook/e-address-western.h>
-
-#include <e-util/e-categories-master-list-wombat.h>
-
-#include <camel/camel.h>
-
-#include "addressbook/gui/component/addressbook.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-image-chooser.h"
-#include "widgets/misc/e-url-entry.h"
-#include "widgets/misc/e-source-option-menu.h"
-#include "shell/evolution-shell-component-utils.h"
-
-#include "eab-contact-merging.h"
-
-#include "e-contact-editor-address.h"
-#include "e-contact-editor-im.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
-};
-
-/* IM columns */
-enum {
-	COLUMN_IM_ICON,
-	COLUMN_IM_SERVICE,
-	COLUMN_IM_SCREENNAME,
-	COLUMN_IM_LOCATION,
-	COLUMN_IM_SERVICE_FIELD,
-	NUM_IM_COLUMNS
-};
-
-
-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 set_im_fields(EContactEditor *editor);
-#if 0
-static void find_address_mailing (EContactEditor *editor);
-#endif
-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_SOURCE_BOOK,
-	PROP_TARGET_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_SOURCE_BOOK, 
-				   g_param_spec_object ("source_book",
-							_("Source Book"),
-							/*_( */"XXX blurb" /*)*/,
-							E_TYPE_BOOK,
-							G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_TARGET_BOOK, 
-				   g_param_spec_object ("target_book",
-							_("Target 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
-add_im_clicked(GtkWidget *widget, EContactEditor *editor)
-{
-	GtkDialog *dialog;
-	int result;
-
-	dialog = GTK_DIALOG(e_contact_editor_im_new(E_CONTACT_IM_AIM, "HOME", NULL));
-
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gtk_dialog_run(dialog);
-	gtk_widget_hide(GTK_WIDGET(dialog));
-
-	if (result == GTK_RESPONSE_OK) {
-		GList *old_list, *new_list = NULL, *l;
-		EContactField service;
-		const char *screenname;
-
-		g_object_get(dialog,
-					 "service", &service,
-					 "username", &screenname,
-					 NULL);
-
-		old_list = e_contact_get(editor->contact, service);
-
-		for (l = old_list; l != NULL; l = l->next)
-			new_list = g_list_append(new_list, g_strdup(l->data));
-
-		new_list = g_list_append(new_list, g_strdup(screenname));
-
-		e_contact_set(editor->contact, service, new_list);
-
-		g_list_foreach(new_list, (GFunc)g_free, NULL);
-		g_list_free(new_list);
-
-		set_im_fields(editor);
-
-		widget_changed(NULL, editor);
-	}
-
-	gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-static void
-edit_im_clicked(GtkWidget *widget, EContactEditor *editor)
-{
-	GtkWidget *treeview;
-	GtkTreeSelection *selection;
-	GtkDialog *dialog;
-	GtkTreeIter iter;
-	EContactField old_service, service;
-	const char *old_location, *location;
-	const char *old_screenname, *screenname;
-	int result;
-
-	treeview = glade_xml_get_widget(editor->gui, "treeview-im");
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-
-	if (! gtk_tree_selection_get_selected(selection, NULL, &iter) ) {
-		return;
-	} 
-	
-	gtk_tree_model_get(GTK_TREE_MODEL(editor->im_model), &iter,
-					   COLUMN_IM_SERVICE_FIELD, &old_service,
-					   COLUMN_IM_LOCATION, &old_location,
-					   COLUMN_IM_SCREENNAME, &old_screenname,
-					   -1);
-
-	dialog = GTK_DIALOG(e_contact_editor_im_new(old_service, old_location, old_screenname));
-
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gtk_dialog_run(dialog);
-	gtk_widget_hide(GTK_WIDGET(dialog));
-
-	if (result == GTK_RESPONSE_OK) {
-		GList *old_list, *new_list = NULL, *l;
-
-		g_object_get(dialog,
-					 "service", &service,
-					 "location", &location,
-					 "username", &screenname,
-					 NULL);
-
-		if (service == old_service &&
-			(location == old_location ||
-			 (location != NULL && old_location == NULL) ||
-			 (location == NULL && old_location != NULL) ||
-			 !strcmp(old_location, location)) &&
-			!strcmp(screenname, old_screenname)) {
-
-			gtk_widget_destroy(GTK_WIDGET(dialog));
-			return;
-		}
-
-		/* Remove the old. */
-		old_list = e_contact_get(editor->contact, old_service);
-
-		for (l = old_list; l != NULL; l = l->next) {
-			const char *temp_screenname = (const char *)l->data;
-
-			if (strcmp(temp_screenname, old_screenname))
-				new_list = g_list_append(new_list, g_strdup(temp_screenname));
-		}
-
-		if (service == old_service)
-			new_list = g_list_append(new_list, g_strdup(screenname));
-
-		e_contact_set(editor->contact, old_service, new_list);
-
-		g_list_foreach(new_list, (GFunc)g_free, NULL);
-		g_list_free(new_list);
-
-		if (old_service != service)
-		{
-			/* We have to add this elsewhere. */
-			new_list = NULL;
-
-			old_list = e_contact_get(editor->contact, service);
-
-			for (l = old_list; l != NULL; l = l->next)
-				new_list = g_list_append(new_list, g_strdup(l->data));
-
-			new_list = g_list_append(new_list, g_strdup(screenname));
-
-			e_contact_set(editor->contact, service, new_list);
-
-			g_list_foreach(new_list, (GFunc)g_free, NULL);
-			g_list_free(new_list);
-		}
-
-		set_im_fields(editor);
-
-		widget_changed(NULL, editor);
-	}
-
-	gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-static void
-remove_im_clicked(GtkWidget *widget, EContactEditor *editor)
-{
-	GtkWidget *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	EContactField old_service;
-	const char *old_screenname;
-	GList *old_list, *new_list = NULL, *l;
-
-	treeview = glade_xml_get_widget(editor->gui, "treeview-im");
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-
-	gtk_tree_selection_get_selected(selection, NULL, &iter);
-
-	gtk_tree_model_get(GTK_TREE_MODEL(editor->im_model), &iter,
-					   COLUMN_IM_SERVICE_FIELD, &old_service,
-					   COLUMN_IM_SCREENNAME, &old_screenname,
-					   -1);
-
-	old_list = e_contact_get(editor->contact, old_service);
-
-	for (l = old_list; l != NULL; l = l->next) {
-		const char *temp_screenname = (const char *)l->data;
-
-		if (strcmp(temp_screenname, old_screenname))
-			new_list = g_list_append(new_list, g_strdup(temp_screenname));
-	}
-
-	e_contact_set(editor->contact, old_service, new_list);
-
-	if (new_list != NULL)
-	{
-		g_list_foreach(new_list, (GFunc)g_free, NULL);
-		g_list_free(new_list);
-	}
-
-	gtk_list_store_remove(editor->im_model, &iter);
-
-	widget_changed(NULL, editor);
-}
-
-
-static gboolean
-im_button_press_cb(GtkWidget *treeview, GdkEventButton *event,
-				   EContactEditor *editor)
-{
-	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
-		edit_im_clicked(NULL, editor);
-
-	return FALSE;
-}
-
-static void
-im_selected_cb(GtkTreeSelection *selection, EContactEditor *editor)
-{
-	gboolean sensitive = gtk_tree_selection_get_selected(selection, NULL, NULL);
-
-	gtk_widget_set_sensitive(glade_xml_get_widget(editor->gui, "button-im-remove"), sensitive);
-	gtk_widget_set_sensitive(glade_xml_get_widget(editor->gui, "button-im-edit"),   sensitive);
-}
-
-
-static void
-im_treeview_drag_data_get_cb(GtkWidget *widget, GdkDragContext *dc,
-							 GtkSelectionData *data, guint info,
-							 guint time, EContactEditor *editor)
-{
-	if (data->target == gdk_atom_intern("application/x-im-contact", FALSE)) {
-		GtkTreeRowReference *ref;
-		GtkTreePath *sourcerow;
-		GtkTreeIter iter;
-		const char *protocol;
-		const char *screenname;
-		const char *alias;
-		GString *str;
-		char *mime_str;
-		EContactField service_field;
-		static char *protocols[] = { "aim", "jabber", "yahoo", "msn", "icq" };
-
-		ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
-		sourcerow = gtk_tree_row_reference_get_path(ref);
-
-		if (!sourcerow)
-			return;
-
-		gtk_tree_model_get_iter(GTK_TREE_MODEL(editor->im_model), &iter,
-								sourcerow);
-
-		gtk_tree_model_get(GTK_TREE_MODEL(editor->im_model), &iter,
-						   COLUMN_IM_SERVICE_FIELD, &service_field,
-						   COLUMN_IM_SCREENNAME, &screenname,
-						   -1);
-
-		alias = e_contact_get_const(editor->contact, E_CONTACT_FULL_NAME);
-
-		protocol = protocols[service_field - E_CONTACT_IM_AIM];
-
-		str = g_string_new(NULL);
-
-		g_string_printf(str,
-			"MIME-Version: 1.0\r\n"
-			"Content-Type: application/x-im-contact\r\n"
-			"X-IM-Protocol: %s\r\n"
-			"X-IM-Username: %s\r\n",
-			protocol,
-			screenname);
-
-		if (alias && *alias)
-			g_string_append_printf(str, "X-IM-Alias: %s\r\n", alias);
-
-		str = g_string_append(str, "\r\n");
-
-		mime_str = g_string_free(str, FALSE);
-
-		gtk_selection_data_set(data,
-			gdk_atom_intern("application/x-im-contact", FALSE),
-			8,
-			mime_str,
-			strlen(mime_str) + 1);
-
-		g_free(mime_str);
-		gtk_tree_path_free(sourcerow);
-	}
-}
-
-static void
-im_treeview_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
-							 guint x, guint y, GtkSelectionData *sd,
-							 guint info, guint t, EContactEditor *editor)
-{
-	if (sd->target == gdk_atom_intern("application/x-im-contact", FALSE) && sd->data) {
-		CamelMimeParser *parser;
-		CamelStream *stream;
-		char *buffer;
-		char *username = NULL;
-		char *protocol = NULL;
-		int len;
-		int state;
-
-		parser = camel_mime_parser_new();
-
-		stream = camel_stream_mem_new_with_buffer(sd->data, sd->length);
-
-		if (camel_mime_parser_init_with_stream(parser, stream) == -1) {
-			g_warning("Unable to create parser for stream");
-			return;
-		}
-
-		while ((state = camel_mime_parser_step(parser, &buffer, &len)) != CAMEL_MIME_PARSER_STATE_EOF) {
-			if (state == CAMEL_MIME_PARSER_STATE_HEADER) {
-				const char *temp;
-				char *temp2;
-
-				if ((temp = camel_mime_parser_header(parser, "X-IM-Username", NULL)) != NULL) {
-					temp2 = g_strdup(temp);
-					username = g_strdup(g_strstrip(temp2));
-					g_free(temp2);
-				}
-
-				if ((temp = camel_mime_parser_header(parser, "X-IM-Protocol", NULL)) != NULL) {
-					temp2 = g_strdup(temp);
-					protocol = g_strdup(g_strstrip(temp2));
-					g_free(temp2);
-				}
-
-				break;
-			}
-		}
-
-		camel_object_unref(parser);
-
-		if (username != NULL && protocol != NULL) {
-			GList *old_list, *new_list = NULL, *l;
-			EContactField field;
-			gboolean found = FALSE;
-
-			if (!strcmp(protocol, "aim"))
-				field = E_CONTACT_IM_AIM;
-			else if (!strcmp(protocol, "icq"))
-				field = E_CONTACT_IM_ICQ;
-			else if (!strcmp(protocol, "yahoo"))
-				field = E_CONTACT_IM_YAHOO;
-			else if (!strcmp(protocol, "msn"))
-				field = E_CONTACT_IM_MSN;
-			else if (!strcmp(protocol, "jabber"))
-				field = E_CONTACT_IM_JABBER;
-			else {
-				g_free(username);
-				g_free(protocol);
-				gtk_drag_finish(dc, FALSE, (dc->action == GDK_ACTION_MOVE), t);
-				return;
-			}
-
-			old_list = e_contact_get(editor->contact, field);
-
-			for (l = old_list; l != NULL; l = l->next) {
-				const char *name = (const char *)l->data;
-
-				if (!strcmp(name, username)) {
-					found = TRUE;
-					break;
-				}
-
-				new_list = g_list_append(new_list, g_strdup(l->data));
-			}
-
-			if (!found) {
-				new_list = g_list_append(new_list, g_strdup(username));
-
-				e_contact_set(editor->contact, field, new_list);
-			}
-
-			if (new_list != NULL) {
-				g_list_foreach(new_list, (GFunc)g_free, NULL);
-				g_list_free(new_list);
-			}
-
-			set_im_fields(editor);
-		}
-
-		if (username != NULL)
-			g_free(username);
-
-		if (protocol != NULL)
-			g_free(protocol);
-
-		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
-	}
-}
-
-static void
-setup_im_treeview(EContactEditor *editor)
-{
-	GtkWidget *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-	GtkTargetEntry gte[] = {{"application/x-im-contact", 0, 0}};
-
-	treeview = glade_xml_get_widget(editor->gui, "treeview-im");
-
-	if (!treeview || !GTK_IS_TREE_VIEW(treeview))
-		return;
-
-	editor->im_model = gtk_list_store_new(NUM_IM_COLUMNS,
-										  GDK_TYPE_PIXBUF, G_TYPE_STRING,
-										  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
-
-	gtk_tree_view_set_model(GTK_TREE_VIEW(treeview),
-							GTK_TREE_MODEL(editor->im_model));
-
-	g_signal_connect(G_OBJECT(treeview), "button-press-event",
-					 G_CALLBACK(im_button_press_cb), editor);
-
-	column = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(column, _("Service"));
-	gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1);
-
-	renderer = gtk_cell_renderer_pixbuf_new();
-	gtk_tree_view_column_pack_start(column, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(column, renderer,
-									   "pixbuf", COLUMN_IM_ICON);
-
-	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(column, renderer,
-									   "text", COLUMN_IM_SERVICE);
-
-	column = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(column, _("Account Name"));
-	gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1);
-
-	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(column, renderer,
-									   "text", COLUMN_IM_SCREENNAME);
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-	g_signal_connect(G_OBJECT(selection), "changed",
-					 G_CALLBACK(im_selected_cb), editor);
-
-	/* Setup drag-and-drop */
-	gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(treeview),
-										   GDK_BUTTON1_MASK, gte, 1,
-										   GDK_ACTION_COPY);
-	gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(treeview),
-										 gte, 1,
-										 GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-	g_signal_connect(G_OBJECT(treeview), "drag-data-get",
-					 G_CALLBACK(im_treeview_drag_data_get_cb), editor);
-	g_signal_connect(G_OBJECT(treeview), "drag-data-received",
-					 G_CALLBACK(im_treeview_drag_data_rcv_cb), editor);
-}
-
-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 gchar *
-address_to_text (const EContactAddress *address)
-{
-	GString *text;
-	gchar *str;
-
-	text = g_string_new ("");
-
-	if (address->street && *address->street) {
-		g_string_append (text, address->street);
-		g_string_append_c (text, '\n');
-	}
-	if (address->ext && *address->ext) {
-		g_string_append (text, address->ext);
-		g_string_append_c (text, '\n');
-	}
-	if (address->po && *address->po) {
-		g_string_append (text, address->po);
-		g_string_append_c (text, '\n');
-	}
-	if (address->locality && *address->locality) {
-		g_string_append (text, address->locality);
-		g_string_append_c (text, '\n');
-	}
-	if (address->region && *address->region) {
-		g_string_append (text, address->region);
-		g_string_append_c (text, '\n');
-	}
-	if (address->code && *address->code) {
-		g_string_append (text, address->code);
-		g_string_append_c (text, '\n');
-	}
-	if (address->country && *address->country) {
-		g_string_append (text, address->country);
-		g_string_append_c (text, '\n');
-	}
-
-	str = text->str;
-	g_string_free (text, FALSE);
-	return str;
-}
-
-static EContactAddress *
-text_to_address (const gchar *text)
-{
-	EAddressWestern *western;
-	EContactAddress *address;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	western = e_address_western_parse (text);
-	if (!western)
-		return NULL;
-
-	address = g_new0 (EContactAddress, 1);
-	address->po = western->po_box;
-	address->ext = western->extended;
-	address->street = western->street;
-	address->locality = western->locality;
-	address->region = western->region;
-	address->code = western->postal_code;
-	address->country = western->country;
-
-	g_free (western);
-
-	return address;
-}
-
-static void
-address_text_changed (GtkTextBuffer *buffer, EContactEditor *editor)
-{
-	EContactAddress *address;
-	GtkTextIter start_iter, end_iter;
-	gchar *text;
-
-	g_print ("editor->address_choice == %d\n", editor->address_choice);
-
-	if (editor->address_choice == -1)
-		return;
-
-	gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start_iter);
-	gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter);
-
-	text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &start_iter, &end_iter, FALSE);
-	address = text_to_address (text);
-	g_free (text);
-
-	if (editor->address_mailing == editor->address_choice || editor->address_mailing == -1) {
-		GtkWidget *check;
-
-#if 0
-		address->flags |= E_CARD_ADDR_DEFAULT;
-#endif
-
-		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);
-		}
-	}
-	
-	e_contact_set (editor->contact, editor->address_choice, address);
-
-	g_boxed_free (e_contact_address_get_type (), address);
-
-	widget_changed (NULL, editor);
-}
-
-
-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
-}
-
-static void
-new_target_cb (EBook *new_book, EBookStatus status, EContactEditor *editor)
-{
-	editor->load_source_id = 0;
-	editor->load_book      = NULL;
-
-	if (status != E_BOOK_ERROR_OK || new_book == NULL) {
-		GtkWidget *source_option_menu;
-
-		addressbook_show_load_error_dialog (NULL, e_book_get_source (new_book), status);
-
-		source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
-		e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu),
-					     e_book_get_source (editor->target_book));
-
-		if (new_book)
-			g_object_unref (new_book);
-		return;
-	}
-
-	g_object_set (editor, "target_book", new_book, NULL);
-	g_object_unref (new_book);
-	widget_changed (NULL, editor);
-}
-
-static void
-cancel_load (EContactEditor *editor)
-{
-	if (editor->load_source_id) {
-		addressbook_load_source_cancel (editor->load_source_id);
-		editor->load_source_id = 0;
-
-		g_object_unref (editor->load_book);
-		editor->load_book = NULL;
-	}
-}
-
-static void
-source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor)
-{
-	cancel_load (editor);
-
-	if (e_source_equal (e_book_get_source (editor->target_book), source))
-		return;
-
-	if (e_source_equal (e_book_get_source (editor->source_book), source)) {
-		g_object_set (editor, "target_book", editor->source_book, NULL);
-		return;
-	}
-
-	editor->load_book = e_book_new ();
-	editor->load_source_id = addressbook_load_source (editor->load_book, source,
-							  (EBookCallback) new_target_cb, editor);
-}
-
-/* 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
-image_chooser_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	editor->image_set = TRUE;
-
-	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->target_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_urlentry_changed_signal_field (editor, "entry-videourl");
-
-	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);
-	}
-
-	widget = glade_xml_get_widget (editor->gui, "image-chooser");
-	if (widget && E_IS_IMAGE_CHOOSER (widget)) {
-		g_signal_connect (widget, "changed",
-				  G_CALLBACK (image_chooser_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)
-{
-	GtkDialog *dialog;
-	int result;
-	EContactAddress *address;
-
-	address = e_contact_get (editor->contact, editor->address_choice);
-
-	dialog = GTK_DIALOG(e_contact_editor_address_new(address));
-	g_object_set (dialog,
-		      "editable", editor->address_editable[editor->address_choice - E_CONTACT_FIRST_ADDRESS_ID],
-		      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 - E_CONTACT_FIRST_ADDRESS_ID] && result == GTK_RESPONSE_OK) {
-		EContactAddress *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 = address_to_text (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_contact_set (editor->contact, editor->address_choice, new_address);
-
-		g_boxed_free (e_contact_address_get_type (), new_address);
-
-		widget_changed (NULL, editor);
-	}
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-
-	g_boxed_free (e_contact_address_get_type (), address);
-}
-
-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;
-	gchar *new_id;
-} EditorCloseStruct;
-
-static void
-contact_moved_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;
-
-	e_contact_set (ce->contact, E_CONTACT_UID, ecs->new_id);
-
-	g_signal_emit (ce, contact_editor_signals[CONTACT_DELETED], 0,
-		       status, ce->contact);
-
-	ce->is_new_contact = FALSE;
-
-	if (should_close) {
-		close_dialog (ce);
-	}
-	else {
-		ce->changed = FALSE;
-
-		g_object_ref (ce->target_book);
-		g_object_unref (ce->source_book);
-		ce->source_book = ce->target_book;
-
-		command_state_changed (ce);
-	}
-
-	g_object_unref (ce);
-	g_free (ecs->new_id);
-	g_free (ecs);
-}
-
-static void
-contact_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	if (ce->source_book != ce->target_book && ce->source_editable &&
-	    status == E_BOOK_ERROR_OK && ce->is_new_contact == FALSE) {
-		ecs->new_id = g_strdup (id);
-		e_book_async_remove_contact (ce->source_book, ce->contact,
-					     (EBookCallback) contact_moved_cb, ecs);
-		return;
-	}
-
-	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)
-{
-	EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-
-	extract_info (ce);
-	if (!ce->target_book)
-		return;
-
-	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->source_book != ce->target_book) {
-		/* Two-step move; add to target, then remove from source */
-		eab_merging_book_add_contact (ce->target_book, ce->contact,
-					      (EBookIdCallback) contact_added_cb, ecs);
-	} else {
-		if (ce->is_new_contact)
-			eab_merging_book_add_contact (ce->target_book, ce->contact,
-						      (EBookIdCallback) contact_added_cb, ecs);
-		else
-			eab_merging_book_commit_contact (ce->target_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_CANCEL,
-				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->source_book) {
-			gtk_widget_set_sensitive (ce->app, FALSE);
-			ce->in_async_call = TRUE;
-
-			e_book_async_remove_contact (ce->source_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 1
-	e_contact_editor->address_choice = E_CONTACT_FIRST_ADDRESS_ID;
-	e_contact_editor->address_mailing = -1;
-#endif	
-
-	e_contact_editor->contact = NULL;
-	e_contact_editor->changed = FALSE;
-	e_contact_editor->image_set = FALSE;
-	e_contact_editor->in_async_call = FALSE;
-	e_contact_editor->source_editable = TRUE;
-	e_contact_editor->target_editable = TRUE;
-
-	e_contact_editor->load_source_id = 0;
-	e_contact_editor->load_book = NULL;
-
-	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);
-
-	setup_im_treeview(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);
-	widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source");
-	if (widget && E_IS_SOURCE_OPTION_MENU (widget))
-		g_signal_connect (widget, "source_selected",
-				  G_CALLBACK (source_selected), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-im-add");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (add_im_clicked), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-im-edit");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (edit_im_clicked), e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-im-remove");
-	if (widget && GTK_IS_BUTTON(widget))
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (remove_im_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->source_book) {
-		g_object_unref(e_contact_editor->source_book);
-		e_contact_editor->source_book = NULL;
-	}
-
-	if (e_contact_editor->target_book) {
-		g_object_unref(e_contact_editor->target_book);
-		e_contact_editor->target_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;
-	}
-
-	cancel_load (e_contact_editor);
-}
-
-static void
-command_state_changed (EContactEditor *ce)
-{
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSaveClose",
-				      "sensitive",
-				      (ce->target_editable && ce->changed) ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSave",
-				      "sensitive",
-				      (ce->target_editable && ce->changed) ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorDelete",
-				      "sensitive",
-				      (ce->source_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,
-		      "source_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_SOURCE_BOOK: {
-		gboolean writable;
-		gboolean changed = FALSE;
-
-		if (editor->source_book)
-			g_object_unref(editor->source_book);
-		editor->source_book = E_BOOK (g_value_get_object (value));
-		g_object_ref (editor->source_book);
-
-		if (!editor->target_book) {
-			editor->target_book = editor->source_book;
-			g_object_ref (editor->target_book);
-
-			e_book_async_get_supported_fields (editor->target_book,
-							   (EBookFieldsCallback) supported_fields_cb, editor);
-		}
-
-		writable = e_book_is_writable (editor->source_book);
-		if (writable != editor->source_editable) {
-			editor->source_editable = writable;
-			changed = TRUE;
-		}
-
-		writable = e_book_is_writable (editor->target_book);
-		if (writable != editor->target_editable) {
-			editor->target_editable = writable;
-			changed = TRUE;
-		}
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-
-		/* XXX more here about editable/etc. */
-		break;
-	}
-
-	case PROP_TARGET_BOOK: {
-		gboolean writable;
-		gboolean changed = FALSE;
-
-		if (editor->target_book)
-			g_object_unref(editor->target_book);
-		editor->target_book = E_BOOK (g_value_get_object (value));
-		g_object_ref (editor->target_book);
-
-		e_book_async_get_supported_fields (editor->target_book,
-						   (EBookFieldsCallback) supported_fields_cb, editor);
-
-		if (!editor->changed && !editor->is_new_contact) {
-			editor->changed = TRUE;
-			changed = TRUE;
-		}
-
-		writable = e_book_is_writable (editor->target_book);
-		if (writable != editor->target_editable) {
-			editor->target_editable = writable;
-			set_editable (editor);
-			changed = TRUE;
-		}
-
-		if (changed)
-			command_state_changed (editor);
-
-		/* If we're trying to load a new target book, cancel that here. */
-		cancel_load (editor);
-
-		/* 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->target_editable != new_value);
-
-		editor->target_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_SOURCE_BOOK:
-		g_value_set_object (value, e_contact_editor->source_book);
-		break;
-
-	case PROP_TARGET_BOOK:
-		g_value_set_object (value, e_contact_editor->target_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->target_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->target_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 + E_CONTACT_FIRST_EMAIL_ID;
-
-		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->target_editable);
-		enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->target_editable);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-
-	e_contact_editor_build_address_ui (editor);
-
-	for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
-		EContactAddress *address = e_contact_get (editor->contact, i);
-		gboolean checked;
-
-		checked = (address != NULL);
-		gtk_check_menu_item_set_active (
-			GTK_CHECK_MENU_ITEM (editor->address_info [i - E_CONTACT_FIRST_ADDRESS_ID].widget),
-			checked);
-
-		if (address)
-			g_boxed_free (e_contact_address_get_type (), address);
-	}
-
-	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 + E_CONTACT_FIRST_ADDRESS_ID);
-
-		/* 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]);
-	}
-}
-
-#if 0
-static void
-find_address_mailing (EContactEditor *editor)
-{
-	const EContactAddress *address;
-	int i;
-	
-	editor->address_mailing = -1;
-	for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
-		address = e_contact_get_const (editor->contact, i);
-		if (address && (address->flags & E_CARD_ADDR_DEFAULT)) {
-			if (editor->address_mailing == -1) {
-				editor->address_mailing = i;
-			} else {
-				EContactAddress *new;
-				
-				new = e_card_delivery_address_copy (address);
-				new = g_boxed_copy (e_contact_address_get_type (), 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_source_field (EContactEditor *editor)
-{
-	GtkWidget *source_menu;
-	ESource   *source;
-
-	if (!editor->target_book)
-		return;
-
-	source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
-	source = e_book_get_source (editor->target_book);
-
-	e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source);
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	EContactAddress *address;
-	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 address field is selected, try that first. If we don't have that, start
-	 * from top of field list */
-	if (editor->address_choice == -1)
-		address = NULL;
-	else
-		address = e_contact_get (editor->contact, editor->address_choice);
-
-	if (address) {
-		i = editor->address_choice;
-		g_boxed_free (e_contact_address_get_type (), address);
-	} else {
-		for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
-			address = e_contact_get (editor->contact, i);
-
-			if (address) {
-				g_boxed_free (e_contact_address_get_type (), address);
-				break;
-			}
-		}
-		if (i > E_CONTACT_LAST_ADDRESS_ID)
-			i = E_CONTACT_FIRST_ADDRESS_ID;
-
-		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 - E_CONTACT_FIRST_ADDRESS_ID)),
-				      NULL);
-		}
-	}
-
-	set_address_field(editor, i);
-	set_source_field (editor);
-}
-
-static void
-add_im_field(EContactEditor *editor, EContactField field, const char *service,
-			 const char *desc)
-{
-	GList *list;
-	GList *l;
-	GtkTreeIter iter;
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *scale = NULL;
-	char *icon_path;
-	char *buf;
-
-	list = e_contact_get(editor->contact, field);
-
-	buf = g_strdup_printf("im-%s.png", service);
-	icon_path = g_concat_dir_and_file(EVOLUTION_IMAGESDIR, buf);
-	pixbuf = gdk_pixbuf_new_from_file(icon_path, NULL);
-	g_free(icon_path);
-	g_free(buf);
-
-	if (pixbuf != NULL)
-		scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
-
-	for (l = list; l != NULL; l = l->next)
-	{
-		const char *account_name = (const char *)l->data;
-
-		gtk_list_store_append(editor->im_model, &iter);
-
-		gtk_list_store_set(editor->im_model, &iter,
-						   COLUMN_IM_ICON, scale,
-						   COLUMN_IM_SERVICE,  desc,
-						   COLUMN_IM_SCREENNAME, account_name,
-						   COLUMN_IM_SERVICE_FIELD, field,
-						   -1);
-	}
-
-	if (scale != NULL)
-		g_object_unref(G_OBJECT(scale));
-
-	if (pixbuf != NULL)
-		g_object_unref(G_OBJECT(pixbuf));
-}
-
-static void
-set_im_fields(EContactEditor *editor)
-{
-	gtk_list_store_clear(editor->im_model);
-
-	add_im_field(editor, E_CONTACT_IM_AIM,    "aim",    _("AIM"));
-	add_im_field(editor, E_CONTACT_IM_JABBER, "jabber", _("Jabber"));
-	add_im_field(editor, E_CONTACT_IM_YAHOO,  "yahoo",  _("Yahoo"));
-	add_im_field(editor, E_CONTACT_IM_MSN,    "msn",    _("MSN"));
-	add_im_field(editor, E_CONTACT_IM_ICQ,    "icq",    _("ICQ"));
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *text, *check;
-	
-	text = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (text && GTK_IS_TEXT_VIEW(text)) {
-		GtkTextBuffer *buffer;
-		GtkTextIter start_iter, end_iter;
-		EContactAddress *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_contact_get (editor->contact, result);
-		if (address) {
-			gchar *text;
-
-			text = address_to_text (address);
-			gtk_text_buffer_insert (buffer, &start_iter, text, strlen (text));
-			g_free (text);
-		}
-
-		check = glade_xml_get_widget(editor->gui, "checkbutton-mailingaddress");
-		if (check && GTK_IS_CHECK_BUTTON (check)) {
-#if 0
-			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);
-#endif
-		}
-		
-		editor->address_choice = result;
-
-		if (address)
-			g_boxed_free (e_contact_address_get_type (), address);
-	}
-}
-
-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 },
-	{ "entry-videourl", E_CONTACT_VIDEO_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 },
-
-	{ "label-videourl", E_CONTACT_VIDEO_URL },
-	{ "entry-videourl", E_CONTACT_VIDEO_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);
-	e_contact_editor_build_address_ui (editor);
-	for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_contact_field_name (i),
-				     editor->address_info[i - E_CONTACT_FIRST_ADDRESS_ID].widget);
-
-	/* then disable them all */
-	g_hash_table_foreach (dropdown_hash, (GHFunc)disable_widget_foreach, NULL);
-
-	/* disable the label widgets for the dropdowns (4 phone, 1
-           email and the toggle button, and 1 address and one for
-           the full address button */
-	for (i = 0; i < 4; i ++) {
-		widget_name = g_strdup_printf ("label-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-		widget_name = g_strdup_printf ("entry-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-	}
-	enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "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);
-		}
-
-		for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i ++) {
-			if (!strcmp (field, e_contact_field_name (i))) {
-				editor->address_editable [i - E_CONTACT_FIRST_ADDRESS_ID] = TRUE;
-			}
-		}
-
-		/* 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->target_editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->target_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->target_editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->target_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->target_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->target_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->target_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->target_editable);
-
-		g_free (entry);
-	}
-
-	/* handle the email dropdown entry */
-	entry = "entry-email1";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->target_editable);
-	enable_widget (glade_xml_get_widget(editor->gui, "checkbutton-htmlmail"),
-		       editor->target_editable);
-
-	/* handle the address dropdown entry */
-	entry = "text-address";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->target_editable);
-
-	entry = "image-chooser";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->target_editable);
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	EContact *contact = editor->contact;
-	if (contact) {
-		char *file_as;
-		EContactName *name;
-		EContactDate *anniversary;
-		EContactDate *bday;
-		EContactPhoto *photo;
-		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,
-			      "photo",            &photo,
-			      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);
-		}
-
-#if 0
-		find_address_mailing (editor);
-#endif
-		
-		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);
-		}
-
-		if (photo) {
-			widget = glade_xml_get_widget(editor->gui, "image-chooser");
-			if (widget && E_IS_IMAGE_CHOOSER(widget))
-				e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), photo->data, photo->length);
-		}
-
-		e_contact_date_free (anniversary);
-		e_contact_date_free (bday);
-		e_contact_photo_free (photo);
-
-		set_fields(editor);
-
-		set_im_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);
-		}
-
-		widget = glade_xml_get_widget (editor->gui, "image-chooser");
-		if (widget && E_IS_IMAGE_CHOOSER (widget)) {
-			char *image_data;
-			gsize image_data_len;
-
-			if (editor->image_set
-			    && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget),
-							       &image_data,
-							       &image_data_len)) {
-				EContactPhoto photo;
-
-				photo.data = image_data;
-				photo.length = image_data_len;
-
-				e_contact_set (contact, E_CONTACT_PHOTO, &photo);
-				g_free (image_data);
-			}
-			else {
-				e_contact_set (contact, E_CONTACT_PHOTO, 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;
-}
-
-GtkWidget *
-e_contact_editor_create_source_option_menu (gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_source_option_menu (gchar *name,
-					    gchar *string1, gchar *string2,
-					    gint int1, gint int2)
-{
-	GtkWidget   *menu;
-	GConfClient *gconf_client;
-	ESourceList *source_list;
-
-	gconf_client = gconf_client_get_default ();
-	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
-
-	menu = e_source_option_menu_new (source_list);
-	g_object_unref (source_list);
-
-	gtk_widget_show (menu);
-	return menu;
-}
-
-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 if (E_IS_IMAGE_CHOOSER (widget)) {
-		e_image_chooser_set_editable (E_IMAGE_CHOOSER (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 220e2cf421..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,148 +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>
-
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.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 *source_book;
-	EBook *target_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;
-
-	GtkListStore *im_model;
-
-	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 image chooser widget has been changed. */
-	guint image_set : 1;
-
-	/* Whether the contact has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept delete */
-	guint source_editable : 1;
-
-	/* Whether the contact editor will accept modifications, save */
-	guint target_editable : 1;
-
-	/* Whether the fullname will accept modifications */
-	guint fullname_editable : 1;
-
-	/* Whether each of the addresses are editable */
-	gboolean address_editable [E_CONTACT_LAST_ADDRESS_ID - E_CONTACT_FIRST_ADDRESS_ID + 1];
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	EList *writable_fields;
-
-	/* ID for async load_source call */
-	guint  load_source_id;
-	EBook *load_book;
-};
-
-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/im.glade b/addressbook/gui/contact-editor/im.glade
deleted file mode 100644
index 04f1e6915d..0000000000
--- a/addressbook/gui/contact-editor/im.glade
+++ /dev/null
@@ -1,202 +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-im">
-  <property name="title" translatable="yes">Add IM Account</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">False</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">0</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="GtkTable" id="table-im">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</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-service">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">IM Service:</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">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="GtkOptionMenu" id="optmenu-service">
-	      <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>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-username">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Account name:</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">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="entry-username">
-	      <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"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label-location">
-	      <property name="label" translatable="yes">Location:</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">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="GtkOptionMenu" id="optmenu-location">
-	      <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">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</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/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 ebe7dcb1d0..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">eab_create_image_chooser_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 84b6a769ea..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,1065 +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 "widgets/misc/e-image-chooser.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 list_image_changed_cb (GtkWidget *w, EContactListEditor *editor);
-static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
-
-static gint app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-static gboolean table_drag_drop_cb (ETable *table, int row, int col, GdkDragContext *context,
-				    gint x, gint y, guint time, EContactListEditor *editor);
-static gboolean table_drag_motion_cb (ETable *table, int row, int col, GdkDragContext *context,
-				      gint x, gint y, guint time, EContactListEditor *editor);
-static void table_drag_data_received_cb (ETable *table, int row, int col,
-					 GdkDragContext *context,
-					 gint x, gint y,
-					 GtkSelectionData *selection_data, guint info, guint time,
-					 EContactListEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_list_editor_signals[LAST_SIGNAL];
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-
-static GtkTargetEntry 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]);
-
-/* 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;
-
-	editor->contact = NULL;
-	editor->changed = FALSE;
-	editor->image_set = 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");
-	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-list-editor", _("Contact List Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = 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);
-
-	g_signal_connect (editor->list_image,
-			  "changed", G_CALLBACK(list_image_changed_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)
-{
-	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
-list_image_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	editor->image_set = TRUE;
-	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 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 *image_data;
-		gsize image_data_len;
-		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);
-
-		g_list_foreach (email_list, (GFunc) g_free, NULL);
-		g_list_free (email_list);
-
-		if (editor->image_set
-		    && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (editor->list_image),
-						       &image_data,
-						       &image_data_len)) {
-			EContactPhoto photo;
-
-			photo.data = image_data;
-			photo.length = image_data_len;
-
-			e_contact_set (contact, E_CONTACT_LOGO, &photo);
-			g_free (image_data);
-		}
-		else {
-			e_contact_set (contact, E_CONTACT_LOGO, NULL);
-		}
-	}
-}
-
-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);
-			}
-		}
-
-		g_list_foreach (email_list, (GFunc) g_free, NULL);
-		g_list_free (email_list);
-
-		photo = e_contact_get (editor->contact, E_CONTACT_LOGO);
-		if (photo) {
-			e_image_chooser_set_image_data (E_IMAGE_CHOOSER (editor->list_image), photo->data, photo->length);
-			e_contact_photo_free (photo);
-		}
-	}
-}
-
-
-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 574f9a5b55..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,111 +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;
-
-	/* Whether we are editing a new contact or an existing one */
-	guint is_new_list : 1;
-
-	/* Whether the image chooser widget has been changed. */
-	guint image_set : 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 33a696261e..0000000000
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ /dev/null
@@ -1,745 +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 && *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 && *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 && *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 *qj;
-	EBookQuery *query = NULL;
-	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 > 1) {
-		char *s;
-		s = g_strdup_printf ("(or %s)", qj);
-		query = e_book_query_from_string (s);
-		g_free (s);
-	}
-	else if (p == 1) {
-		query = e_book_query_from_string (qj);
-	}
-	else {
-		query = NULL;
-	}
-
-	if (query)
-		e_book_async_get_contacts (book, query, query_cb, info);
-	else
-		query_cb (book, E_BOOK_ERROR_OK, NULL, info);
-
-	g_free (qj);
-	if (query)
-		e_book_query_unref (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 ed698e3340..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,691 +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) {
-		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, model->query, NULL, -1, 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);
-				return;
-			}
-		}
-		else
-			success = e_book_async_get_book_view (model->book, model->query, NULL, -1, book_view_loaded, model);
-
-	}
-}
-
-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);
-			model->writable_status_id =
-				g_signal_connect (model->book,
-						  "writable_status",
-						  G_CALLBACK (writable_status), model);
-			model->backend_died_id =
-				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 aec91ae329..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,358 +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)
-{
-#if 0
-	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;
-#endif
-
-	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 e94772d168..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,2215 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *         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 <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"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-
-#include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-sexp.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 contact_changed    (EABModel *model, gint index, EABView *eav);
-static void contact_removed    (EABModel *model, gint index, 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);
-
-static void make_suboptions             (EABView *view);
-static void query_changed               (ESearchBar *esb, EABView *view);
-static void search_activated            (ESearchBar *esb, EABView *view);
-static void connect_master_list_changed (EABView *view);
-static ECategoriesMasterList *get_master_list (void);
-
-#define PARENT_TYPE GTK_TYPE_VBOX
-static GtkVBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	PROP_0,
-	PROP_BOOK,
-	PROP_SOURCE,
-	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;
-
-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 }
-};
-
-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_SOURCE, 
-					 g_param_spec_object ("source",
-							      _("Source"),
-							      /*_( */"XXX blurb" /*)*/,
-							      E_TYPE_SOURCE,
-							      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->displayed_contact = -1;
-
-	eav->view_instance = NULL;
-	eav->view_menus = NULL;
-	eav->current_view = NULL;
-	eav->uic = NULL;
-
-	eav->book = NULL;
-	eav->source = 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->source) {
-		g_object_unref (eav->source);
-		eav->source = 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 (eav->ecml_changed_id != 0) {
-		g_signal_handler_disconnect (get_master_list(),
-					     eav->ecml_changed_id);
-		eav->ecml_changed_id = 0;
-	}
-
-	if (G_OBJECT_CLASS(parent_class)->dispose)
-		G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-static void
-set_paned_position (EABView *eav)
-{
-	GConfClient *gconf_client;
-	gint         pos;
-
-	/* XXX this should use the addressbook's global gconf client */
-	gconf_client = gconf_client_get_default ();
-	pos = gconf_client_get_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", NULL);
-	if (pos < 1)
-		pos = 144;
-
-	gtk_paned_set_position (GTK_PANED (eav->paned), pos);
-
-	g_object_unref (gconf_client);
-}
-
-static gboolean
-get_paned_position (EABView *eav)
-{
-	GConfClient *gconf_client;
-	gint pos;
-
-	/* XXX this should use the addressbook's global gconf client */
-	gconf_client = gconf_client_get_default ();
-
-	pos = gtk_paned_get_position (GTK_PANED (eav->paned));
-	gconf_client_set_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", pos, NULL);
-
-	g_object_unref (gconf_client);
-
-	return FALSE;
-}
-
-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);
-	g_signal_connect (eav->model, "contact_changed",
-			  G_CALLBACK (contact_changed), eav);
-	g_signal_connect (eav->model, "contact_removed",
-			  G_CALLBACK (contact_removed), eav);
-
-	eav->editable = FALSE;
-	eav->query = g_strdup (SHOW_ALL_SEARCH);
-
-	/* create our search bar */
-	eav->search = E_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));
-	make_suboptions (eav);
-	connect_master_list_changed (eav);
-	g_signal_connect (eav->search, "query_changed",
-			  G_CALLBACK (query_changed), eav);
-	g_signal_connect (eav->search, "search_activated",
-			  G_CALLBACK (search_activated), eav);
-	gtk_box_pack_start (GTK_BOX (eav), GTK_WIDGET (eav->search), FALSE, FALSE, 0);
-	gtk_widget_show (GTK_WIDGET (eav->search));
-	gtk_widget_set_sensitive (GTK_WIDGET (eav->search), FALSE);
-
-	/* create the paned window and contact display */
-	eav->paned = gtk_vpaned_new ();
-	gtk_box_pack_start (GTK_BOX (eav), eav->paned, TRUE, TRUE, 0);
-	g_signal_connect_swapped (eav->paned, "button_release_event",
-				  G_CALLBACK (get_paned_position), eav);
-
-	eav->widget = gtk_label_new ("empty label here");
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->widget);
-	gtk_widget_show (eav->widget);
-
-	eav->contact_display = eab_contact_display_new ();
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->contact_display);
-	gtk_widget_show (eav->contact_display);
-
-	gtk_widget_show (eav->paned);
-
-	/* 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, _("Address Book"));
-
-		galview = gnome_util_prepend_user_home("/.evolution/addressbook/views");
-		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
-set_view_preview (EABView *view)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	gboolean state;
-
-	gconf_client = gconf_client_get_default();
-	state = gconf_client_get_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", NULL);
-	bonobo_ui_component_set_prop (view->uic,
-				      "/commands/ContactsViewPreview",
-				      "state",
-				      state ? "1" : "0", NULL);
-	
-	g_object_unref (gconf_client);
-}
-
-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;
-
-	set_paned_position (address_view);
-	set_view_preview (address_view);
-}
-
-static void
-view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	EABView *view = EAB_VIEW (data);
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	gconf_client = gconf_client_get_default();
-	gconf_client_set_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", state[0] != '0', NULL);
-
-	eab_view_show_contact_preview(view, state[0] != '0');
-
-	g_object_unref (gconf_client);
-}
-
-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);
-	}
-
-	bonobo_ui_component_add_listener(view->uic, "ContactsViewPreview", view_preview, view);
-
-	set_view_preview (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);
-			gtk_widget_set_sensitive (GTK_WIDGET (eav->search), TRUE);
-		}
-		else {
-			eav->book = NULL;
-			gtk_widget_set_sensitive (GTK_WIDGET (eav->search), FALSE);
-		}
-
-		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_SOURCE:
-		if (eav->source) {
-			g_warning ("EABView at present does not support multiple writes on the \"source\" property.");
-			break;
-		}
-		else {
-			if (g_value_get_object (value)) {
-				eav->source = E_SOURCE(g_value_get_object (value));
-				g_object_ref (eav->source);
-			}
-			else {
-				eav->source = NULL;
-			}
-		}
-	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_SOURCE:
-		if (eav->source)
-			g_value_set_object (value, eav->source);
-		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,
-							     contact,
-							     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_("Address Book 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 Address Book..."), G_CALLBACK(copy_to_folder), POPUP_NOSELECTION_MASK), 
-		E_POPUP_ITEM (N_("Move to Address Book..."), 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);
-
-	view->displayed_contact = 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 {
-		view->displayed_contact = -1;
-		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
-contact_changed (EABModel *model, gint index, EABView *eav)
-{
-	if (eav->displayed_contact == index) {
-		/* if the contact that's presently displayed is changed, re-render it */
-		render_contact (index, eav);
-	}
-}
-
-static void
-contact_removed (EABModel *model, gint index, EABView *eav)
-{
-	if (eav->displayed_contact == index) {
-		/* if the contact that's presently displayed is changed, clear the display */
-		eab_contact_display_render (EAB_CONTACT_DISPLAY (eav->contact_display), NULL,
-					    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
-		eav->displayed_contact = -1;
-	}
-}
-
-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);
-}
-
-
-
-static void
-search_activated (ESearchBar *esb, EABView *v)
-{
-	ECategoriesMasterList *master_list;
-	char *search_word, *search_query;
-	const char *category_name;
-	int search_type, subid;
-
-	g_message ("in search_activated");
-
-	g_object_get(esb,
-		     "text", &search_word,
-		     "item_id", &search_type,
-		     NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(eab_search_dialog_new(v));
-	}
-	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 (v,
-				      "query", search_query,
-				      NULL);
-
-		g_free (search_query);
-	}
-
-	g_free (search_word);
-}
-
-static void
-query_changed (ESearchBar *esb, EABView *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));
-	}
-}
-
-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 (EABView *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, EABView *view)
-{
-	make_suboptions (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
-connect_master_list_changed (EABView *view)
-{
-	view->ecml_changed_id =
-		g_signal_connect (get_master_list(), "changed",
-				  G_CALLBACK (ecml_changed), 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_show_contact_preview (EABView *view, gboolean show)
-{
-	g_return_if_fail (view && E_IS_ADDRESSBOOK_VIEW (view));
-
-	if (show)
-		gtk_widget_show (view->scrolled);
-	else
-		gtk_widget_hide (view->scrolled);
-}
-
-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);
-
-	/* XXX toshok - yeah this really doesn't belong here, but it
-	   needs to happen at the same time and takes the uic */
-	e_search_bar_set_ui_component (view->search, uic);
-}
-
-/**
- * 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 {
-		GList *contact_list;
-		GList *l;
-		char *str = NULL;
-
-		if (selection_data->data [selection_data->length - 1] != 0) {
-			str = g_malloc0 (selection_data->length + 1);
-			memcpy (str, selection_data->data, selection_data->length);
-			contact_list = eab_contact_list_from_string (str);
-		} else
-			contact_list = eab_contact_list_from_string (selection_data->data);
-		
-		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);
-		g_free (str);
-	}
-}
-
-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 c90356beee..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,155 +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/gtkvbox.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"
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.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
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	EABViewType view_type;
-
-	EABModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_contacts;
-
-	EBook *book;
-	ESource *source;
-	char  *query;
-	guint editable : 1;
-
-	gint displayed_contact;
-
-	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;
-
-	/* the search bar and related machinery */
-	ESearchBar *search;
-	gint        ecml_changed_id;
-
-};
-
-struct _EABViewClass
-{
-	GtkVBoxClass 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_show_contact_preview (EABView *view, gboolean show);
-
-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 e0fe15dc17..0000000000
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ /dev/null
@@ -1,584 +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>
-#include <gtk/gtkscrolledwindow.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 HEADER_COLOR      "#7f7f7f"
-#define IMAGE_COL_WIDTH   "20"
-#define CONTACT_LIST_ICON "contact-list-16.png"
-#define AIM_ICON          "im-aim.png"
-#define ICQ_ICON          "im-icq.png"
-#define JABBER_ICON       "im-jabber.png"
-#define MSN_ICON          "im-msn.png"
-#define YAHOO_ICON        "im-yahoo.png"
-#define VIDEOCONF_ICON    "videoconf.png"
-
-#define MAX_COMPACT_IMAGE_DIMENSION 48
-
-static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  EABContactDisplay *display)
-{
-	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);
-
-		gtk_html_stream_write (handle, photo->data, photo->length);
-
-		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-	}
-	else if (!strncmp (url, "evo-icon:", strlen ("evo-icon:"))) {
-		gchar *data;
-		gsize data_length;
-		char *filename;
-
-		/* make sure people can't embed ../../../../../../etc/passwd or something */
-		if (!strchr (url, '/')) {
-			filename = g_build_filename (EVOLUTION_IMAGESDIR, url + strlen ("evo-icon:"), NULL);
-
-			if (g_file_get_contents (filename, &data, &data_length, NULL))
-				gtk_html_stream_write (handle, data, data_length);
-
-			gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-
-			g_free (filename);
-			g_free (data);
-		}
-	}
-}
-
-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, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
-
-		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, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
-
-		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, "</td></tr>");
-	}
-	if (adr)
-		e_contact_address_free (adr);
-}
-
-static void
-render_name_value (GtkHTMLStream *html_stream, const char *label, const char *str, const char *icon, unsigned int html_flags)
-{
-	char *value = e_text_to_html (str, html_flags);
-
-	gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-	if (icon)
-		gtk_html_stream_printf (html_stream, "<img width=\"16\" height=\"16\" src=\"evo-icon:%s\">", icon);
-	gtk_html_stream_printf (html_stream, "</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">%s</td></tr>", label, value);
-
-	g_free (value);
-}
-
-static void
-render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
-{
-	const char *str;
-
-	str = e_contact_get_const (contact, field);
-
-	if (str && *str) {
-		render_name_value (html_stream, html_label, str, icon, html_flags);
-	}
-}
-
-static void
-render_contact_list (GtkHTMLStream *html_stream, EContact *contact)
-{
-	GList *email_list;
-	GList *l;
-
-	gtk_html_stream_printf (html_stream, "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>");
-	gtk_html_stream_printf (html_stream, "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
-	gtk_html_stream_printf (html_stream, "<img width=\"16\" height=\"16\" src=\"evo-icon:" CONTACT_LIST_ICON "\">");
-	gtk_html_stream_printf (html_stream, "</td><td valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td> <td valign=\"top\">", _("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, E_TEXT_TO_HTML_CONVERT_ADDRESSES);
-			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>");
-}
-
-static void
-start_block (GtkHTMLStream *html_stream, const char *label)
-{
-	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\" colspan=\"3\"><font color=" HEADER_COLOR "><b>%s</b></font></td></tr>", label);
-}
-
-static void
-end_block (GtkHTMLStream *html_stream)
-{
-	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\">&nbsp;</td></tr>");
-}
-
-static void
-render_contact (GtkHTMLStream *html_stream, EContact *contact)
-{
-	GString *emails;
-	const char *e;
-	char *nl;
-
-	gtk_html_stream_printf (html_stream, "<table border=\"0\">");
-
-	start_block (html_stream, "");
-
-	emails = g_string_new ("");
-	nl = "";
-	e = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
-	if (e) {
-		g_string_append_printf (emails, "%s", e);
-		nl = "\n";
-	}
-	e = e_contact_get_const (contact, E_CONTACT_EMAIL_2);
-	if (e) {
-		g_string_append_printf (emails, "%s%s", nl, e);
-		nl = "\n";
-	}
-	e = e_contact_get_const (contact, E_CONTACT_EMAIL_3);
-	if (e) {
-		g_string_append_printf (emails, "%s%s", nl, e);
-	}
-
-	render_name_value (html_stream, _("E-mail"), emails->str, NULL, E_TEXT_TO_HTML_CONVERT_ADDRESSES | E_TEXT_TO_HTML_CONVERT_NL);
-	g_string_free (emails, TRUE);
-
-	end_block (html_stream);
-
-	start_block (html_stream, _("work"));
-
-	render_attribute (html_stream, contact, _("Organization"), E_CONTACT_ORG, NULL, 0);
-	render_attribute (html_stream, contact, _("Position"), E_CONTACT_TITLE, NULL, 0);
-	render_attribute (html_stream, contact, _("ICQ"), E_CONTACT_IM_ICQ_WORK_1, ICQ_ICON, 0);
-	render_attribute (html_stream, contact, _("AIM"), E_CONTACT_IM_AIM_WORK_1, AIM_ICON, 0);
-	render_attribute (html_stream, contact, _("MSN"), E_CONTACT_IM_MSN_WORK_1, MSN_ICON, 0);
-	render_attribute (html_stream, contact, _("Yahoo"), E_CONTACT_IM_YAHOO_WORK_1, YAHOO_ICON, 0);
-	render_attribute (html_stream, contact, _("Jabber"), E_CONTACT_IM_JABBER_WORK_1, JABBER_ICON, 0);
-	render_attribute (html_stream, contact, _("Video Conferencing"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS);
-	render_attribute (html_stream, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0);
-	render_attribute (html_stream, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0);
-	render_address   (html_stream, contact, _("Address"), E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_LABEL_WORK);
-
-	end_block (html_stream);
-
-	start_block (html_stream, _("personal"));
-
-	render_attribute (html_stream, contact, _("ICQ"), E_CONTACT_IM_ICQ_HOME_1, ICQ_ICON, 0);
-	render_attribute (html_stream, contact, _("AIM"), E_CONTACT_IM_AIM_HOME_1, AIM_ICON, 0);
-	render_attribute (html_stream, contact, _("MSN"), E_CONTACT_IM_MSN_HOME_1, MSN_ICON, 0);
-	render_attribute (html_stream, contact, _("Yahoo"), E_CONTACT_IM_YAHOO_HOME_1, YAHOO_ICON, 0);
-	render_attribute (html_stream, contact, _("Jabber"), E_CONTACT_IM_JABBER_HOME_1, JABBER_ICON, 0);
-
-	render_attribute (html_stream, contact, _("WWW"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-	render_attribute (html_stream, contact, _("Blog"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-
-	render_address   (html_stream, contact, _("Address"), E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_LABEL_HOME);
-
-	end_block (html_stream);
-
-	start_block (html_stream, "");
-
-	render_attribute (html_stream, contact, _("Note"), E_CONTACT_NOTE, NULL, E_TEXT_TO_HTML_CONVERT_ADDRESSES | E_TEXT_TO_HTML_CONVERT_URLS | E_TEXT_TO_HTML_CONVERT_NL);
-	end_block (html_stream);
-
-	gtk_html_stream_printf (html_stream, "</table>");
-}
-
-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 cellspacing=\"20\" border=\"0\"><td valign=\"top\">");
-		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 border=\"1\" src=\"internal-contact-photo:\">");
-			e_contact_photo_free (photo);
-		}
-		
-		gtk_html_stream_printf (html_stream, "</td><td valign=\"top\">\n");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (!str)
-			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))
-			render_contact_list (html_stream, contact);
-		else
-			render_contact (html_stream, contact);
-
-		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 valign=\"top\">"
-					"<table width=\"100%%\" cellpadding=0 cellspacing=0 bgcolor=\"#eeeeee\">"
-					"<tr><td valign=\"top\">"
-					"<table>"
-					"<tr><td valign=\"top\">");
-
-		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 valign=\"top\">\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><td valign=\"top\">");
-			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;
-	GtkWidget *scrolled_window;
-
-	display = g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
-	
-	display->priv = g_new0 (EABContactDisplayPrivate, 1);
-
-	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);
-
-	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_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (display->priv->html));
-
-	gtk_box_pack_start_defaults (GTK_BOX (display), scrolled_window);
-	gtk_widget_show_all (scrolled_window);
-
-	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 1a5d06f2a2..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ /dev/null
@@ -1,885 +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 "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-source-selector.h"
-
-#include <gnome.h>
-
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-#include "addressbook/gui/component/addressbook-component.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_("Address Book 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;
-}
-
-static void
-source_selection_changed_cb (GtkWidget *selector, GtkWidget *ok_button)
-{
-	gtk_widget_set_sensitive (ok_button,
-				  e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector)) ?
-				  TRUE : FALSE);
-}
-
-ESource *
-eab_select_source (const gchar *title, const gchar *message, const gchar *select_uid, GtkWindow *parent)
-{
-	ESource *source;
-	ESourceList *source_list;
-	GtkWidget *dialog;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-	GtkWidget *label;
-	GtkWidget *selector;
-	GtkWidget *scrolled_window;
-	gint response;
-
-	source_list = addressbook_component_peek_source_list (addressbook_component_peek ());
-
-	dialog = gtk_dialog_new_with_buttons (title, parent,
-					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					      NULL);
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 200, 350);
-
-	cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-	ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
-	gtk_widget_set_sensitive (ok_button, FALSE);
-
-	label = gtk_label_new (message);
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	g_signal_connect (selector, "primary_selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), ok_button);
-
-	if (select_uid) {
-		source = e_source_list_peek_source_by_uid (source_list, select_uid);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), source);
-	}
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
-	gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
-
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scrolled_window, TRUE, TRUE, 4);
-
-	gtk_widget_show_all (dialog);
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-	if (response == GTK_RESPONSE_ACCEPT)
-		source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (selector));
-	else
-		source = NULL;
-
-	gtk_widget_destroy (dialog);
-	return source;
-}
-
-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)
-{
-	EBook *dest;
-	ESource *destination_source;
-	static char *last_uid = NULL;
-	ContactCopyProcess *process;
-	char *desc;
-
-	if (contacts == NULL)
-		return;
-
-	if (last_uid == NULL)
-		last_uid = 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");
-	}
-
-	destination_source = eab_select_source (desc, _("Select target addressbook."),
-						last_uid, parent_window);
-
-	if (!destination_source)
-		return;
-
-	if (strcmp (last_uid, e_source_peek_uid (destination_source)) != 0) {
-		g_free (last_uid);
-		last_uid = g_strdup (e_source_peek_uid (destination_source));
-	}
-
-	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_source (dest, destination_source, got_book_cb, process);
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
-
-void
-eab_send_contact_list (GList *contacts, EABDisposition disposition)
-{
-	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);
-			GList *emails = e_contact_get (contact, E_CONTACT_EMAIL);
-			if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-				gint len = g_list_length (emails);
-				if (e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES))
-					to_length += len;
-				else
-					bcc_length += len;
-			} else {
-				if (emails != NULL)
-					++to_length;
-			}
-			g_list_foreach (emails, (GFunc)g_free, NULL);
-			g_list_free (emails);
-		}
-
-		/* Now I have to make a CORBA sequences that represents a recipient list with
-		   the right number of entries, for the contacts. */
-		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 (contacts != NULL) {
-			EContact *contact = contacts->data;
-			gchar *name, *addr;
-			gboolean is_list, is_hidden;
-			GNOME_Evolution_Composer_Recipient *recipient;
-			GList *emails = e_contact_get (contact, E_CONTACT_EMAIL);
-			GList *iterator;
-
-			if (emails != NULL) {
-
-				is_list = (gboolean)e_contact_get (contact, E_CONTACT_IS_LIST);
-				is_hidden = is_list && !e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES);
-			
-				for (iterator = emails; iterator; iterator = iterator->next) {
-					
-					if (is_hidden) {
-						recipient = &(bcc_list->_buffer[bcc_i]);
-						++bcc_i;
-					} else {
-						recipient = &(to_list->_buffer[to_i]);
-						++to_i;
-					}
-					
-					name = NULL;
-					addr = NULL;
-					if (iterator && iterator->data) {
-						if (is_list) {
-							/* We need to decode the list entries, which are XMLified EABDestinations. */
-							EABDestination *dest = eab_destination_import ((char*)iterator->data);
-							if (dest != NULL) {
-								name = g_strdup (eab_destination_get_name (dest));
-								addr = g_strdup (eab_destination_get_email (dest));
-								g_object_unref (dest);
-							}
-							
-						} else { /* is just a plain old card */
-							EContactName *contact_name = e_contact_get (contact, E_CONTACT_NAME);
-							if (contact_name) {
-								name = e_contact_name_to_string (contact_name);
-								e_contact_name_free (contact_name);
-							}
-							addr = g_strdup ((char *) iterator->data);
-						}
-					}
-					
-					recipient->name    = CORBA_string_dup (name ? name : "");
-					recipient->address = CORBA_string_dup (addr ? 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_list_foreach (emails, (GFunc)g_free, NULL);
-				g_list_free (emails);
-			}
-
-			contacts = g_list_next (contacts);
-		}
-
-		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 (contacts->next) {
-			description = CORBA_string_dup (_("Multiple VCards"));
-		} else {
-			char *file_as = e_contact_get (E_CONTACT (contacts->data), E_CONTACT_FILE_AS);
-			tempstr = g_strdup_printf (_("VCard for %s"), file_as);
-			description = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-			g_free (file_as);
-		}
-
-		show_inline = FALSE;
-
-		tempstr = eab_contact_list_to_string (contacts);
-		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 (!contacts || contacts->next) {
-			subject = CORBA_string_dup ("Contact information");
-		} else {
-			EContact *contact = contacts->data;
-			const gchar *tempstr2;
-
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-			if (!tempstr2 || !*tempstr2)
-				tempstr2 = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-			if (!tempstr2 || !*tempstr2)
-				tempstr2 = e_contact_get_const (contact, E_CONTACT_ORG);
-			if (!tempstr2 || !*tempstr2)
-				tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
-			if (!tempstr2 || !*tempstr2)
-				tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_2);
-			if (!tempstr2 || !*tempstr2)
-				tempstr2 = e_contact_get_const (contact, E_CONTACT_EMAIL_3);
-
-			if (!tempstr2 || !*tempstr2)
-				tempstr = g_strdup_printf ("Contact information");
-			else
-				tempstr = g_strdup_printf ("Contact information for %s", tempstr2);
-			subject = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-		}
-		
-		GNOME_Evolution_Composer_setHeaders (composer_server, "", to_list, cc_list, bcc_list, subject, &ev);
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-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);
-}
-
-GtkWidget *
-eab_create_image_chooser_widget(gchar *name,
-				gchar *string1, gchar *string2,
-				gint int1, gint int2)
-{
-	char *filename;
-	GtkWidget *w = NULL;
-	if (string1) {
-		if (*string1 == '/')
-			filename = g_strdup(string1);
-		else
-			filename = g_build_filename (EVOLUTION_IMAGESDIR, string1, NULL);
-
-		w = e_image_chooser_new ();
-		e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename);
-
-		gtk_widget_show_all (w);
-		g_free (filename);
-	}
-
-	return w;
-}
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
deleted file mode 100644
index 5f96bc740c..0000000000
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ /dev/null
@@ -1,76 +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);
-
-GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
-
-
-ESource            *eab_select_source             (const gchar *title, const gchar *message,
-						   const gchar *select_uid, GtkWindow *parent);
-
-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 b7c635b089..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 Address Book..."));
-	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/importers/.cvsignore b/addressbook/importers/.cvsignore
deleted file mode 100644
index 665a07cc24..0000000000
--- a/addressbook/importers/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-GNOME_Evolution_Addressbook*.server
-GNOME_Evolution_Addressbook*.server.in
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
deleted file mode 100644
index f397674fd3..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-ldif-importer.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 LDIF importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution LDIF importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
deleted file mode 100644
index 1d434fbab9..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-vcard-importer.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 VCard importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution VCard Importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
deleted file mode 100644
index 3c04c22f37..0000000000
--- a/addressbook/importers/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-importersdir = $(privlibdir)/evolution-addressbook-importers
-
-importers_LTLIBRARIES = 				\
-	libevolution-addressbook-ldif-importer.la	\
-	libevolution-addressbook-vcard-importer.la
-
-INCLUDES = 						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-# VCard Importer
-libevolution_addressbook_vcard_importer_la_SOURCES =	\
-	evolution-vcard-importer.c
-
-libevolution_addressbook_vcard_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_vcard_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(IMPORTERS_LIBS)
-
-# LDIF Importer
-libevolution_addressbook_ldif_importer_la_SOURCES =	\
-	evolution-ldif-importer.c
-
-libevolution_addressbook_ldif_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_ldif_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(IMPORTERS_LIBS)
-
-server_in_files = 						\
-	GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in	\
-	GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
deleted file mode 100644
index 77babb95a5..0000000000
--- a/addressbook/importers/evolution-ldif-importer.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * LDIF importer.  LDIF is the file format of an exported Netscape
- * addressbook.
- *
- * Framework copied from evolution-gnomecard-importer.c
- *
- * Michael M. Morrison (mmorrison@kqcorp.com)
- *
- * Multi-line value support, mailing list support, base64 support, and
- * various fixups: Chris Toshok (toshok@ximian.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-init.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-control.h>
-
-#include <libebook/e-book.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include <widgets/misc/e-source-selector.h>
-#include <util/eab-destination.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
-
-static GHashTable *dn_contact_hash;
-
-typedef struct {
-	ESource *primary;
-	
-	GList *contactlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} LDIFImporter;
-
-static struct {
-	char *ldif_attribute;
-	EContactField contact_field;
-#define FLAG_ADDRESS 0x01
-	int flags;
-}
-ldif_fields[] = {
-	{ "cn", E_CONTACT_FULL_NAME },
-	{ "mail", E_CONTACT_EMAIL },
-#if 0
-	{ "givenname", E_CONTACT_GIVEN_NAME },
-#endif
-	{ "sn", E_CONTACT_FAMILY_NAME },
-	{ "xmozillanickname", E_CONTACT_NICKNAME },
-	{ "o", E_CONTACT_ORG },
-	{ "locality", 0, FLAG_ADDRESS},
-	{ "st", 0, FLAG_ADDRESS },
-	{ "streetaddress", 0, FLAG_ADDRESS },
-	{ "title", E_CONTACT_TITLE },
-	{ "postalcode", 0, FLAG_ADDRESS },
-	{ "countryname", 0, FLAG_ADDRESS },
-	{ "telephonenumber", E_CONTACT_PHONE_BUSINESS},
-	{ "homephone", E_CONTACT_PHONE_HOME },
-	{ "facsimiletelephonenumber", E_CONTACT_PHONE_BUSINESS_FAX },
-	{ "ou", E_CONTACT_ORG_UNIT },
-	{ "pagerphone", E_CONTACT_PHONE_PAGER },
-	{ "cellphone", E_CONTACT_PHONE_MOBILE },
-	{ "homeurl", E_CONTACT_HOMEPAGE_URL },
-	{ "description", E_CONTACT_NOTE },
-	{ "xmozillausehtmlmail", E_CONTACT_WANTS_HTML }
-};
-static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]);
-
-static unsigned char base64_rank[256] = {
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,
-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-};
-
-/**
- * base64_decode_step: decode a chunk of base64 encoded data
- * @in: input stream
- * @len: max length of data to decode
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- *
- * Decodes a chunk of base64 encoded data
- **/
-static int
-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	register unsigned int v;
-	int i;
-
-	inend = in+len;
-	outptr = out;
-
-	/* convert 4 base64 bytes to 3 normal bytes */
-	v=*save;
-	i=*state;
-	inptr = in;
-	while (inptr<inend) {
-		c = base64_rank[*inptr++];
-		if (c != 0xff) {
-			v = (v<<6) | c;
-			i++;
-			if (i==4) {
-				*outptr++ = v>>16;
-				*outptr++ = v>>8;
-				*outptr++ = v;
-				i=0;
-			}
-		}
-	}
-
-	*save = v;
-	*state = i;
-
-	/* quick scan back for '=' on the end somewhere */
-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */
-	i=2;
-	while (inptr>in && i) {
-		inptr--;
-		if (base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-static int
-base64_decode_simple (char *data, int len)
-{
-	int state = 0;
-	unsigned int save = 0;
-
-	return base64_decode_step ((unsigned char *)data, len,
-				   (unsigned char *)data, &state, &save);
-}
-
-static GString *
-getValue( char **src )
-{
-	GString *dest = g_string_new("");
-	char *s = *src;
-	gboolean need_base64 = (*s == ':');
-
- copy_line:
-	while( *s != 0 && *s != '\n' && *s != '\r' )
-		dest = g_string_append_c (dest, *s++);
-
-	if (*s == '\r') s++;
-	if (*s == '\n')	s++;
-
-	/* check for continuation here */
-	if (*s == ' ') {
-		s++;
-		goto copy_line;
-	}
-
-	if (need_base64) {
-		int new_len;
-		/* it's base64 encoded */
-		dest = g_string_erase (dest, 0, 2);
-		new_len = base64_decode_simple (dest->str, strlen (dest->str));
-		dest = g_string_truncate (dest, new_len);
-	}
-
-	*src = s;
-
-	return dest;
-}
-
-static gboolean
-parseLine (EContact *contact, EContactAddress *address, char **buf)
-{
-	char *ptr;
-	char *colon, *value;
-	gboolean field_handled;
-	GString *ldif_value;
-
-	ptr = *buf;
-
-	/* if the string is empty, return */
-	if (*ptr == '\0') {
-		*buf = NULL;
-		return TRUE;
-	}
-
-	/* skip comment lines */
-	if (*ptr == '#') {
-		ptr = strchr (ptr, '\n');
-		if (!ptr)
-			*buf = NULL;
-		else
-			*buf = ptr + 1;
-		return TRUE;
-	}
-
-	/* first, check for a 'continuation' line */
-	if( ptr[0] == ' ' && ptr[1] != '\n' ) {
-		g_warning ("unexpected continuation line");
-		return FALSE;
-	}
-
-	colon = (char *)strchr( ptr, ':' );
-	if (colon) {
-		int i;
-
-		*colon = 0;
-		value = colon + 1;
-		while ( isspace(*value) )
-			value++;
-
-		ldif_value = getValue(&value );
-
-		field_handled = FALSE;
-		for (i = 0; i < num_ldif_fields; i ++) {
-			if (!g_ascii_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
-				if (ldif_fields[i].flags & FLAG_ADDRESS) {
-					if (!g_ascii_strcasecmp (ptr, "locality"))
-						address->locality = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "countryname"))
-						address->country = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "postalcode"))
-						address->code = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "st"))
-						address->region = g_strdup (ldif_value->str);
-					else if (!g_ascii_strcasecmp (ptr, "streetaddress"))
-						address->street = g_strdup (ldif_value->str);
-				}
-				else {
-					/* FIXME is everything a string? */
-					e_contact_set (contact, ldif_fields[i].contact_field, ldif_value->str);
-					g_message ("set %s to %s", ptr, ldif_value->str);
-				}
-				field_handled = TRUE;
-				break;
-			}
-		}
-
-		/* handle objectclass/dn/member out here */
-		if (!field_handled) {
-			if (!g_ascii_strcasecmp (ptr, "dn"))
-				g_hash_table_insert (dn_contact_hash, g_strdup(ldif_value->str), contact);
-			else if (!g_ascii_strcasecmp (ptr, "objectclass") && !g_ascii_strcasecmp (ldif_value->str, "groupofnames")) {
-				e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
-			}
-			else if (!g_ascii_strcasecmp (ptr, "member")) {
-				GList *email;
-
-				email = e_contact_get (contact, E_CONTACT_EMAIL);
-				email = g_list_append (email, g_strdup (ldif_value->str));
-				e_contact_set (contact, E_CONTACT_EMAIL, email);
-
-				g_list_foreach (email, (GFunc) g_free, NULL);
-				g_list_free (email);
-			}
-		}
-
-		/* put the colon back the way it was, just for kicks */
-		*colon = ':';
-
-		g_string_free (ldif_value, TRUE);
-	}
-	else {
-		g_warning ("unrecognized entry %s", ptr);
-		return FALSE;
-	}
-
-	*buf = value;
-
-	return TRUE;
-}
-
-static EContact *
-getNextLDIFEntry( FILE *f )
-{
-	EContact *contact;
-	EContactAddress *address;
-	GString *str;
-	char line[1024];
-	char *buf;
-
-	str = g_string_new ("");
-	/* read from the file until we get to a blank line (or eof) */
-	while (!feof (f)) {
-		if (!fgets (line, sizeof(line), f))
-			break;
-		if (line[0] == '\n' || (line[0] == '\r' && line[1] == '\n'))
-			break;
-		str = g_string_append (str, line);
-	}
-
-	if (strlen (str->str) == 0) {
-		g_string_free (str, TRUE);
-		return NULL;
-	}
-
-	/* now parse that entry */
-	contact = e_contact_new ();
-	address = g_new0 (EContactAddress, 1);
-
-	buf = str->str;
-	while (buf) {
-		if (!parseLine (contact, address, &buf)) {
-			/* parsing error */
-			g_object_unref (contact);
-			return NULL;
-		}
-	}
-
-	/* fill in the address */
-	if (address->locality || address->country ||
-	    address->code || address->region || address->street)
-		e_contact_set (contact, E_CONTACT_ADDRESS_HOME, address);
-
-	g_string_free (str, TRUE);
-
-	return contact;
-}
-
-static void
-resolve_list_card (LDIFImporter *gci, EContact *contact)
-{
-	GList *email, *l, *new_email = NULL;
-	char *full_name;
-
-	/* set file_as to full_name so we don't later try and figure
-           out a first/last name for the list. */
-	full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
-	if (full_name)
-		e_contact_set (contact, E_CONTACT_FILE_AS, full_name);
-	g_free (full_name);
-
-	/* FIMXE getting might not be implemented in ebook */
-	email = e_contact_get (contact, E_CONTACT_EMAIL);
-	for (l = email; l; l = l->next) {
-		/* mozilla stuffs dn's in the EMAIL list for contact lists */
-		char *dn = l->data;
-		EContact *dn_contact = g_hash_table_lookup (dn_contact_hash, dn);
-
-		/* break list chains here, since we don't support them just yet */
-		if (dn_contact && !e_contact_get (dn_contact, E_CONTACT_IS_LIST)) {
-			EABDestination *dest;
-			gchar *dest_xml;
-
-			/* Hard-wired for default e-mail, since netscape only exports 1 email address */
-			dest = eab_destination_new ();
-			eab_destination_set_contact (dest, dn_contact, 0);
-			dest_xml = eab_destination_export (dest);
-			g_object_unref (dest);
-
-			if (dest_xml) {
-				new_email = g_list_append (new_email, dest_xml);
-			}
-		}
-	}		
-	e_contact_set (contact, E_CONTACT_EMAIL, new_email);
-
-	g_list_foreach (email, (GFunc) g_free, NULL);
-	g_list_free (email);
-	g_list_foreach (new_email, (GFunc) g_free, NULL);
-	g_list_free (new_email);
-}
-
-static GList *
-create_contacts_from_ldif (const char *filename)
-{
-	GList * list = NULL;
-	GList * list_list = NULL;
-	FILE * file;
-	EContact *contact;
-
-	if(!( file = fopen( filename, "r" ) )) {
-		g_warning("Can't open .ldif file");
-		return NULL;
-	}
-
-	dn_contact_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	while ((contact = getNextLDIFEntry (file))) {
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			list_list = g_list_append (list_list, contact);
-		else
-			list = g_list_append (list, contact);
-	}
-
-	fclose (file);
-
-	list = g_list_reverse (list);
-	list_list = g_list_reverse (list_list);
-	list = g_list_concat (list, list_list);
-
-	return list;
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	EContact *contact;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-
-	contact = gci->iterator->data;
-	if (e_contact_get (contact, E_CONTACT_IS_LIST))
-		resolve_list_card (gci, contact);
-	/* FIXME Error checking */
-	e_book_add_contact (gci->book, contact, NULL);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
-{
-	LDIFImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
-}
-
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
-{
-	LDIFImporter *gci = closure;
-	GtkWidget *vbox, *selector;
-	ESource *primary;
-	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
-	/* FIXME Better error handling */
-	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
-	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
-	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
-
-	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
-}
-
-static char *supported_extensions[2] = {
-	".ldif", NULL
-};
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return FALSE;
-	}
-
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
-{
-	LDIFImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
-
-	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
-	g_list_free (gci->contactlist);
-
-	g_free (gci);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	LDIFImporter *gci;
-
-	gci = (LDIFImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-
-	/* Load the book and the cards */
-	gci->book = e_book_new ();
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
-	}
-	e_book_load_source (gci->book, gci->primary, TRUE, NULL);
-	gci->contactlist = create_contacts_from_ldif (filename);
-	gci->ready = TRUE;
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	LDIFImporter *gci;
-
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (LDIFImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-	
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution LDIF importer Factory", factory_fn, NULL)
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
deleted file mode 100644
index f6fab08983..0000000000
--- a/addressbook/importers/evolution-vcard-importer.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Copyright (C) 2004  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>
- *          JP Rosevear <jpr@ximian.com>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtknotebook.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-control.h>
-
-
-#include <libebook/e-book.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-#include <widgets/misc/e-source-selector.h>
-#include <util/eab-book-util.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
-
-typedef struct {
-	ESource *primary;
-	
-	GList *contactlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} VCardImporter;
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-	EContact *contact;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-	
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-	
-	contact = gci->iterator->data;
-	/* FIXME Error checking */
-	e_book_add_contact (gci->book, contact, NULL);
-	
-	gci->iterator = gci->iterator->next;
-	
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[3] = {
-	".vcf",
-	".gcrd",
-	NULL
-};
-
-/* Actually check the contents of this file */
-static gboolean
-check_file_is_vcard (const char *filename)
-{
-	FILE *handle;
-	char line[4096];
-	gboolean result;
-
-	handle = fopen (filename, "r");
-	if (handle == NULL) {
-		g_print ("\n");
-		return FALSE;
-	}
-		
-	fgets (line, 4096, handle);
-	if (line == NULL) {
-		fclose (handle);
-		g_print ("\n");
-		return FALSE;
-	}
-
-	if (g_ascii_strncasecmp (line, "BEGIN:VCARD", 11) == 0) {
-		result = TRUE;
-	} else {
-		result = FALSE;
-	}
-
-	fclose (handle);
-	return result;
-}
-
-static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
-{
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
-}
-
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
-{
-	VCardImporter *gci = closure;
-	GtkWidget *vbox, *selector;
-	ESource *primary;
-	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
-	/* FIXME Better error handling */
-	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
-
-	selector = e_source_selector_new (source_list);
-	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
-	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
-	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
-
-	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
-}
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return check_file_is_vcard (filename);
-	}
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (g_ascii_strcasecmp (supported_extensions[i], ext) == 0)
-			return check_file_is_vcard (filename);
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
-{
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
-
-	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
-	g_list_free (gci->contactlist);
-
-	g_free (gci);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	VCardImporter *gci;
-	char *contents;
-	
-	if (check_file_is_vcard (filename) == FALSE) {
-		return FALSE;
-	}
-
-	gci = (VCardImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	
-	/* Load the book */
-	gci->book = e_book_new ();
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
-	}
-	e_book_load_source (gci->book, gci->primary, TRUE, NULL);
-
-	/* Load the file and the contacts */
-	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
-		g_message (G_STRLOC ":Couldn't read file.");
-		return FALSE;
-	}	
-	gci->contactlist = eab_contact_list_from_string (contents);
-	g_free (contents);
-
-	gci->ready = TRUE;
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	VCardImporter *gci;
-
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (VCardImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
-}
-
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution VCard Importer Factory", factory_fn, NULL)
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 8966504f28..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1111 +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;
-	EBookQuery *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);
-	if (ctxt->query)
-		e_book_query_unref (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, EBookQuery *query, EContactPrintContext *ctxt)
-{
-	e_book_async_get_book_view(book, query, NULL, -1, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-static void
-e_contact_do_print (EBook *book, EBookQuery *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;
-	EBookQuery *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");
-		e_book_query_ref (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 = 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);
-				
-		if (query) 
-		        e_book_query_unref (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", e_book_query_from_string  (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 = e_book_query_from_string (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 7482ad2807..0000000000
--- a/addressbook/util/eab-book-util.c
+++ /dev/null
@@ -1,327 +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
- *
- */
-
-static char*
-escape (const char *str)
-{
-	GString *s = g_string_new ("");
-	const char *p = str;
-
-	while (*p) {
-		if (*p == '\\')
-			g_string_append (s, "\\\\");
-		else if (*p == '"')
-			g_string_append (s, "\\\"");
-		else
-			g_string_append_c (s, *p);
-
-		p ++;
-	}
-
-	return g_string_free (s, FALSE);
-}
-
-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;
-	EBookQuery *query;
-	guint tag;
-	char *escaped_name, *escaped_email;
-
-	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;
-
-	escaped_name = name ? escape (name) : NULL;
-	escaped_email = email ? escape (email) : NULL;
-
-	/* 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 (escaped_email) {
-		const gchar *t = escaped_email;
-		while (*t && *t != '@')
-			++t;
-		if (*t == '@') {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", t-escaped_email, escaped_email);
-
-		} else {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", escaped_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 (escaped_name && !escaped_email)
-		name_query = g_strdup_printf ("(or (beginswith \"file_as\" \"%s\") (beginswith \"full_name\" \"%s\"))", escaped_name, escaped_name);
-
-	/* Assemble our e-mail & name queries */
-	if (email_query && name_query) {
-		char *full_query = g_strdup_printf ("(and %s %s)", email_query, name_query);
-		query = e_book_query_from_string (full_query);
-		g_free (full_query);
-	}
-	else if (email_query) {
-		query = e_book_query_from_string (email_query);
-	}
-	else if (name_query) {
-		query = e_book_query_from_string (name_query);
-	}
-	else
-		return 0;
-
-	tag = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (email_query);
-	g_free (name_query);
-	g_free (escaped_email);
-	g_free (escaped_name);
-	e_book_query_unref (query);
-
-	return tag;
-}
-
-/*
- * Simple nickname query
- */
-guint
-eab_nickname_query (EBook                 *book,
-		    const char            *nickname,
-		    EBookContactsCallback  cb,
-		    gpointer               closure)
-{
-	EBookQuery *query;
-	char *query_string;
-	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_string = g_strdup_printf ("(is \"nickname\" \"%s\")", nickname);
-
-	query = e_book_query_from_string (query_string);
-
-	retval = e_book_async_get_contacts (book, query, cb, closure);
-
-	g_free (query_string);
-	g_object_unref (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\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 020a9a5e09..0000000000
--- a/addressbook/util/eab-destination.c
+++ /dev/null
@@ -1,1595 +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;
-	if (s == NULL)
-		return FALSE;
-	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)
-		 || (nonempty (p->raw))
-		 || (nonempty (p->name))
-		 || (nonempty (p->email))
-		 || (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)) {
-					const char *name, *email;
-					name = eab_destination_get_name (list_dest);
-					email = eab_destination_get_email (list_dest);
-
-					if (nonempty (name) && nonempty (email))
-						camel_internet_address_add (addr, name, email);
-					else if (nonempty (email))
-						camel_address_decode (CAMEL_ADDRESS (addr), email);
-					else /* this case loses i suppose, but there's
-						nothing we can do here */
-						camel_address_decode (CAMEL_ADDRESS (addr), name);
-				}
-				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 {
-			const char *name, *email;
-			name = eab_destination_get_name (dest);
-			email = eab_destination_get_email (dest);
-
-			if (nonempty (name) && nonempty (email))
-				camel_internet_address_add (addr, name, email);
-			else if (nonempty (email))
-				camel_address_decode (CAMEL_ADDRESS (addr), email);
-			else /* this case loses i suppose, but there's
-				nothing we can do here */
-				camel_address_decode (CAMEL_ADDRESS (addr), name);
-			
-			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) {
-				char *escaped = xmlEncodeEntitiesReentrant (NULL, str);
-				xmlNewTextChild (list_node, NULL, "name", escaped);
-				xmlFree (escaped);
-			}
-			
-			str = eab_destination_get_email (list_dest);
-			if (str) {
-				char *escaped = xmlEncodeEntitiesReentrant (NULL, str);
-				xmlNewTextChild (list_node, NULL, "email", str);
-				xmlFree (escaped);
-			}
-			
-			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) {
-		char *escaped = xmlEncodeEntitiesReentrant (NULL, str);
-		xmlNewTextChild (dest_node, NULL, "book_uri", str);
-		xmlFree (escaped);
-	}
-	
-	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 fb4bd5f711..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,94 +0,0 @@
-2004-02-03  Jakub Steiner <jimmac@ximian.com>
-
-	* im-jabber.png: 16x16 jabber
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: it indeed appears you need 16x16
-
-2004-01-29  Jakub Steiner <jimmac@ximian.com>
-
-	* im-aim.png
-	* im-icq.png
-	* im-msn.png
-	* im-yahoo.png: although I'm adding these to gnome-icon-theme
-	  instead, these are so ugly I replaced them here too. The rest
-	  of the im-* stuff I'm not quite sure what those represent. Will
-	  try to redo those as well.
-
-	  I have 16x16 versions of these in git, so if those are used
-	  scaled down, as I saw in a screenshot, feel free to use the
-	  16x16 versions. They will look better.
-
-	  Also feel free to file icon requests agains the
-	  gnome-icon-theme if you want Evolution icons.
-
-2004-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (images_DATA): added flag-for-followup-done-16.png
-	(glade_DATA): added flag-for-followup-done-48.png
-
-2003-01-11  Christian Hammond  <chipx86@gnupdate.org>
-
-	* art/im*.png, art/Makefile.am: Added IM png files from Gaim.
-
-2004-01-08  Ross Burton  <ross@burtonini.com>
-
-	* Makefile.am:
-	* videoconf.png:
-	Add a video conferencing icon.
-
-	* globe.png:
-	Replace with the 24x24 version.
-
-	Both of these are for the redesigned Collaboration tab in the
-	contact editor.
-
-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 bac90d163d..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,299 +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	\
-	flag-for-followup-done-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			\
-	im.png \
-	im-activebuddy.png \
-	im-admin.png \
-	im-aim.png \
-	im-aol.png \
-	im-away.png \
-	im-dnd.png \
-	im-extendedaway.png \
-	im-freeforchat.png \
-	im-game.png \
-	im-hiptop.png \
-	im-icq.png \
-	im-invisible.png \
-	im-jabber.png \
-	im-login.png \
-	im-logout.png \
-	im-msn.png \
-	im-na.png \
-	im-notauthorized.png \
-	im-occupied.png \
-	im-offline.png \
-	im-secure.png \
-	im-wireless.png \
-	im-yahoo.png \
-	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		\
-	videoconf.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		\
-	flag-for-followup-done-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 0b0040ab66..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/im-activebuddy.png b/art/im-activebuddy.png
deleted file mode 100644
index 49614fd2f6..0000000000
--- a/art/im-activebuddy.png
+++ /dev/null
diff --git a/art/im-admin.png b/art/im-admin.png
deleted file mode 100644
index a4d0bbdb41..0000000000
--- a/art/im-admin.png
+++ /dev/null
diff --git a/art/im-aim.png b/art/im-aim.png
deleted file mode 100644
index 1900ec920d..0000000000
--- a/art/im-aim.png
+++ /dev/null
diff --git a/art/im-aol.png b/art/im-aol.png
deleted file mode 100644
index a042d20c05..0000000000
--- a/art/im-aol.png
+++ /dev/null
diff --git a/art/im-away.png b/art/im-away.png
deleted file mode 100644
index 31af5979dc..0000000000
--- a/art/im-away.png
+++ /dev/null
diff --git a/art/im-dnd.png b/art/im-dnd.png
deleted file mode 100644
index 3fa0a902e0..0000000000
--- a/art/im-dnd.png
+++ /dev/null
diff --git a/art/im-extendedaway.png b/art/im-extendedaway.png
deleted file mode 100644
index 201372dc9a..0000000000
--- a/art/im-extendedaway.png
+++ /dev/null
diff --git a/art/im-freeforchat.png b/art/im-freeforchat.png
deleted file mode 100644
index 790c35e0c4..0000000000
--- a/art/im-freeforchat.png
+++ /dev/null
diff --git a/art/im-game.png b/art/im-game.png
deleted file mode 100644
index 9a1c4c8d5c..0000000000
--- a/art/im-game.png
+++ /dev/null
diff --git a/art/im-hiptop.png b/art/im-hiptop.png
deleted file mode 100644
index 2c26d45803..0000000000
--- a/art/im-hiptop.png
+++ /dev/null
diff --git a/art/im-icq.png b/art/im-icq.png
deleted file mode 100644
index 20ae81a5aa..0000000000
--- a/art/im-icq.png
+++ /dev/null
diff --git a/art/im-invisible.png b/art/im-invisible.png
deleted file mode 100644
index 5abb174d59..0000000000
--- a/art/im-invisible.png
+++ /dev/null
diff --git a/art/im-jabber.png b/art/im-jabber.png
deleted file mode 100644
index 4bf2365892..0000000000
--- a/art/im-jabber.png
+++ /dev/null
diff --git a/art/im-login.png b/art/im-login.png
deleted file mode 100644
index 16b9c66815..0000000000
--- a/art/im-login.png
+++ /dev/null
diff --git a/art/im-logout.png b/art/im-logout.png
deleted file mode 100644
index 393598b9f3..0000000000
--- a/art/im-logout.png
+++ /dev/null
diff --git a/art/im-msn.png b/art/im-msn.png
deleted file mode 100644
index 453b6b1a0c..0000000000
--- a/art/im-msn.png
+++ /dev/null
diff --git a/art/im-na.png b/art/im-na.png
deleted file mode 100644
index c88e02f925..0000000000
--- a/art/im-na.png
+++ /dev/null
diff --git a/art/im-notauthorized.png b/art/im-notauthorized.png
deleted file mode 100644
index 5c24b2104b..0000000000
--- a/art/im-notauthorized.png
+++ /dev/null
diff --git a/art/im-occupied.png b/art/im-occupied.png
deleted file mode 100644
index ae6b1dc453..0000000000
--- a/art/im-occupied.png
+++ /dev/null
diff --git a/art/im-offline.png b/art/im-offline.png
deleted file mode 100644
index 328daf2d45..0000000000
--- a/art/im-offline.png
+++ /dev/null
diff --git a/art/im-secure.png b/art/im-secure.png
deleted file mode 100644
index 1a3db8fcb9..0000000000
--- a/art/im-secure.png
+++ /dev/null
diff --git a/art/im-wireless.png b/art/im-wireless.png
deleted file mode 100644
index 46be2da06b..0000000000
--- a/art/im-wireless.png
+++ /dev/null
diff --git a/art/im-yahoo.png b/art/im-yahoo.png
deleted file mode 100644
index b0b8c7cbfd..0000000000
--- a/art/im-yahoo.png
+++ /dev/null
diff --git a/art/im.png b/art/im.png
deleted file mode 100644
index b44b969f0e..0000000000
--- a/art/im.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/videoconf.png b/art/videoconf.png
deleted file mode 100644
index 8bbea0ba1b..0000000000
--- a/art/videoconf.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 538a957420..0000000000
--- a/calendar/ChangeLog
+++ /dev/null